Skip to content

Commit b3775fc

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Refactoring
1 parent bbc34a9 commit b3775fc

File tree

1 file changed

+68
-68
lines changed

1 file changed

+68
-68
lines changed

‎Source/NETworkManager/Views/ProfilesView.xaml‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -36,26 +36,26 @@
3636
</Grid.RowDefinitions>
3737
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource HeaderTextBlock}"
3838
Text="{x:Static localization:Strings.Groups}" />
39-
<Button Grid.Column="0" Grid.Row="0"
39+
<Button Grid.Column="0" Grid.Row="0"
4040
HorizontalAlignment="Right"
41-
Focusable="False"
42-
Style="{StaticResource ResourceKey=CleanButton}"
43-
Command="{Binding Path=AddGroupCommand}"
44-
ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
41+
Focusable="False"
42+
Style="{StaticResource ResourceKey=CleanButton}"
43+
Command="{Binding Path=AddGroupCommand}"
44+
ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
4545
<Rectangle Width="16" Height="16">
4646
<Rectangle.OpacityMask>
4747
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
4848
</Rectangle.OpacityMask>
4949
<Rectangle.Style>
5050
<Style TargetType="{x:Type TypeName=Rectangle}">
5151
<Setter Property="Fill"
52-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
52+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
5353
<Style.Triggers>
5454
<DataTrigger
55-
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
56-
Value="True">
55+
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
56+
Value="True">
5757
<Setter Property="Fill"
58-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
58+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
5959
</DataTrigger>
6060
</Style.Triggers>
6161
</Style>
@@ -114,7 +114,7 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
114114
</Style.Triggers>
115115
</Style>
116116
</DataGrid.RowStyle>
117-
</DataGrid>
117+
</DataGrid>
118118
</Grid>
119119
</Border>
120120
<Grid Grid.Column="1" Grid.Row="0" Margin="10">
@@ -125,60 +125,60 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
125125
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource HeaderTextBlock}"
126126
Text="{x:Static localization:Strings.Profiles}" />
127127
<Grid Grid.Column="0" Grid.Row="0" VerticalAlignment="Center"
128-
HorizontalAlignment="Right">
128+
HorizontalAlignment="Right">
129129
<Grid.ColumnDefinitions>
130130
<ColumnDefinition Width="250" />
131131
<ColumnDefinition Width="10" />
132132
<ColumnDefinition Width="Auto" />
133133
<ColumnDefinition Width="10" />
134134
<ColumnDefinition Width="Auto" />
135135
</Grid.ColumnDefinitions>
136-
<TextBox x:Name="TextBoxSearch"
136+
<TextBox x:Name="TextBoxSearch"
137137
Grid.Row="0" Grid.Column="0"
138138
Text="{Binding Search, UpdateSourceTrigger=PropertyChanged}"
139139
Style="{StaticResource SearchTextBox}" />
140140
<Button Grid.Column="2" Grid.Row="0"
141-
x:Name="ButtonProfileFilter"
142-
Focusable="False"
143-
Style="{StaticResource ResourceKey=CleanButton}"
144-
Command="{Binding Path=OpenProfileFilterCommand}"
145-
ToolTip="{x:Static Member=localization:Strings.FilterProfilesDots}">
141+
x:Name="ButtonProfileFilter"
142+
Focusable="False"
143+
Style="{StaticResource ResourceKey=CleanButton}"
144+
Command="{Binding Path=OpenProfileFilterCommand}"
145+
ToolTip="{x:Static Member=localization:Strings.FilterProfilesDots}">
146146
<Rectangle Width="16" Height="16">
147147
<Rectangle.Resources>
148148
<VisualBrush x:Key="VisualFilter" Stretch="Uniform"
149-
Visual="{iconPacks:Material Kind=FilterOutline}" />
149+
Visual="{iconPacks:Material Kind=FilterOutline}" />
150150
<VisualBrush x:Key="VisualFilterRemove" Stretch="Uniform"
151-
Visual="{iconPacks:Material Kind=FilterMultipleOutline}" />
151+
Visual="{iconPacks:Material Kind=FilterMultipleOutline}" />
152152
</Rectangle.Resources>
153153
<Rectangle.Style>
154154
<Style TargetType="{x:Type TypeName=Rectangle}">
155155
<Setter Property="OpacityMask"
156-
Value="{StaticResource ResourceKey=VisualFilter}" />
156+
Value="{StaticResource ResourceKey=VisualFilter}" />
157157
<Setter Property="Fill"
158-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
158+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
159159
<Style.Triggers>
160160
<DataTrigger Binding="{Binding Path=IsProfileFilterSet}" Value="True">
161161
<Setter Property="OpacityMask"
162-
Value="{StaticResource ResourceKey=VisualFilterRemove}" />
162+
Value="{StaticResource ResourceKey=VisualFilterRemove}" />
163163
</DataTrigger>
164164
<DataTrigger
165-
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
166-
Value="True">
165+
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
166+
Value="True">
167167
<Setter Property="Fill"
168-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
168+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
169169
</DataTrigger>
170170
</Style.Triggers>
171171
</Style>
172172
</Rectangle.Style>
173173
</Rectangle>
174174
</Button>
175175
<Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}"
176-
Placement="Bottom" StaysOpen="False"
177-
IsOpen="{Binding ProfileFilterIsOpen}"
178-
Width="220">
176+
Placement="Bottom" StaysOpen="False"
177+
IsOpen="{Binding ProfileFilterIsOpen}"
178+
Width="220">
179179
<Border Background="{DynamicResource MahApps.Brushes.Window.Background}"
180-
BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
181-
BorderThickness="1">
180+
BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
181+
BorderThickness="1">
182182
<Grid Margin="10">
183183
<Grid.RowDefinitions>
184184
<RowDefinition Height="Auto" />
@@ -192,14 +192,14 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
192192
<RowDefinition Height="Auto" />
193193
</Grid.RowDefinitions>
194194
<TextBlock Grid.Column="0" Grid.Row="0"
195-
Text="{x:Static Member=localization:Strings.FilterByTags}"
196-
Style="{StaticResource InfoTextBlock}" />
195+
Text="{x:Static Member=localization:Strings.FilterByTags}"
196+
Style="{StaticResource InfoTextBlock}" />
197197
<ScrollViewer Grid.Column="0" Grid.Row="2"
198-
VerticalScrollBarVisibility="Auto"
199-
HorizontalScrollBarVisibility="Hidden"
200-
Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntNotZeroToVisibilityCollapsedConverter}}">
198+
VerticalScrollBarVisibility="Auto"
199+
HorizontalScrollBarVisibility="Hidden"
200+
Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntNotZeroToVisibilityCollapsedConverter}}">
201201
<ItemsControl ItemsSource="{Binding ProfileFilterTagsView}"
202-
Width="200">
202+
Width="200">
203203
<ItemsControl.ItemsPanel>
204204
<ItemsPanelTemplate>
205205
<WrapPanel />
@@ -208,49 +208,49 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
208208
<ItemsControl.ItemTemplate>
209209
<DataTemplate DataType="{x:Type profiles:ProfileFilterTagsInfo}">
210210
<CheckBox Margin="0,5,10,5" Content="{Binding Name}"
211-
IsChecked="{Binding IsSelected}"
212-
Style="{StaticResource DefaultCheckBox}" />
211+
IsChecked="{Binding IsSelected}"
212+
Style="{StaticResource DefaultCheckBox}" />
213213
</DataTemplate>
214214
</ItemsControl.ItemTemplate>
215215
</ItemsControl>
216216
</ScrollViewer>
217217
<TextBlock Grid.Column="0" Grid.Row="2"
218-
Text="{x:Static localization:Strings.NoTagsFound}"
219-
Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntZeroToVisibilityCollapsedConverter}}"
220-
Style="{StaticResource MessageTextBlock}" />
218+
Text="{x:Static localization:Strings.NoTagsFound}"
219+
Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntZeroToVisibilityCollapsedConverter}}"
220+
Style="{StaticResource MessageTextBlock}" />
221221
<TextBlock Grid.Column="0" Grid.Row="4"
222-
Text="{x:Static localization:Strings.Match}"
223-
Style="{StaticResource InfoTextBlock}" />
222+
Text="{x:Static localization:Strings.Match}"
223+
Style="{StaticResource InfoTextBlock}" />
224224
<StackPanel Grid.Column="0" Grid.Row="6"
225-
Orientation="Horizontal">
225+
Orientation="Horizontal">
226226
<RadioButton Content="{x:Static localization:Strings.Any}"
227-
IsChecked="{Binding Path=ProfileFilterTagsMatchAny}" />
227+
IsChecked="{Binding Path=ProfileFilterTagsMatchAny}" />
228228
<RadioButton Content="{x:Static localization:Strings.All}"
229-
IsChecked="{Binding Path=ProfileFilterTagsMatchAll}"
230-
Margin="10,0,0,0" />
229+
IsChecked="{Binding Path=ProfileFilterTagsMatchAll}"
230+
Margin="10,0,0,0" />
231231
</StackPanel>
232232
<StackPanel Grid.Column="0" Grid.Row="8"
233-
Orientation="Horizontal" HorizontalAlignment="Right">
233+
Orientation="Horizontal" HorizontalAlignment="Right">
234234
<Button Command="{Binding ApplyProfileFilterCommand}"
235-
Style="{StaticResource ImageButton}"
236-
ToolTip="{x:Static localization:Strings.ApplyFilter}">
235+
Style="{StaticResource ImageButton}"
236+
ToolTip="{x:Static localization:Strings.ApplyFilter}">
237237
<Rectangle Width="16" Height="16"
238-
Fill="{DynamicResource MahApps.Brushes.Gray3}">
238+
Fill="{DynamicResource MahApps.Brushes.Gray3}">
239239
<Rectangle.OpacityMask>
240240
<VisualBrush Stretch="Uniform"
241-
Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
241+
Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
242242
</Rectangle.OpacityMask>
243243
</Rectangle>
244244
</Button>
245245
<Button Command="{Binding ClearProfileFilterCommand}"
246-
Style="{StaticResource ImageButton}"
247-
ToolTip="{x:Static localization:Strings.ClearFilter}"
248-
Margin="10,0,0,0">
246+
Style="{StaticResource ImageButton}"
247+
ToolTip="{x:Static localization:Strings.ClearFilter}"
248+
Margin="10,0,0,0">
249249
<Rectangle Width="20" Height="20"
250-
Fill="{DynamicResource MahApps.Brushes.Gray3}">
250+
Fill="{DynamicResource MahApps.Brushes.Gray3}">
251251
<Rectangle.OpacityMask>
252252
<VisualBrush Stretch="Uniform"
253-
Visual="{iconPacks:Material Kind=FilterRemoveOutline}" />
253+
Visual="{iconPacks:Material Kind=FilterRemoveOutline}" />
254254
</Rectangle.OpacityMask>
255255
</Rectangle>
256256
</Button>
@@ -259,24 +259,24 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
259259
</Border>
260260
</Popup>
261261
<Button Grid.Column="4" Grid.Row="0"
262-
Focusable="False"
263-
Style="{StaticResource ResourceKey=CleanButton}"
264-
Command="{Binding Path=AddProfileCommand}"
265-
ToolTip="{x:Static Member=localization:Strings.AddProfileDots}">
262+
Focusable="False"
263+
Style="{StaticResource ResourceKey=CleanButton}"
264+
Command="{Binding Path=AddProfileCommand}"
265+
ToolTip="{x:Static Member=localization:Strings.AddProfileDots}">
266266
<Rectangle Width="16" Height="16">
267267
<Rectangle.OpacityMask>
268268
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Plus}" />
269269
</Rectangle.OpacityMask>
270270
<Rectangle.Style>
271271
<Style TargetType="{x:Type TypeName=Rectangle}">
272272
<Setter Property="Fill"
273-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
273+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray3}" />
274274
<Style.Triggers>
275275
<DataTrigger
276-
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
277-
Value="True">
276+
Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type TypeName=Button}}, Path=IsMouseOver}"
277+
Value="True">
278278
<Setter Property="Fill"
279-
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
279+
Value="{DynamicResource ResourceKey=MahApps.Brushes.Gray5}" />
280280
</DataTrigger>
281281
</Style.Triggers>
282282
</Style>
@@ -425,9 +425,9 @@ ToolTip="{x:Static Member=localization:Strings.AddGroupDots}">
425425
SortMemberPath="Whois_Enabled" MinWidth="80" Width="Auto" />
426426
</DataGrid.Columns>
427427
</controls:MultiSelectDataGrid>
428-
<mah:ProgressRing Grid.Column="0" Grid.Row="1"
429-
Height="50" Width="50"
430-
IsActive="{Binding Path=IsSearching}" />
428+
<mah:ProgressRing Grid.Column="0" Grid.Row="1"
429+
Height="50" Width="50"
430+
IsActive="{Binding Path=IsSearching}" />
431431
</Grid>
432432
</Grid>
433433
<Grid Grid.Column="0" Grid.Row="0">

0 commit comments

Comments
 (0)