Skip to content

Commit 0580c22

Browse files
BornToBeRootBornToBeRoot
committed
Chore: Refactoring & Cleanup & Docs
1 parent 6f09b2a commit 0580c22

24 files changed

+38
-42
lines changed

‎Source/NETworkManager/Controls/DragablzTabHostWindow.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<mah:WindowButtonCommands Template="{DynamicResource MahApps.Templates.WindowButtonCommands.Win10}" />
1818
</mah:MetroWindow.WindowButtonCommands>
1919
<Grid>
20-
<dragablz:TabablzControl Focusable="False" Name="TabsContainer" ClosingItemCallback="{Binding CloseItemCommand}">
20+
<dragablz:TabablzControl Name="TabsContainer" ClosingItemCallback="{Binding CloseItemCommand}">
2121
<dragablz:TabablzControl.Resources>
2222
<wpfHelpers:BindingProxy x:Key="BindingProxy" Data="{Binding}" />
2323
</dragablz:TabablzControl.Resources>

‎Source/NETworkManager/Resources/Styles/DragablzStyles.xaml

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<Setter Property="ItemContainerStyle" Value="{StaticResource CustomHeaderItemTemplate}" />
5353
<Setter Property="AdjacentHeaderItemOffset" Value="0" />
5454
<Setter Property="Margin" Value="0,-2,0,0" />
55-
<Setter Property="Focusable" Value="False" />
5655
<Setter Property="Background" Value="Transparent" />
5756
<Setter Property="EmptyHeaderSizingHint" Value="PreviousTab" />
5857
<Setter Property="ContentTemplateSelector" Value="{x:Null}" />

‎Source/NETworkManager/Views/AWSSessionManagerHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
</dragablz:TabablzControl.InterTabController>
6060
<dragablz:TabablzControl.HeaderSuffixContent>
6161
<Grid HorizontalAlignment="Right" Width="32" Height="32">
62-
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Focusable="False">
62+
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}">
6363
<Rectangle Width="16" Height="16">
6464
<Rectangle.OpacityMask>
6565
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -459,7 +459,7 @@
459459
</Style.Triggers>
460460
</Style>
461461
</Grid.Style>
462-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
462+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
463463
<Button.Style>
464464
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
465465
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/BitCalculatorView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
<RowDefinition Height="Auto" />
130130
<RowDefinition Height="Auto" />
131131
</Grid.RowDefinitions>
132-
<GridSplitter Grid.Column="1" Grid.RowSpan="14" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False"/>
132+
<GridSplitter Grid.Column="1" Grid.RowSpan="14" Background="Transparent" HorizontalAlignment="Stretch" />
133133
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Bits}" />
134134
<TextBox Grid.Column="2" Grid.Row="0" Text="{Binding Result.Bits}" />
135135
<TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.Bytes}" />

‎Source/NETworkManager/Views/DNSLookupHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</dragablz:TabablzControl.InterTabController>
3434
<dragablz:TabablzControl.HeaderSuffixContent>
3535
<Grid HorizontalAlignment="Right" Width="32" Height="32">
36-
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Focusable="False">
36+
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}">
3737
<Rectangle Width="16" Height="16">
3838
<Rectangle.OpacityMask>
3939
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -296,7 +296,7 @@
296296
</Style.Triggers>
297297
</Style>
298298
</Grid.Style>
299-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
299+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
300300
<Button.Style>
301301
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
302302
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/DiscoveryProtocolView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
<RowDefinition Height="Auto" />
135135
<RowDefinition Height="Auto" />
136136
</Grid.RowDefinitions>
137-
<GridSplitter Grid.Column="1" Grid.RowSpan="13" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False" />
137+
<GridSplitter Grid.Column="1" Grid.RowSpan="13" Background="Transparent" HorizontalAlignment="Stretch" />
138138
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Device}" />
139139
<TextBox Grid.Column="2" Grid.Row="0" Text="{Binding DiscoveryPackage.Device, Mode=OneWay, Converter={StaticResource StringNullOrEmptyToStringConverter}}" />
140140
<TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.DeviceDescription}" />

