Skip to content

Commit ebf8c7b

Browse files
BitForgeCraftedCodeBitForgeCraftedCode
committed
swap UI order for folder filters
1 parent 3b59841 commit ebf8c7b

2 files changed

Lines changed: 37 additions & 33 deletions

File tree

‎ImagePerfect/Views/FiltersWindow.axaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,35 @@
3535
<Button Grid.Row="0" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
3636
Command="{Binding FilterFoldersOnTagCommand}"
3737
CommandParameter="{Binding #FilterFolderTag.Text}" Classes="menu-btn">
38-
Filter Folders on Tags
38+
Filter Folders on Tag
3939
</Button>
4040

41-
<TextBox Grid.Row="1" Grid.Column="0" Margin="5" MaxLength="200" Width="200" x:Name="FilterFolderDescriptionText"/>
42-
<Button Grid.Row="1" Grid.Column="1" Margin="5" Width="200" HorizontalContentAlignment="Center"
43-
Command="{Binding FilterFoldersOnDescriptionCommand}"
44-
CommandParameter="{Binding #FilterFolderDescriptionText.Text}" Classes="menu-btn">
45-
Seach Folder Description
46-
</Button>
47-
48-
<NumericUpDown Grid.Row="2" Grid.Column="0" Minimum="0" Maximum="10" Width="200" Height="32"
41+
<NumericUpDown Grid.Row="1" Grid.Column="0" Minimum="0" Maximum="10" Width="200" Height="32"
4942
Margin="5" ParsingNumberStyle="Integer" FormatString="0"
5043
Value="{Binding ExplorerVm.ComboFolderFilterRating}" />
5144

52-
<ListBox Grid.Row="2" Grid.Column="1" x:Name="SelectedTagsForFolderFilter" SelectionMode="Multiple" ItemsSource="{Binding TagsList}" Height="100" Width="200">
45+
<ListBox Grid.Row="1" Grid.Column="1" x:Name="SelectedTagsForFolderFilter" SelectionMode="Multiple" ItemsSource="{Binding TagsList}" Height="100" Width="200">
5346
<ListBox.ItemTemplate>
5447
<DataTemplate>
5548
<TextBlock Text="{Binding TagName}" HorizontalAlignment="Center"/>
5649
</DataTemplate>
5750
</ListBox.ItemTemplate>
5851
</ListBox>
59-
<Button Grid.Row="2" Grid.Column="2" Margin="5" Width="200" HorizontalContentAlignment="Center"
52+
<Button Grid.Row="1" Grid.Column="2" Margin="5" Width="200" HorizontalContentAlignment="Center"
6053
Command="{Binding FilterFolderOnRatingAndTagCommand}"
6154
CommandParameter="{Binding SelectedItems, ElementName=SelectedTagsForFolderFilter}"
6255
Classes="menu-btn">
6356
Filter On Rating And Tags
6457
</Button>
58+
59+
<TextBox Grid.Row="2" Grid.Column="0" Margin="5" MaxLength="200" Width="200" x:Name="FilterFolderDescriptionText"/>
60+
<Button Grid.Row="2" Grid.Column="1" Margin="5" Width="200" HorizontalContentAlignment="Center"
61+
Command="{Binding FilterFoldersOnDescriptionCommand}"
62+
CommandParameter="{Binding #FilterFolderDescriptionText.Text}" Classes="menu-btn">
63+
Seach Folder Description
64+
</Button>
65+
66+
6567
</Grid>
6668
<Grid RowDefinitions="Auto, Auto" ColumnDefinitions="*, *" HorizontalAlignment="Center">
6769
<Button Grid.Row="0" Grid.Column="0" Margin="5" Width="300" HorizontalContentAlignment="Center"
@@ -105,7 +107,7 @@
105107
<Button Grid.Row="0" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
106108
Command="{Binding FilterImagesOnTagCommand}"
107109
CommandParameter="{Binding #FilterImageTag.Text}" Classes="menu-btn">
108-
Filter Images on Tags
110+
Filter Images on Tag
109111
</Button>
110112
</Grid>
111113

‎ImagePerfect/Views/MainWindow.axaml‎

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -230,42 +230,44 @@
230230
<Button Grid.Row="0" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
231231
Command="{Binding FilterFoldersOnTagCommand}"
232232
CommandParameter="{Binding #FilterFolderTag.Text}" Classes="menu-btn">
233-
Filter Folders on Tags
233+
Filter Folders on Tag
234234
</Button>
235235

