Skip to content

Commit 17b52f8

Browse files
BornToBeRootBornToBeRoot
committed
All dialogs improved (help message, watermarks)
1 parent 14f8788 commit 17b52f8

13 files changed

Lines changed: 61 additions & 34 deletions

‎Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@
326326
<system:String x:Key="String_HelpMessage_Tags">Mit Tags können Sie Sitzungen nach Themen/Projekten organisieren. Mehrere Tags können mit ";" getrennt sein. Suche nach Tags mit "tag=xxx".</system:String>
327327
<system:String x:Key="String_HelpMessage_Credentials">Entschlüsseln und laden Sie Ihre Anmeldedaten, um sie auszuwählen.</system:String>
328328
<system:String x:Key="String_HelpMessage_PasswordNotDisplayedCanBeOverwritten">Das Passwort wird bei der Bearbeitung nicht angezeigt, kann jedoch überschrieben werden.</system:String>
329-
<system:String x:Key="String_HelpMessage_RDPAuthenticationLevel">[0] Wenn die Serverauthentifizierung fehlschlägt, wird ohne Warnung eine Verbindung zum Computer hergestellt.\n[1] Wenn die Serverauthentifizierung fehlschlägt, wird keine Verbindung hergestellt.\n[2] Wenn die Server-Authentifizierung fehlschlägt, wird eine Warnung und ein Dialog angezeigt um die Verbindung herzustellen oder abzulehnen.\n[3] Es ist keine Authentifizierungsanforderung angegeben.</system:String>
329+
<system:String x:Key="String_HelpMessage_RDPAuthenticationLevel">[0] Wenn die Serverauthentifizierung fehlschlägt, wird ohne Warnung eine Verbindung zum Computer hergestellt.\n[1] Wenn die Serverauthentifizierung fehlschlägt, wird keine Verbindung hergestellt.\n[2] Wenn die Server-Authentifizierung fehlschlägt, wird eine Warnung und ein Dialog angezeigt, um die Verbindung herzustellen oder abzulehnen.\n[3] Es ist keine Authentifizierungsanforderung angegeben.</system:String>
330330

331331
<!-- Warn message -->
332332
<system:String x:Key="String_WarnMessage_SettingsGeneralAppearanceTransparency">Einige Grafikkarten / Treiber haben Probleme bei der Maximierung der Anwendung, wenn die Transparenz aktiviert ist. Die Funktion muss für die Verwendung von "Remote Desktop" deaktiviert sein! Das Aktivieren oder Deaktivieren dieser Funktion erfordert einen Neustart der Anwendung.</system:String>
@@ -394,19 +394,29 @@
394394
<system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
395395
<system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
396396
<system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname oder IP-Adresse...</system:String>
397-
<system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
397+
<system:String x:Key="String_Watermark_ExampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
398398
<system:String x:Key="String_Watermark_LocationOfTheImport">Speicherort der Importdatei...</system:String>
399399
<system:String x:Key="String_Watermark_ExampleMACAddressesOrVendor">01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</system:String>
400-
<system:String x:Key="String_Watermark_EamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
400+
<system:String x:Key="String_Watermark_ExamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
401401
<system:String x:Key="String_Watermark_ExampleHostnameAndOrIPAddress">192.168.178.1; fritz.box; localhost</system:String>
402402
<system:String x:Key="String_Watermark_ExampleSubnetmaskOrCIDR">/24 oder 255.255.255.0</system:String>
403403
<system:String x:Key="String_Watermark_ExampleIPv4Gateway">192.168.178.1</system:String>
404404
<system:String x:Key="String_Watermark_ExampleIPv4DNSServer">8.8.8.8</system:String>
405-
<system:String x:Key="String_Watermark_EamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
405+
<system:String x:Key="String_Watermark_ExamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
406406
<system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 oder 192.168.178.133/255.255.252.0</system:String>
407407
<system:String x:Key="String_Watermark_Filter">Filter...</system:String>
408408
<system:String x:Key="String_Watermark_ExampleWebsiteUri">http(s)://example.com/index.html</system:String>
409-
409+
<system:String x:Key="String_Watermark_ExampleSubnetWithCIDR">192.168.100.0/24</system:String>
410+
<system:String x:Key="String_Watermark_ExampleIPScannerProfileName">Switche (Zuhause)</system:String>
411+
<system:String x:Key="String_Watermark_ExampleGroupSwitche">Switche</system:String>
412+
<system:String x:Key="String_Watermark_ExampleGroupServers">Server</system:String>
413+
<system:String x:Key="String_Watermark_ExampleNetworkInterfaceProfileName">Switche (statisch)</system:String>
414+
<system:String x:Key="String_Watermark_ExamplePortScannerProfileName">Webserver</system:String>
415+
<system:String x:Key="String_Watermark_ExampleWebserverPorts">80; 443; 8080; 8443</system:String>
416+
<system:String x:Key="String_Watermark_ExampleTags">server; dmz</system:String>
417+
<system:String x:Key="String_Watermark_ExampleUsername">Admin</system:String>
418+
<system:String x:Key="String_Watermark_ExampleCredentialName">Windows-Testbenutzer</system:String>
419+
410420
<!-- ShowProgress -->
411421
<system:String x:Key="String_Progress_SetStaticIPAddress">Setze statische IP-Adresse und Gateway...</system:String>
412422
<system:String x:Key="String_Progress_SetDynamicIPAddress">Setze dynamische IP-Adresse...</system:String>

