STRLCPY/NETworkManager

■ ■ ■ ■ ■ ■

Source/NETworkManager/Resources/Styles/MetroDialogStyles.xaml

1	1		<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
2		-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
3		-	xmlns:dialog="clr-namespace:MahApps.Metro.Controls.Dialogs;assembly=MahApps.Metro">
4		-	<Style x:Key="ProfileMetroDialog" TargetType="{x:Type dialog:BaseMetroDialog}" BasedOn="{StaticResource {x:Type dialog:BaseMetroDialog}}">
5		-	<Setter Property="Template">
6		-	<Setter.Value>
7		-	<ControlTemplate TargetType="{x:Type dialog:BaseMetroDialog}">
8		-	<ControlTemplate.Resources>
9		-	<Storyboard x:Key="DialogShownStoryboard">
10		-	<DoubleAnimation AccelerationRatio=".9" BeginTime="0:0:0" Storyboard.TargetProperty="Opacity" To="1" Duration="0:0:0.2" />
11		-	</Storyboard>
12		-	</ControlTemplate.Resources>
13		-	<Grid Background="{TemplateBinding Background}">
14		-	<Grid.RowDefinitions>
15		-	<RowDefinition Height="Auto" />
16		-	<RowDefinition Height="*" MaxHeight="560" /> <!-- Adjust MaxHeight if Window.xaml MinHeight has changed -> 80% -->
17		-	<RowDefinition Height="Auto" />
18		-	</Grid.RowDefinitions>
19		-	<ContentPresenter Grid.Row="0" AutomationProperties.Name="Dialog top" Content="{TemplateBinding DialogTop}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
20		-	<Grid Grid.Row="1" >
21		-	<Grid.ColumnDefinitions>
22		-	<ColumnDefinition Width="10*" />
23		-	<ColumnDefinition Width="80*" MaxWidth="840" />
24		-	<!-- Adjust MaxHeight if Window.xaml MinWidth has changed -> 80% -->
25		-	<ColumnDefinition Width="10*" />
26		-	</Grid.ColumnDefinitions>
27		-	<!-- Content area -->
28		-	<Grid Grid.Column="1" Margin="{TemplateBinding Padding}">
29		-	<Grid.RowDefinitions>
30		-	<RowDefinition Height="Auto" />
31		-	<RowDefinition Height="*" />
32		-	</Grid.RowDefinitions>
33		-	<TextBlock x:Name="PART_Title" Grid.Row="0" AutomationProperties.Name="Dialog title" FontSize="{TemplateBinding DialogTitleFontSize}" Foreground="{TemplateBinding Foreground}" Text="{TemplateBinding Title}" TextWrapping="Wrap" />
34		-	<ContentPresenter Grid.Row="1" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}" AutomationProperties.Name="Dialog content" Content="{TemplateBinding Content}" ContentStringFormat="{TemplateBinding ContentStringFormat}" ContentTemplate="{TemplateBinding ContentTemplate}" ContentTemplateSelector="{TemplateBinding ContentTemplateSelector}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
35		-	</Grid>
36		-	</Grid>
37		-	<ContentPresenter Grid.Row="2" AutomationProperties.Name="Dialog bottom" Content="{TemplateBinding DialogBottom}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
38		-	</Grid>
39		-	<ControlTemplate.Triggers>
40		-	<Trigger Property="Title" Value="{x:Null}">
41		-	<Setter TargetName="PART_Title" Property="Visibility" Value="Collapsed" />
42		-	</Trigger>
43		-	<EventTrigger RoutedEvent="Loaded">
44		-	<EventTrigger.Actions>
45		-	<BeginStoryboard Storyboard="{StaticResource DialogShownStoryboard}" />
46		-	</EventTrigger.Actions>
47		-	</EventTrigger>
48		-	</ControlTemplate.Triggers>
49		-	</ControlTemplate>
50		-	</Setter.Value>
51		-	</Setter>
	2	+	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
	3	+	<ResourceDictionary.MergedDictionaries>
	4	+	<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.Buttons.xaml" />
	5	+	</ResourceDictionary.MergedDictionaries>
	6	+
	7	+	<!-- Override the buttons in MahApps.Metro Dialogs -->
	8	+	<Style x:Key="MahApps.Styles.Button.Dialogs" BasedOn="{StaticResource DefaultButton}" TargetType="{x:Type Button}">
	9	+	<Setter Property="VerticalAlignment" Value="Center" />
	10	+	<Setter Property="FontSize" Value="14" />