236-
<TextBox Grid.Row="1" Grid.Column="0" Margin="5" MaxLength="200" Width="200" x:Name="FilterFolderDescriptionText"/>
237-
<Button Grid.Row="1" Grid.Column="1" Margin="5" Width="200" HorizontalContentAlignment="Center"
238-
Command="{Binding FilterFoldersOnDescriptionCommand}"
239-
CommandParameter="{Binding #FilterFolderDescriptionText.Text}" Classes="menu-btn">
240-
Seach Folder Description
241-
</Button>
242-
243-
<CheckBox Grid.Row="1" Grid.Column="2" Margin="5" Width="200" IsChecked="{Binding ExplorerVm.FilterInCurrentDirectory}">
244-
Filter in Current Directory
245-
</CheckBox>
246-
247-
<Button Grid.Row="1" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
248-
ToolTip.Tip="Gets The Folders In The Current Directory And Sorts Them By Most Recent Date Modified"
249-
Command="{Binding FilterFoldersDateModifiedInCurrentDirectoryCommand}" Classes="menu-btn">
250-
Folders By Date Modified
251-
</Button>
252-
<NumericUpDown Grid.Row="2" Grid.Column="0" Minimum="0" Maximum="10" Width="200" Height="32"
236+
<NumericUpDown Grid.Row="1" Grid.Column="0" Minimum="0" Maximum="10" Width="200" Height="32"
253237
Margin="5" ParsingNumberStyle="Integer" FormatString="0"
254238
Value="{Binding ExplorerVm.ComboFolderFilterRating}" />
255239

256-
<ListBox Grid.Row="2" Grid.Column="1" x:Name="SelectedTagsForFolderFilter" SelectionMode="Multiple" ItemsSource="{Binding TagsList}" Height="100" Width="200">
240+
<ListBox Grid.Row="1" Grid.Column="1" x:Name="SelectedTagsForFolderFilter" SelectionMode="Multiple" ItemsSource="{Binding TagsList}" Height="100" Width="200">
257241
<ListBox.ItemTemplate>
258242
<DataTemplate>
259243
<TextBlock Text="{Binding TagName}" HorizontalAlignment="Center"/>
260244
</DataTemplate>
261245
</ListBox.ItemTemplate>
262246
</ListBox>
263-
<Button Grid.Row="2" Grid.Column="2" Margin="5" Width="200" HorizontalContentAlignment="Center"
247+
<Button Grid.Row="1" Grid.Column="2" Margin="5" Width="200" HorizontalContentAlignment="Center"
264248
Command="{Binding FilterFolderOnRatingAndTagCommand}"
265249
CommandParameter="{Binding SelectedItems, ElementName=SelectedTagsForFolderFilter}"
266250
Classes="menu-btn">
267251
Filter On Rating And Tags
268252
</Button>
253+
254+
<TextBox Grid.Row="2" Grid.Column="0" Margin="5" MaxLength="200" Width="200" x:Name="FilterFolderDescriptionText"/>
255+
<Button Grid.Row="2" Grid.Column="1" Margin="5" Width="200" HorizontalContentAlignment="Center"
256+
Command="{Binding FilterFoldersOnDescriptionCommand}"
257+
CommandParameter="{Binding #FilterFolderDescriptionText.Text}" Classes="menu-btn">
258+
Seach Folder Description
259+
</Button>
260+
261+
<CheckBox Grid.Row="2" Grid.Column="2" Margin="5" Width="200" IsChecked="{Binding ExplorerVm.FilterInCurrentDirectory}">
262+
Filter in Current Directory
263+
</CheckBox>
264+
265+
<Button Grid.Row="2" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
266+
ToolTip.Tip="Gets The Folders In The Current Directory And Sorts Them By Most Recent Date Modified"
267+
Command="{Binding FilterFoldersDateModifiedInCurrentDirectoryCommand}" Classes="menu-btn">
268+
Folders By Date Modified
269+
</Button>
270+
269271
</Grid>
270272
<Grid RowDefinitions="Auto, Auto" ColumnDefinitions="*, *" HorizontalAlignment="Center">
271273
<Button Grid.Row="0" Grid.Column="0" Margin="5" Width="300" HorizontalContentAlignment="Center"
@@ -305,7 +307,7 @@
305307
<Button Grid.Row="0" Grid.Column="3" Margin="5" Width="200" HorizontalContentAlignment="Center"
306308
Command="{Binding FilterImagesOnTagCommand}"
307309
CommandParameter="{Binding #FilterImageTag.Text}" Classes="menu-btn">
308-
Filter Images on Tags
310+
Filter Images on Tag
309311
</Button>
310312
</Grid>
311313
<Grid RowDefinitions="Auto" ColumnDefinitions="Auto, Auto" HorizontalAlignment="Center">

0 commit comments

Comments
 (0)