‎Source/NETworkManager/Resources/Localization/Resources.en-US.xaml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,18 +394,28 @@
394394
<system:String x:Key="String_Watermark_ExampleIPv4Address">192.168.178.55</system:String>
395395
<system:String x:Key="String_Watermark_ExampleSubnetmask">255.255.255.0</system:String>
396396
<system:String x:Key="String_Watermark_HostnameOrIPAddress">Hostname or IP address...</system:String>
397-
<system:String x:Key="String_Watermark_EampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
397+
<system:String x:Key="String_Watermark_ExampleIPScanRange">192.168.1.0/24; 192.168.178.1 - 192.168.178.128; 192.168.[178-179].[1,100,150-200]; 192.168.178.150</system:String>
398398
<system:String x:Key="String_Watermark_LocationOfTheImport">Location of the import file...</system:String>
399399
<system:String x:Key="String_Watermark_ExampleMACAddressesOrVendor">01:23:45:67:89:AB; 01-23-45; AA11BB; 00F1A2C3D4E5; Intel Corp; Asus</system:String>
400-
<system:String x:Key="String_Watermark_EamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
400+
<system:String x:Key="String_Watermark_ExamplePortScanRange">22; 80; 443; 500 - 999; 8080</system:String>
401401
<system:String x:Key="String_Watermark_ExampleHostnameAndOrIPAddress">192.168.178.1; fritz.box</system:String>
402402
<system:String x:Key="String_Watermark_ExampleSubnetmaskOrCIDR">/24 or 255.255.255.0</system:String>
403403
<system:String x:Key="String_Watermark_ExampleIPv4Gateway">192.168.178.1</system:String>
404404
<system:String x:Key="String_Watermark_ExampleIPv4DNSServer">8.8.8.8</system:String>
405-
<system:String x:Key="String_Watermark_EamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
405+
<system:String x:Key="String_Watermark_ExamplePortPortRangeOrService">22; 80; https; ldaps; 777 - 999; 8080</system:String>
406406
<system:String x:Key="String_Watermark_ExampleSubnet">192.168.178.133/22 or 192.168.178.133/255.255.252.0</system:String>
407407
<system:String x:Key="String_Watermark_Filter">Filter...</system:String>
408408
<system:String x:Key="String_Watermark_ExampleWebsiteUri">http(s)://example.com/index.html</system:String>
409+
<system:String x:Key="String_Watermark_ExampleSubnetWithCIDR">192.168.100.0/24</system:String>
410+
<system:String x:Key="String_Watermark_ExampleIPScannerProfileName">Switche (Home)</system:String>
411+
<system:String x:Key="String_Watermark_ExampleGroupSwitche">Switche</system:String>
412+
<system:String x:Key="String_Watermark_ExampleGroupServers">Servers</system:String>
413+
<system:String x:Key="String_Watermark_ExampleNetworkInterfaceProfileName">Switche (static)</system:String>
414+
<system:String x:Key="String_Watermark_ExamplePortScannerProfileName">Webserver</system:String>
415+
<system:String x:Key="String_Watermark_ExampleWebserverPorts">80; 443; 8080; 8443</system:String>
416+
<system:String x:Key="String_Watermark_ExampleTags">server; dmz</system:String>
417+
<system:String x:Key="String_Watermark_ExampleUsername">Admin</system:String>
418+
<system:String x:Key="String_Watermark_ExampleCredentialName">Windows-Testuser</system:String>
409419