‎Source/NETworkManager/Views/IPScannerHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</dragablz:TabablzControl.InterTabController>
3434
<dragablz:TabablzControl.HeaderSuffixContent>
3535
<Grid HorizontalAlignment="Right" Width="32" Height="32">
36-
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Focusable="False">
36+
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}">
3737
<Rectangle Width="16" Height="16">
3838
<Rectangle.OpacityMask>
3939
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -301,7 +301,7 @@
301301
</Style.Triggers>
302302
</Style>
303303
</Grid.Style>
304-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
304+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
305305
<Button.Style>
306306
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
307307
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/IPScannerView.xaml

-2
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@
536536
<Style TargetType="{x:Type ListViewItem}" BasedOn="{StaticResource MahApps.Styles.ListViewItem}">
537537
<Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="Transparent" />
538538
<Setter Property="Background" Value="Transparent" />
539-
<Setter Property="Focusable" Value="False" />
540539
</Style>
541540
</ListView.ItemContainerStyle>
542541
<ListView.Template>
@@ -597,7 +596,6 @@
597596
BasedOn="{StaticResource MahApps.Styles.ListViewItem}">
598597
<Setter Property="mah:ItemHelper.HoverBackgroundBrush" Value="Transparent" />
599598
<Setter Property="Background" Value="Transparent" />
600-
<Setter Property="Focusable" Value="False" />
601599
</Style>
602600
</ListView.ItemContainerStyle>
603601
<ListView.Template>

‎Source/NETworkManager/Views/NetworkInterfaceView.xaml

+5-6
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@
181181
<RowDefinition Height="Auto" />
182182
<RowDefinition Height="Auto" />
183183
</Grid.RowDefinitions>
184-
<GridSplitter Grid.Column="1" Grid.RowSpan="20" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False" />
184+
<GridSplitter Grid.Column="1" Grid.RowSpan="20" Background="Transparent" HorizontalAlignment="Stretch" />
185185
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.Name}" />
186186
<TextBox Grid.Column="2" Grid.Row="0" Text="{Binding SelectedNetworkInterface.Name}" />
187187
<TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.Description}" />
@@ -482,9 +482,9 @@
482482
<RowDefinition Height="Auto" />
483483
<RowDefinition Height="Auto" />
484484
</Grid.RowDefinitions>
485-
<GridSplitter Grid.Column="1" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False" />
486-
<GridSplitter Grid.Column="3" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False" />
487-
<GridSplitter Grid.Column="5" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" Focusable="False" />
485+
<GridSplitter Grid.Column="1" Grid.Row="0" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" />
486+
<GridSplitter Grid.Column="3" Grid.Row="0" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" />
487+
<GridSplitter Grid.Column="5" Grid.Row="0" Grid.RowSpan="4" Background="Transparent" HorizontalAlignment="Stretch" />
488488
<TextBlock Grid.Column="0" Grid.Row="0" Text="{x:Static localization:Strings.CurrentDownloadSpeed}" />
489489
<TextBox Grid.Column="2" Grid.Row="0" Text="{Binding BandwidthBytesReceivedSpeed, Converter={StaticResource BandwidthBytesToSpeedConverter}}" />
490490
<TextBlock Grid.Column="0" Grid.Row="1" Text="{x:Static localization:Strings.CurrentUploadSpeed}" />
@@ -1035,11 +1035,10 @@
10351035
</Style.Triggers>
10361036
</Style>
10371037
</Grid.Style>
1038-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
1038+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
10391039
<Button.Style>
10401040
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
10411041
<Setter Property="Command" Value="{Binding AddProfileCommand}" />
1042-
10431042
<Style.Triggers>
10441043
<DataTrigger Binding="{Binding Search, Converter={StaticResource StringNullOrEmptyToBoolConverter}}" Value="False">
10451044
<Setter Property="Command" Value="{Binding ClearSearchCommand}" />