52	11		</Style>
53	12
54		-	<Style TargetType="{x:Type dialog:CustomDialog}" BasedOn="{StaticResource ProfileMetroDialog}" />
55		-
56		-	<!-- Override the buttons in MahApps.Metro Dialogs -->
57		-	<Style BasedOn="{StaticResource DefaultButton}" TargetType="{x:Type Button}" />
58		-	<Style x:Key="AccentedDialogSquareButton" BasedOn="{StaticResource HighlightedButton}" TargetType="{x:Type Button}" />
59		-	<Style x:Key="AccentedDialogHighlightedSquareButton" BasedOn="{StaticResource HighlightedButton}" TargetType="{x:Type Button}" />
	13	+	<Style x:Key="MahApps.Styles.Button.Dialogs.Accent" BasedOn="{StaticResource HighlightedButton}" TargetType="{x:Type Button}">
	14	+	<Setter Property="VerticalAlignment" Value="Center" />
	15	+	<Setter Property="FontSize" Value="14" />
	16	+	</Style>
60	17		</ResourceDictionary>

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ARPTableAddEntryDialog.xaml

		skipped 52 lines
53	53		</TextBox>
54	54		</Grid>
55	55		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
56		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
57		-	<Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" IsDefault="True" Margin="10,0,0,0">
	56	+	<Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" IsDefault="True" Margin="0,0,10,0">
58	57		<Button.Style>
59	58		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
60	59		<Setter Property="IsEnabled" Value="False" />
		skipped 11 lines
72	71		</Style>
73	72		</Button.Style>
74	73		</Button>
	74	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
75	75		</StackPanel>
76	76		</Grid>
77	77		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ConfirmDeleteDialog.xaml

		skipped 15 lines
16	16		<TextBlock Text="{Binding Message}" Style="{StaticResource WrapTextBlock}" />
17	17		</StackPanel>
18	18		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
	19	+	<Button Content="{x:Static localization:Strings.Delete}" Command="{Binding DeleteCommand}" IsDefault="True" Style="{StaticResource HighlightedButton}" Margin="0,0,10,0" />
19	20		<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
20		-	<Button Content="{x:Static localization:Strings.Delete}" Command="{Binding DeleteCommand}" IsDefault="True" Style="{StaticResource HighlightedButton}" Margin="10,0,0,0" />
	21	+
21	22		</StackPanel>
22	23		</Grid>
23	24		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/CredentialsChangePasswordDialog.xaml

		skipped 69 lines
70	70		</TextBlock.Style>
71	71		</TextBlock>
72	72		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
73		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
74		-	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="10,0,0,0">
	73	+	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
75	74		<Button.Style>
76	75		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
77	76		<Setter Property="IsEnabled" Value="False" />
		skipped 11 lines
89	88		</Style>
90	89		</Button.Style>
91	90		</Button>
	91	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
92	92		</StackPanel>
93	93		</Grid>
94	94		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/CredentialsPasswordDialog.xaml

		skipped 34 lines
35	35		</PasswordBox>
36	36		</Grid>
37	37		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
38		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
39		-	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="10,0,0,0">
	38	+	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
40	39		<Button.Style>
41	40		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
42	41		<Setter Property="IsEnabled" Value="False" />
		skipped 5 lines
48	47		</Style>
49	48		</Button.Style>
50	49		</Button>
	50	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
51	51		</StackPanel>
52	52		</Grid>
53	53		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/CredentialsSetPasswordDialog.xaml

		skipped 61 lines
62	62		</TextBlock.Style>
63	63		</TextBlock>
64	64		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
65		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
66		-	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="10,0,0,0">
	65	+	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