410420
<!-- ShowProgress -->
411421
<system:String x:Key="String_Progress_SetStaticIPAddress">Set static IP address and gateway...</system:String>

‎Source/NETworkManager/Views/Applications/IPScannerView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<ColumnDefinition Width="10" />
4949
<ColumnDefinition Width="Auto" />
5050
</Grid.ColumnDefinitions>
51-
<ComboBox Grid.Column="0" x:Name="cbIPRange" ItemsSource="{Binding IPRangeHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EampleIPScanRange}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
51+
<ComboBox Grid.Column="0" x:Name="cbIPRange" ItemsSource="{Binding IPRangeHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPScanRange}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
5252
<ComboBox.Text>
5353
<Binding Path="IPRange" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
5454
<Binding.ValidationRules>

‎Source/NETworkManager/Views/Applications/LookupPortLookupView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ColumnDefinition Width="10" />
3535
<ColumnDefinition Width="Auto" />
3636
</Grid.ColumnDefinitions>
37-
<ComboBox Grid.Column="0" x:Name="txtPortsOrService" ItemsSource="{Binding PortsHistory}" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortsOrServiceHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EamplePortPortRangeOrService}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
37+
<ComboBox Grid.Column="0" x:Name="txtPortsOrService" ItemsSource="{Binding PortsHistory}" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortsOrServiceHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExamplePortPortRangeOrService}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
3838
<ComboBox.InputBindings>
3939
<KeyBinding Command="{Binding PortLookupCommand}" Key="Return" />
4040
</ComboBox.InputBindings>

‎Source/NETworkManager/Views/Applications/PortScannerView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
</ComboBox.Text>
6868
</ComboBox>
6969
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Ports}" Style="{StaticResource CenterTextBlock}" />
70-
<ComboBox Grid.Column="2" Grid.Row="2" x:Name="cbPorts" ItemsSource="{Binding PortsHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EamplePortScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
70+
<ComboBox Grid.Column="2" Grid.Row="2" x:Name="cbPorts" ItemsSource="{Binding PortsHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExamplePortScanRange}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
7171
<ComboBox.Text>
7272
<Binding Path="Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
7373
<Binding.ValidationRules>

‎Source/NETworkManager/Views/Dialogs/ARPTableAddEntryDialog.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:Validator="clr-namespace:NETworkManager.Validators"
7+
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
78
mc:Ignorable="d" Loaded="UserControl_Loaded">
89
<Grid Margin="0,20">
910
<Grid.RowDefinitions>
@@ -27,7 +28,7 @@
2728
<ColumnDefinition Width="*" />
2829
</Grid.ColumnDefinitions>
2930
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_IPAddress}" />
30-
<TextBox x:Name="txtIPAddress" Grid.Column="2" Grid.Row="0">
31+
<TextBox x:Name="txtIPAddress" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPv4Address}">
3132
<TextBox.Text>
3233
<Binding Path="IPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
3334
<Binding.ValidationRules>
@@ -38,7 +39,7 @@
3839
</TextBox.Text>
3940
</TextBox>
4041
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_MACAddress}" />
41-
<TextBox x:Name="txtMACAddress" Grid.Column="2" Grid.Row="2">
42+
<TextBox x:Name="txtMACAddress" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleMACAddress}">
4243
<TextBox.Text>
4344
<Binding Path="MACAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
4445
<Binding.ValidationRules>