‎Source/NETworkManager/Views/PingMonitorHostView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@
345345
</Style.Triggers>
346346
</Style>
347347
</Grid.Style>
348-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
348+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
349349
<Button.Style>
350350
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
351351
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/PortScannerHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</dragablz:TabablzControl.InterTabController>
3434
<dragablz:TabablzControl.HeaderSuffixContent>
3535
<Grid HorizontalAlignment="Right" Width="32" Height="32">
36-
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Focusable="False">
36+
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}">
3737
<Rectangle Width="16" Height="16">
3838
<Rectangle.OpacityMask>
3939
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -296,7 +296,7 @@
296296
</Style.Triggers>
297297
</Style>
298298
</Grid.Style>
299-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
299+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
300300
<Button.Style>
301301
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
302302
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/PowerShellHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</dragablz:TabablzControl.InterTabController>
5151
<dragablz:TabablzControl.HeaderSuffixContent>
5252
<Grid HorizontalAlignment="Right" Width="32" Height="32">
53-
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Focusable="False">
53+
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}">
5454
<Rectangle Width="16" Height="16">
5555
<Rectangle.OpacityMask>
5656
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -402,7 +402,7 @@
402402
</Style.Triggers>
403403
</Style>
404404
</Grid.Style>
405-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
405+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
406406
<Button.Style>
407407
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
408408
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/PuTTYHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
</dragablz:TabablzControl.InterTabController>
5151
<dragablz:TabablzControl.HeaderSuffixContent>
5252
<Grid HorizontalAlignment="Right" Width="32" Height="32">
53-
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Focusable="False">
53+
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}">
5454
<Rectangle Width="16" Height="16">
5555
<Rectangle.OpacityMask>
5656
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -410,7 +410,7 @@
410410
</Style.Triggers>
411411
</Style>
412412
</Grid.Style>
413-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
413+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
414414
<Button.Style>
415415
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
416416
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/RemoteDesktopHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</dragablz:TabablzControl.InterTabController>
4040
<dragablz:TabablzControl.HeaderSuffixContent>
4141
<Grid HorizontalAlignment="Right" Width="32" Height="32">
42-
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}" Focusable="False">
42+
<Button Style="{StaticResource CleanButton}" Command="{Binding ConnectCommand}" ToolTip="{x:Static localization:Strings.NewConnectionDots}">
4343
<Rectangle Width="16" Height="16">
4444
<Rectangle.OpacityMask>
4545
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -420,7 +420,7 @@
420420
</Style.Triggers>
421421
</Style>
422422
</Grid.Style>
423-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
423+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
424424
<Button.Style>
425425
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
426426
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/SNMPHostView.xaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
</dragablz:TabablzControl.InterTabController>
3434
<dragablz:TabablzControl.HeaderSuffixContent>
3535
<Grid HorizontalAlignment="Right" Width="32" Height="32">
36-
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Focusable="False">
36+
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}">
3737
<Rectangle Width="16" Height="16">
3838
<Rectangle.OpacityMask>
3939
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />
@@ -296,7 +296,7 @@
296296
</Style.Triggers>
297297
</Style>
298298
</Grid.Style>
299-
<Button HorizontalAlignment="Center" Focusable="False" Margin="0,0,0,10">
299+
<Button HorizontalAlignment="Center" Margin="0,0,0,10">
300300
<Button.Style>
301301
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource CleanButton}">
302302
<Setter Property="Command" Value="{Binding AddProfileCommand}" />

‎Source/NETworkManager/Views/SNTPLookupHostView.xaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
</dragablz:TabablzControl.InterTabController>
2929
<dragablz:TabablzControl.HeaderSuffixContent>
3030
<Grid HorizontalAlignment="Right" Width="32" Height="32">
31-
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}" Focusable="False">
31+
<Button Style="{StaticResource CleanButton}" Command="{Binding AddTabCommand}" ToolTip="{x:Static localization:Strings.NewTab}">
3232
<Rectangle Width="16" Height="16">
3333
<Rectangle.OpacityMask>
3434
<VisualBrush Stretch="Fill" Visual="{iconPacks:Material Kind=Plus}" />

0 commit comments

Comments
 (0)