67	66		<Button.Style>
68	67		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
69	68		<Setter Property="IsEnabled" Value="False" />
		skipped 11 lines
81	80		</Style>
82	81		</Button.Style>
83	82		</Button>
	83	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
84	84		</StackPanel>
85	85		</Grid>
86	86		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/CustomCommandDialog.xaml

		skipped 87 lines
88	88		</Rectangle>
89	89		</Grid>
90	90		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
91		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
92		-	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="10,0,0,0">
	91	+	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="0,0,10,0">
93	92		<Button.Style>
94	93		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
95	94		<Setter Property="IsEnabled" Value="False" />
		skipped 13 lines
109	108		</Style>
110	109		</Button.Style>
111	110		</Button>
	111	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
112	112		</StackPanel>
113	113		</Grid>
114	114		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/DNSServerDialog.xaml

		skipped 86 lines
87	87		</TextBox>
88	88		</Grid>
89	89		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
90		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
91		-	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="10,0,0,0">
	90	+	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="0,0,10,0">
92	91		<Button.Style>
93	92		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
94	93		<Setter Property="IsEnabled" Value="False" />
		skipped 13 lines
108	107		</Style>
109	108		</Button.Style>
110	109		</Button>
	110	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
111	111		</StackPanel>
112	112		</Grid>
113	113		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ExportDialog.xaml

		skipped 66 lines
67	67		</TextBox>
68	68		</Grid>
69	69		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
70		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
71		-	<Button Content="{x:Static localization:Strings.Export}" Command="{Binding ExportCommand}" IsDefault="True" Margin="10,0,0,0">
	70	+	<Button Content="{x:Static localization:Strings.Export}" Command="{Binding ExportCommand}" IsDefault="True" Margin="0,0,10,0">
72	71		<Button.Style>
73	72		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
74	73		<Style.Triggers>
		skipped 4 lines
79	78		</Style>
80	79		</Button.Style>
81	80		</Button>
	81	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
82	82		</StackPanel>
83	83		</Grid>
84	84		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/GroupDialog.xaml

		skipped 38 lines
39	39		</ComboBox>
40	40		</Grid>
41	41		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
42		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
43		-	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="10,0,0,0">
	42	+	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
44	43		<Button.Style>
45	44		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
46	45		<Setter Property="IsEnabled" Value="False" />
		skipped 5 lines
52	51		</Style>
53	52		</Button.Style>
54	53		</Button>
	54	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
55	55		</StackPanel>
56	56		</Grid>
57	57		</UserControl>

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/NetworkInterfaceAddIPAddressDialog.xaml

		skipped 52 lines
53	53		</TextBox>
54	54		</Grid>
55	55		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
56		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
57		-	<Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" IsDefault="True" Margin="10,0,0,0">
	56	+	<Button Content="{x:Static localization:Strings.Add}" Command="{Binding AddCommand}" IsDefault="True" Margin="0,0,10,0">
58	57		<Button.Style>
59	58		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
60	59		<Setter Property="IsEnabled" Value="False" />
		skipped 11 lines
72	71		</Style>
73	72		</Button.Style>
74	73		</Button>
	74	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
75	75		</StackPanel>
76	76		</Grid>
77	77		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PortProfileDialog.xaml

		skipped 73 lines
74	74		</TextBox>
75	75		</Grid>
76	76		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
77		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
78		-	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="10,0,0,0">
	77	+	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="0,0,10,0">
79	78		<Button.Style>
80	79		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
81	80		<Setter Property="IsEnabled" Value="False" />
		skipped 12 lines
94	93		</Style>
95	94		</Button.Style>
96	95		</Button>
	96	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
97	97		</StackPanel>
98	98		</Grid>
99	99		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PortProfilesDialog.xaml

		skipped 32 lines
33	33		</DataGrid>
34	34		</Grid>
35	35		<StackPanel Grid.Row="4" Orientation="Horizontal" HorizontalAlignment="Right">
36		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
37		-	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="10,0,0,0">
	36	+	<Button Content="{x:Static localization:Strings.OK}" Command="{Binding OKCommand}" IsDefault="True" Margin="0,0,10,0">
