Skip to content

Commit b99ae57

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Cleanup
1 parent 53aa01f commit b99ae57

10 files changed

+53
-46
lines changed

‎Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ public AWSSessionManagerHostViewModel(IDialogCoordinator instance)
328328
WriteDefaultProfileToRegistry();
329329

330330
InterTabClient = new DragablzInterTabClient(ApplicationName.AWSSessionManager);
331-
InterTabPartition = ApplicationName.AWSSessionManager.ToString();
331+
InterTabPartition = nameof(ApplicationName.AWSSessionManager);
332332

333333
TabItems = [];
334334

‎Source/NETworkManager/ViewModels/IPGeolocationHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public IPGeolocationHostViewModel(IDialogCoordinator instance)
191191
_dialogCoordinator = instance;
192192

193193
InterTabClient = new DragablzInterTabClient(ApplicationName.IPGeolocation);
194-
InterTabPartition = ApplicationName.IPGeolocation.ToString();
194+
InterTabPartition = nameof(ApplicationName.IPGeolocation);
195195

196196
var tabId = Guid.NewGuid();
197197

‎Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public PuTTYHostViewModel(IDialogCoordinator instance)
255255
WriteDefaultProfileToRegistry();
256256

257257
InterTabClient = new DragablzInterTabClient(ApplicationName.PuTTY);
258-
InterTabPartition = ApplicationName.PuTTY.ToString();
258+
InterTabPartition = nameof(ApplicationName.PuTTY);
259259

260260
TabItems = [];
261261

‎Source/NETworkManager/ViewModels/RemoteDesktopHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ public RemoteDesktopHostViewModel(IDialogCoordinator instance)
195195
_dialogCoordinator = instance;
196196

197197
InterTabClient = new DragablzInterTabClient(ApplicationName.RemoteDesktop);
198-
InterTabPartition = ApplicationName.RemoteDesktop.ToString();
198+
InterTabPartition = nameof(ApplicationName.RemoteDesktop);
199199

200200
TabItems = [];
201201

‎Source/NETworkManager/ViewModels/SNMPHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ public SNMPHostViewModel(IDialogCoordinator instance)
193193
_dialogCoordinator = instance;
194194

195195
InterTabClient = new DragablzInterTabClient(ApplicationName.SNMP);
196-
InterTabPartition = ApplicationName.SNMP.ToString();
196+
InterTabPartition = nameof(ApplicationName.SNMP);
197197

198198
TabItems = [];
199199
AddTab();

‎Source/NETworkManager/ViewModels/SNTPLookupHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public int SelectedTabIndex
5555
public SNTPLookupHostViewModel()
5656
{
5757
InterTabClient = new DragablzInterTabClient(ApplicationName.SNTPLookup);
58-
InterTabPartition = ApplicationName.SNTPLookup.ToString();
58+
InterTabPartition = nameof(ApplicationName.SNTPLookup);
5959

6060
var tabId = Guid.NewGuid();
6161

‎Source/NETworkManager/ViewModels/TigerVNCHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,7 @@ public TigerVNCHostViewModel(IDialogCoordinator instance)
214214
CheckSettings();
215215

216216
InterTabClient = new DragablzInterTabClient(ApplicationName.TigerVNC);
217-
InterTabPartition = ApplicationName.TigerVNC.ToString();
217+
InterTabPartition = nameof(ApplicationName.TigerVNC);
218218

219219
TabItems = [];
220220

‎Source/NETworkManager/ViewModels/WebConsoleHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ public WebConsoleHostViewModel(IDialogCoordinator instance)
227227
}
228228

229229
InterTabClient = new DragablzInterTabClient(ApplicationName.WebConsole);
230-
InterTabPartition = ApplicationName.WebConsole.ToString();
230+
InterTabPartition = nameof(ApplicationName.WebConsole);
231231

232232
TabItems = [];
233233

‎Source/NETworkManager/ViewModels/WhoisHostViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ public WhoisHostViewModel(IDialogCoordinator instance)
191191
_dialogCoordinator = instance;
192192

193193
InterTabClient = new DragablzInterTabClient(ApplicationName.Whois);
194-
InterTabPartition = ApplicationName.Whois.ToString();
194+
InterTabPartition = nameof(ApplicationName.Whois);
195195

196196
var tabId = Guid.NewGuid();
197197

‎Source/NETworkManager/Views/DNSLookupHostView.xaml‎