‎Source/NETworkManager/Views/Dialogs/CredentialDialog.xaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
xmlns:Interactivity="clr-namespace:System.Windows.Interactivity;assembly=System.Windows.Interactivity"
88
xmlns:Validator="clr-namespace:NETworkManager.Validators"
99
xmlns:Converter="clr-namespace:NETworkManager.Converters"
10+
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
1011
mc:Ignorable="d" Loaded="UserControl_Loaded">
1112
<UserControl.Resources>
1213
<Converter:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
@@ -40,7 +41,7 @@
4041
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_ID}" />
4142
<TextBox x:Name="txtID" Grid.Column="2" Grid.Row="0" Text="{Binding ID}" IsReadOnly="True" TextAlignment="Center" />
4243
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Name}" />
43-
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="2">
44+
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleCredentialName}">
4445
<TextBox.Text>
4546
<Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
4647
<Binding.ValidationRules>
@@ -50,7 +51,7 @@
5051
</TextBox.Text>
5152
</TextBox>
5253
<TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_Username}" />
53-
<TextBox x:Name="txtUsername" Grid.Column="2" Grid.Row="4">
54+
<TextBox x:Name="txtUsername" Grid.Column="2" Grid.Row="4" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleUsername}">
5455
<TextBox.Text>
5556
<Binding Path="Username" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
5657
<Binding.ValidationRules>

‎Source/NETworkManager/Views/Dialogs/IPScannerProfileDialog.xaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:Validator="clr-namespace:NETworkManager.Validators"
7+
xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
78
mc:Ignorable="d" Loaded="UserControl_Loaded">
89
<Grid Margin="0,20">
910
<Grid.RowDefinitions>
@@ -29,7 +30,7 @@
2930
<ColumnDefinition Width="*" />
3031
</Grid.ColumnDefinitions>
3132
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Name}" />
32-
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0">
33+
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPScannerProfileName}">
3334
<TextBox.Text>
3435
<Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
3536
<Binding.ValidationRules>
@@ -39,7 +40,7 @@
3940
</TextBox.Text>
4041
</TextBox>
4142
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_IPRange}" />
42-
<TextBox x:Name="txtIPRange" Grid.Column="2" Grid.Row="2">
43+
<TextBox x:Name="txtIPRange" Grid.Column="2" Grid.Row="2" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleSubnetWithCIDR}">
4344
<TextBox.Text>
4445
<Binding Path="IPRange" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
4546
<Binding.ValidationRules>
@@ -50,7 +51,7 @@
5051
</TextBox.Text>
5152
</TextBox>
5253
<TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_Group}" />
53-
<ComboBox x:Name="cbGroup" Grid.Column="2" Grid.Row="4" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}">
54+
<ComboBox x:Name="cbGroup" Grid.Column="2" Grid.Row="4" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleGroupSwitche}">
5455
<ComboBox.Text>
5556
<Binding Path="Group" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
5657
<Binding.ValidationRules>

‎Source/NETworkManager/Views/Dialogs/NetworkInterfaceProfileDialog.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<ColumnDefinition Width="*" />
3434
</Grid.ColumnDefinitions>
3535
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Name}" />
36-
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0">
36+
<TextBox x:Name="txtName" Grid.Column="2" Grid.Row="0" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleNetworkInterfaceProfileName}">
3737
<TextBox.Text>
3838
<Binding Path="Name" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
3939
<Binding.ValidationRules>
@@ -147,7 +147,7 @@
147147
<ColumnDefinition Width="*" />
148148
</Grid.ColumnDefinitions>
149149
<TextBlock Grid.Column="0" Grid.Row="0" Text="{DynamicResource String_Group}" />
150-
<ComboBox x:Name="cbGroup" Grid.Column="2" Grid.Row="0" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}">
150+
<ComboBox x:Name="cbGroup" Grid.Column="2" Grid.Row="0" Style="{StaticResource EditableComboBox}" ItemsSource="{Binding Groups}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleGroupSwitche}">
151151
<ComboBox.Text>
152152
<Binding Path="Group" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
153153
<Binding.ValidationRules>

0 commit comments

Comments
 (0)