38	37		<Button.Style>
39	38		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
40	39		<Setter Property="IsEnabled" Value="False" />
		skipped 10 lines
51	50		</Style>
52	51		</Button.Style>
53	52		</Button>
	53	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
54	54		</StackPanel>
55	55		</Grid>
56	56		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PowerShellConnectDialog.xaml

		skipped 52 lines
53	53		<ComboBox x:Name="ComboBoxTypes" Grid.Column="2" Grid.Row="6" ItemsSource="{Binding ExecutionPolicies}" SelectedItem="{Binding ExecutionPolicy}" />
54	54		</Grid>
55	55		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
	56	+	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Style="{StaticResource HighlightedButton}" Margin="0,0,10,0" />
56	57		<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
57		-	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Style="{StaticResource HighlightedButton}" Margin="10,0,0,0" />
58	58		</StackPanel>
59	59		</Grid>
60	60		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ProfileDialog.xaml

		skipped 1397 lines
1398	1398		</TabControl>
1399	1399		</Grid>
1400	1400		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
1401		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
1402		-	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="10,0,0,0">
	1401	+	<Button Content="{x:Static localization:Strings.Save}" Command="{Binding SaveCommand}" IsDefault="True" Margin="0,0,10,0">
1403	1402		<Button.Style>
1404	1403		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
1405	1404		<Style.Triggers>
		skipped 312 lines
1718	1717		</Style>
1719	1718		</Button.Style>
1720	1719		</Button>
	1720	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
1721	1721		</StackPanel>
1722	1722		</Grid>
1723	1723		</UserControl>

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/ProfileFileDialog.xaml

		skipped 39 lines
40	40		</TextBox>
41	41		</Grid>
42	42		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
43		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
44		-	<Button Command="{Binding AcceptCommand}" IsDefault="True" Margin="10,0,0,0">
	43	+	<Button Command="{Binding AcceptCommand}" IsDefault="True" Margin="0,0,10,0">
45	44		<Button.Style>
46	45		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
47	46		<Setter Property="IsEnabled" Value="False" />
		skipped 14 lines
62	61		</Style>
63	62		</Button.Style>
64	63		</Button>
	64	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
65	65		</StackPanel>
66	66		</Grid>
67	67		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/PuTTYConnectDialog.xaml

		skipped 146 lines
147	147		<TextBox x:Name="TextBoxAdditionalCommandLine" Grid.Column="2" Grid.Row="12" Text="{Binding AdditionalCommandLine, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Style="{StaticResource DefaultTextBox}" />
148	148		</Grid>
149	149		<StackPanel Grid.Row="2" Orientation="Horizontal" HorizontalAlignment="Right">
150		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
151		-	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="10,0,0,0">
	150	+	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="0,0,10,0">
152	151		<Button.Style>
153	152		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
154	153		<Setter Property="IsEnabled" Value="True" />
		skipped 45 lines
200	199		</Style>
201	200		</Button.Style>
202	201		</Button>
	202	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
203	203		</StackPanel>
204	204		</Grid>
205	205		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/RemoteDesktopConnectDialog.xaml

		skipped 96 lines
97	97		</PasswordBox>
98	98		</Grid>
99	99		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
100		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
101		-	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="10,0,0,0">
	100	+	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="0,0,10,0">
102	101		<Button.Style>
103	102		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
104	103		<Setter Property="IsEnabled" Value="True" />
		skipped 14 lines
119	118		</Style>
120	119		</Button.Style>
121	120		</Button>
	121	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
122	122		</StackPanel>
123	123		</Grid>
124	124		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/TigerVNCConnectDialog.xaml

		skipped 55 lines
56	56		</ComboBox>
57	57		</Grid>
58	58		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
59		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
60		-	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="10,0,0,0">
	59	+	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="0,0,10,0">
61	60		<Button.Style>
62	61		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
63	62		<Setter Property="IsEnabled" Value="False" />
		skipped 11 lines
75	74		</Style>
76	75		</Button.Style>
77	76		</Button>
	77	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
78	78		</StackPanel>
79	79		</Grid>
80	80		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager/Views/WebConsoleConnectDialog.xaml

		skipped 42 lines