Lines changed: 44 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@
189189
<KeyBinding Command="{Binding LookupProfileCommand}" Key="Enter" />
190190
</TextBox.InputBindings>
191191
</TextBox>
192-
<Button Grid.Column="4" Grid.Row="0"
192+
<Button Grid.Column="4" Grid.Row="0"
193193
x:Name="ButtonProfileFilter"
194194
Focusable="False"
195195
Style="{StaticResource ResourceKey=CleanButton}"
@@ -201,7 +201,7 @@
201201
Visual="{iconPacks:Material Kind=FilterOutline}" />
202202
<VisualBrush x:Key="VisualFilterRemove" Stretch="Uniform"
203203
Visual="{iconPacks:Material Kind=FilterMultipleOutline}" />
204-
</Rectangle.Resources>
204+
</Rectangle.Resources>
205205
<Rectangle.Style>
206206
<Style TargetType="{x:Type TypeName=Rectangle}">
207207
<Setter Property="OpacityMask"
@@ -224,14 +224,14 @@
224224
</Rectangle.Style>
225225
</Rectangle>
226226
</Button>
227-
<Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}"
227+
<Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}"
228228
Placement="Bottom" StaysOpen="False"
229229
IsOpen="{Binding ProfileFilterIsOpen}"
230230
Width="220">
231231
<Border Background="{DynamicResource MahApps.Brushes.Window.Background}"
232-
BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
232+
BorderBrush="{DynamicResource MahApps.Brushes.Gray8}"
233233
BorderThickness="1">
234-
<Grid Margin="10">
234+
<Grid Margin="10">
235235
<Grid.RowDefinitions>
236236
<RowDefinition Height="Auto" />
237237
<RowDefinition Height="10" />
@@ -242,27 +242,28 @@
242242
<RowDefinition Height="Auto" />
243243
<RowDefinition Height="10" />
244244
<RowDefinition Height="Auto" />
245-
</Grid.RowDefinitions>
246-
<TextBlock Grid.Column="0" Grid.Row="0"
245+
</Grid.RowDefinitions>
246+
<TextBlock Grid.Column="0" Grid.Row="0"
247247
Text="{x:Static Member=localization:Strings.FilterByTags}"
248-
Style="{StaticResource InfoTextBlock}"/>
249-
<ScrollViewer Grid.Column="0" Grid.Row="2"
250-
VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Hidden"
248+
Style="{StaticResource InfoTextBlock}" />
249+
<ScrollViewer Grid.Column="0" Grid.Row="2"
250+
VerticalScrollBarVisibility="Auto"
251+
HorizontalScrollBarVisibility="Hidden"
251252
Visibility="{Binding Path=ProfileFilterTagsView.Count, Converter={StaticResource IntNotZeroToVisibilityCollapsedConverter}}">
252253
<ItemsControl ItemsSource="{Binding ProfileFilterTagsView}"
253254
Width="200">
254-
<ItemsControl.ItemsPanel>
255-
<ItemsPanelTemplate>
256-
<WrapPanel />
257-
</ItemsPanelTemplate>
258-
</ItemsControl.ItemsPanel>
259-
<ItemsControl.ItemTemplate>
260-
<DataTemplate DataType="{x:Type profiles:ProfileFilterTagsInfo}">
261-
<CheckBox Margin="0,5,10,5" Content="{Binding Name}"
262-
IsChecked="{Binding IsSelected}"
263-
Style="{StaticResource DefaultCheckBox}" />
264-
</DataTemplate>
265-
</ItemsControl.ItemTemplate>
255+
<ItemsControl.ItemsPanel>
256+
<ItemsPanelTemplate>
257+
<WrapPanel />
258+
</ItemsPanelTemplate>
259+
</ItemsControl.ItemsPanel>
260+
<ItemsControl.ItemTemplate>
261+
<DataTemplate DataType="{x:Type profiles:ProfileFilterTagsInfo}">
262+
<CheckBox Margin="0,5,10,5" Content="{Binding Name}"
263+
IsChecked="{Binding IsSelected}"
264+
Style="{StaticResource DefaultCheckBox}" />
265+
</DataTemplate>
266+
</ItemsControl.ItemTemplate>
266267
</ItemsControl>
267268
</ScrollViewer>
268269
<TextBlock Grid.Column="0" Grid.Row="2"
@@ -271,34 +272,37 @@
271272
Style="{StaticResource MessageTextBlock}" />
272273
<TextBlock Grid.Column="0" Grid.Row="4"
273274
Text="{x:Static localization:Strings.Match}"
274-
Style="{StaticResource InfoTextBlock}"
275-
/>
275+
Style="{StaticResource InfoTextBlock}" />
276276
<StackPanel Grid.Column="0" Grid.Row="6"
277-
Orientation="Horizontal">
277+
Orientation="Horizontal">
278278
<RadioButton Content="{x:Static localization:Strings.Any}"
279279
IsChecked="{Binding Path=ProfileFilterTagsMatchAny}" />
280280
<RadioButton Content="{x:Static localization:Strings.All}"
281281
IsChecked="{Binding Path=ProfileFilterTagsMatchAll}"
282-
Margin="10,0,0,0"/>
282+
Margin="10,0,0,0" />
283283
</StackPanel>
284284
<StackPanel Grid.Column="0" Grid.Row="8"
285285
Orientation="Horizontal" HorizontalAlignment="Right">
286-
<Button Command="{Binding ApplyProfileFilterCommand}"
286+
<Button Command="{Binding ApplyProfileFilterCommand}"
287287
Style="{StaticResource ImageButton}"
288288
ToolTip="{x:Static localization:Strings.ApplyFilter}">
289-
<Rectangle Width="16" Height="16" Fill="{DynamicResource MahApps.Brushes.Gray3}">
289+
<Rectangle Width="16" Height="16"
290+
Fill="{DynamicResource MahApps.Brushes.Gray3}">
290291
<Rectangle.OpacityMask>
291-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
292+
<VisualBrush Stretch="Uniform"
293+
Visual="{iconPacks:Material Kind=ContentSaveOutline}" />
292294
</Rectangle.OpacityMask>
293295
</Rectangle>
294296
</Button>
295297
<Button Command="{Binding ClearProfileFilterCommand}"
296298
Style="{StaticResource ImageButton}"
297299
ToolTip="{x:Static localization:Strings.ClearFilter}"
298300
Margin="10,0,0,0">
299-
<Rectangle Width="20" Height="20" Fill="{DynamicResource MahApps.Brushes.Gray3}">
301+
<Rectangle Width="20" Height="20"
302+
Fill="{DynamicResource MahApps.Brushes.Gray3}">
300303
<Rectangle.OpacityMask>
301-
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=FilterRemoveOutline}" />
304+
<VisualBrush Stretch="Uniform"
305+
Visual="{iconPacks:Material Kind=FilterRemoveOutline}" />
302306
</Rectangle.OpacityMask>
303307
</Rectangle>
304308
</Button>
@@ -430,7 +434,7 @@
430434
<Rectangle Width="16" Height="16">
431435
<Rectangle.OpacityMask>
432436
<VisualBrush Stretch="Uniform"
433-
Visual="{iconPacks:Modern Kind=Edit}" />
437+
Visual="{iconPacks:Modern Kind=Edit}" />
434438
</Rectangle.OpacityMask>
435439
<Rectangle.Style>
436440
<Style TargetType="{x:Type Rectangle}">
@@ -464,7 +468,7 @@
464468
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}">
465469
<Setter Property="ContextMenu" Value="{StaticResource ProfileContextMenu}" />
466470
<EventSetter Event="MouseDoubleClick" Handler="ListBoxItem_MouseDoubleClick" />
467-
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
471+
<Setter Property="VerticalContentAlignment" Value="Stretch" />
468472
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
469473
</Style>
470474
</ListBox.ItemContainerStyle>
@@ -474,11 +478,14 @@
474478
<Grid.ToolTip>
475479
<ToolTip MinWidth="250">
476480
<StackPanel Margin="10">
477-
<TextBlock Text="{Binding DNSLookup_Host}" Style="{StaticResource DefaultTextBlock}" />
478-
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}" Margin="0,10" />
479-
<TextBlock Text="{Binding Description}" Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
481+
<TextBlock Text="{Binding DNSLookup_Host}"
482+
Style="{StaticResource DefaultTextBlock}" />
483+
<Separator Background="{DynamicResource MahApps.Brushes.Gray8}"
484+
Margin="0,10" />
485+
<TextBlock Text="{Binding Description}"
486+
Style="{StaticResource InfoTextBlock}" TextWrapping="Wrap" />
480487
</StackPanel>
481-
</ToolTip>
488+
</ToolTip>
482489
</Grid.ToolTip>
483490
<TextBlock Text="{Binding Name}" Style="{StaticResource CenterTextBlock}" />
484491
</Grid>

0 commit comments

Comments
 (0)