43	43		</ComboBox>
44	44		</Grid>
45	45		<StackPanel Grid.Row="3" Orientation="Horizontal" HorizontalAlignment="Right">
46		-	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
47		-	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="10,0,0,0">
	46	+	<Button Content="{x:Static localization:Strings.Connect}" Command="{Binding ConnectCommand}" IsDefault="True" Margin="0,0,10,0">
48	47		<Button.Style>
49	48		<Style TargetType="{x:Type Button}" BasedOn="{StaticResource HighlightedButton}">
50	49		<Setter Property="IsEnabled" Value="False" />
		skipped 10 lines
61	60		</Style>
62	61		</Button.Style>
63	62		</Button>
	63	+	<Button Content="{x:Static localization:Strings.Cancel}" Command="{Binding CancelCommand}" IsCancel="True" Style="{StaticResource DefaultButton}" />
64	64		</StackPanel>
65	65		</Grid>
66	66		</UserControl>
		skipped 1 lines

■ ■ ■ ■ ■ ■

Source/NETworkManager.Settings/AppearanceManager.cs

1	1		using ControlzEx.Theming;
2	2		using MahApps.Metro.Controls.Dialogs;
	3	+	using System;
3	4		using System.Collections.Generic;
4	5		using System.Linq;
	6	+	using System.Windows;
5	7		using System.Windows.Media;
6	8
7	9		namespace NETworkManager.Settings
		skipped 4 lines
12	14		public static class AppearanceManager
13	15		{
14	16		/// <summary>
15		-	/// Containes the default settings for a new <see cref="BaseMetroDialog"/>
16		-	/// </summary>
17		-	public static MetroDialogSettings MetroDialog = new MetroDialogSettings();
18		-
19		-	/// <summary>
20	17		/// List who contains all MahApps.Metro themes.
21	18		/// </summary>
22	19		public static List<ThemeColorInfo> Themes { get; set; }
		skipped 4 lines
27	24		public static List<AccentColorInfo> Accents { get; set; }
28	25
29	26		/// <summary>
	27	+	/// Containes the default settings for a new <see cref="BaseMetroDialog"/>
	28	+	/// </summary>
	29	+	public static MetroDialogSettings MetroDialog = new MetroDialogSettings();
	30	+
	31	+	/// <summary>
30	32		/// Load the MahApps.Metro themes and accents when needed.
31	33		/// </summary>
32	34		static AppearanceManager()
		skipped 9 lines
42	44		.OrderBy(x => x.Key)
43	45		.Select(x => new AccentColorInfo { Name = x.Key, Color = x.First().ShowcaseBrush })
44	46		.ToList();
	47	+
	48	+	MetroDialog.CustomResourceDictionary = new ResourceDictionary
	49	+	{
	50	+	Source = new Uri("NETworkManager;component/Resources/Styles/MetroDialogStyles.xaml", UriKind.RelativeOrAbsolute)
	51	+	};
45	52		}
46	53
47	54		/// <summary>
		skipped 28 lines

■ ■ ■ ■ ■ ■

docs/04_Changelog.md

		skipped 26 lines
27	27		- Host added to profiles view
28	28
29	29		## Bugfixes
	30	+	- Documentation restructured [#568](https://github.com/BornToBeRoot/NETworkManager/issues/568){:target="_blank"}
30	31		- Network Interface - Disable `Add IPv4 address...` button if network adapter is not connected [#484](https://github.com/BornToBeRoot/NETworkManager/issues/484){:target="_blank"}
	32	+	- Dialog button style fixed and button order changed [#328](https://github.com/BornToBeRoot/NETworkManager/issues/328){:target="_blank"}
31	33
32	34		## Other
33	35		- Code refactored [#485](https://github.com/BornToBeRoot/NETworkManager/issues/485){:target="_blank"}
34	36		- Transifex Github integration added
35	37		- Language files updated
36		-
37	38
38	39		# Version 2021.2.17.0
39	40		Date: 17.02.2021
		skipped 454 lines

Change default MahApps dialog button style (#570)