Skip to content

Commit 9745946

Browse files
BornToBeRootBornToBeRoot
committed
UI / Strings improved
1 parent c5b4d38 commit 9745946

10 files changed

Lines changed: 40 additions & 36 deletions

File tree

‎Source/NETworkManager/NETworkManager.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,14 +58,14 @@
5858
<ApplicationIcon>Resources\Images\NETworkManager.ico</ApplicationIcon>
5959
</PropertyGroup>
6060
<ItemGroup>
61-
<Reference Include="ControlzEx, Version=3.0.1.66, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\packages\ControlzEx.3.0.1.66\lib\net45\ControlzEx.dll</HintPath>
61+
<Reference Include="ControlzEx, Version=3.0.2.4, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\ControlzEx.dll</HintPath>
6363
</Reference>
6464
<Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\packages\MahApps.Metro.1.6.0-alpha013\lib\net45\MahApps.Metro.dll</HintPath>
65+
<HintPath>..\packages\MahApps.Metro.1.6.0-alpha016\lib\net45\MahApps.Metro.dll</HintPath>
6666
</Reference>
67-
<Reference Include="MahApps.Metro.IconPacks, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\packages\MahApps.Metro.IconPacks.1.9.0\lib\net46\MahApps.Metro.IconPacks.dll</HintPath>
67+
<Reference Include="MahApps.Metro.IconPacks, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\packages\MahApps.Metro.IconPacks.1.9.1\lib\net46\MahApps.Metro.IconPacks.dll</HintPath>
6969
</Reference>
7070
<Reference Include="System" />
7171
<Reference Include="System.Configuration" />
@@ -76,7 +76,7 @@
7676
<Reference Include="System.Management" />
7777
<Reference Include="System.Windows.Forms" />
7878
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
79-
<HintPath>..\packages\ControlzEx.3.0.1.66\lib\net45\System.Windows.Interactivity.dll</HintPath>
79+
<HintPath>..\packages\ControlzEx.3.0.2.4\lib\net45\System.Windows.Interactivity.dll</HintPath>
8080
</Reference>
8181
<Reference Include="System.Xml" />
8282
<Reference Include="Microsoft.CSharp" />

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<system:String x:Key="String_Header_Settings">Einstellungen</system:String>
88
<system:String x:Key="String_Header_Status">Status</system:String>
99
<system:String x:Key="String_Header_Clients">Clients</system:String>
10+
<system:String x:Key="String_Header_Client">Client</system:String>
1011
<system:String x:Key="String_Header_MACAddress">MAC-Adresse</system:String>
11-
<system:String x:Key="String_Header_MACAddressOrVendor">MAC-Adresse oder Hersteller</system:String>
1212
<system:String x:Key="String_Header_Details">Details</system:String>
1313
<system:String x:Key="String_Header_Input">Eingabe</system:String>
1414
<system:String x:Key="String_Header_Interface">Interface</system:String>
@@ -25,7 +25,6 @@
2525
<system:String x:Key="String_Header_Location">Speicherort</system:String>
2626
<system:String x:Key="String_Header_Portable">Portable</system:String>
2727
<system:String x:Key="String_Header_DefaultApplication">Standardanwendung</system:String>
28-
<system:String x:Key="String_Header_IPRange">IP-Bereich</system:String>
2928
<system:String x:Key="String_Header_Result">Ergebnis</system:String>
3029
<system:String x:Key="String_Header_Ping">Ping</system:String>
3130
<system:String x:Key="String_Header_DNS">DNS</system:String>
@@ -48,7 +47,6 @@
4847
<system:String x:Key="String_Header_PortScanner">Port-Scanner</system:String>
4948
<system:String x:Key="String_Header_PortLookup">Port-Lookup</system:String>
5049
<system:String x:Key="String_Header_Port">Port</system:String>
51-
<system:String x:Key="String_Header_PortPortRangeOrService">Port, Port-Range oder Service</system:String>
5250
<system:String x:Key="String_Header_Socket">Socket</system:String>
5351
<system:String x:Key="String_Header_History">History</system:String>
5452
<system:String x:Key="String_Header_Update">Update</system:String>
@@ -58,10 +56,12 @@
5856
<system:String x:Key="String_Header_SelectAProfile">Profil auswählen...</system:String>
5957
<system:String x:Key="String_Header_Profiles">Profile</system:String>
6058
<system:String x:Key="String_Header_AddProfile">Profil hinzufügen</system:String>
61-
<system:String x:Key="String_Header_WakeUp">Aufwecken</system:String>
6259
<system:String x:Key="String_Header_AddClient">Client hinzufügen</system:String>
6360
<system:String x:Key="String_Header_Libraries">Bibliotheken</system:String>
6461
<system:String x:Key="String_Header_License">Lizenz</system:String>
62+
<system:String x:Key="String_Header_Search">Suche</system:String>
63+
<system:String x:Key="String_Header_Scan">Scannen</system:String>
64+
<system:String x:Key="String_Header_Lookup">Lookup</system:String>
6565

6666
<!-- Normal strings -->
6767
<system:String x:Key="String_ProductName">NETworkManager</system:String>
@@ -232,6 +232,7 @@
232232
<system:String x:Key="String_Authorities">Authorities</system:String>
233233
<system:String x:Key="String_Additionals">Additionals</system:String>
234234
<system:String x:Key="String_MessageSize">Nachrichtengröße</system:String>
235+
<system:String x:Key="String_Destination">Ziel</system:String>
235236

236237
<!-- Buttons -->
237238
<system:String x:Key="String_Button_Change">Wechseln</system:String>

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
<system:String x:Key="String_Header_Settings">Settings</system:String>
88
<system:String x:Key="String_Header_Status">Status</system:String>
99
<system:String x:Key="String_Header_Clients">Clients</system:String>
10+
<system:String x:Key="String_Header_Client">Clients</system:String>
1011
<system:String x:Key="String_Header_MACAddress">MAC-Address</system:String>
11-
<system:String x:Key="String_Header_MACAddressOrVendor">MAC-Address or Vendor</system:String>
1212
<system:String x:Key="String_Header_Details">Details</system:String>
1313
<system:String x:Key="String_Header_Input">Input</system:String>
1414
<system:String x:Key="String_Header_Interface">Interface</system:String>
@@ -25,7 +25,6 @@
2525
<system:String x:Key="String_Header_Location">Location</system:String>
2626
<system:String x:Key="String_Header_Portable">Portable</system:String>
2727
<system:String x:Key="String_Header_DefaultApplication">Default application</system:String>
28-
<system:String x:Key="String_Header_IPRange">IP-Range</system:String>
2928
<system:String x:Key="String_Header_Result">Result</system:String>
3029
<system:String x:Key="String_Header_Ping">Ping</system:String>
3130
<system:String x:Key="String_Header_DNS">DNS</system:String>
@@ -48,7 +47,6 @@
4847
<system:String x:Key="String_Header_PortScanner">Port-Scanner</system:String>
4948
<system:String x:Key="String_Header_PortLookup">Port-Lookup</system:String>
5049
<system:String x:Key="String_Header_Port">Port</system:String>
51-
<system:String x:Key="String_Header_PortPortRangeOrService">Port, port range or service</system:String>
5250
<system:String x:Key="String_Header_Socket">Socket</system:String>
5351
<system:String x:Key="String_Header_History">History</system:String>
5452
<system:String x:Key="String_Header_Update">Update</system:String>
@@ -58,11 +56,13 @@
5856
<system:String x:Key="String_Header_SelectAProfile">Select a profile...</system:String>
5957
<system:String x:Key="String_Header_Profiles">Profiles</system:String>
6058
<system:String x:Key="String_Header_AddProfile">Add profile</system:String>
61-
<system:String x:Key="String_Header_WakeUp">Wake up</system:String>
6259
<system:String x:Key="String_Header_AddClient">Add client</system:String>
6360
<system:String x:Key="String_Header_Libraries">Libraries</system:String>
6461
<system:String x:Key="String_Header_License">License</system:String>
65-
62+
<system:String x:Key="String_Header_Search">Search</system:String>
63+
<system:String x:Key="String_Header_Scan">Scan</system:String>
64+
<system:String x:Key="String_Header_Lookup">Lookup</system:String>
65+
6666
<!-- Normal strings -->
6767
<system:String x:Key="String_ProductName">NETworkManager</system:String>
6868
<system:String x:Key="String_Slogan">A powerful tool for managing networks and troubleshoot network problems!</system:String>
@@ -232,7 +232,8 @@
232232
<system:String x:Key="String_Authorities">Authorities</system:String>
233233
<system:String x:Key="String_Additionals">Additionals</system:String>
234234
<system:String x:Key="String_MessageSize">Message size</system:String>
235-
235+
<system:String x:Key="String_Destination">Destination</system:String>
236+
236237
<!-- Buttons -->
237238
<system:String x:Key="String_Button_Change">Change</system:String>
238239
<system:String x:Key="String_Button_Default">Default</system:String>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<RowDefinition Height="*" />
2626
<RowDefinition Height="Auto" />
2727
</Grid.RowDefinitions>
28-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Destination}" />
28+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Lookup}" />
2929
<Grid Grid.Row="1" Margin="0,0,0,20">
3030
<Grid.RowDefinitions>
3131
<RowDefinition Height="Auto" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<RowDefinition Height="*" />
2828
<RowDefinition Height="Auto" />
2929
</Grid.RowDefinitions>
30-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_IPRange}" />
30+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Scan}" />
3131
<Grid Grid.Row="1" Margin="0,0,0,20">
3232
<Grid.RowDefinitions>
3333
<RowDefinition Height="Auto" />

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<RowDefinition Height="*" />
2626
<RowDefinition Height="Auto" />
2727
</Grid.RowDefinitions>
28-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Destination}" />
28+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Scan}" />
2929
<Grid Grid.Row="1" Margin="0,0,0,20">
3030
<Grid.RowDefinitions>
3131
<RowDefinition Height="Auto" />
@@ -35,16 +35,17 @@
3535
<StackPanel Grid.Row="0">
3636
<Grid Margin="0,0,0,10">
3737
<Grid.ColumnDefinitions>
38-
<ColumnDefinition Width="200" />
38+
<ColumnDefinition Width="Auto" />
39+
<ColumnDefinition Width="10" />
3940
<ColumnDefinition Width="*" />
4041
</Grid.ColumnDefinitions>
4142
<Grid.RowDefinitions>
4243
<RowDefinition Height="Auto" />
4344
<RowDefinition Height="10" />
4445
<RowDefinition Height="Auto" />
4546
</Grid.RowDefinitions>
46-
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_HostnameOrIPAddress}" />
47-
<ComboBox Grid.Column="1" Grid.Row="0" x:Name="cbHostnameOrIPAddress" ItemsSource="{Binding HostnameOrIPAddressHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostnameAndOrIPAddress}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
47+
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Destination}" />
48+
<ComboBox Grid.Column="2" Grid.Row="0" x:Name="cbHostnameOrIPAddress" ItemsSource="{Binding HostnameOrIPAddressHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleHostnameAndOrIPAddress}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
4849
<ComboBox.Text>
4950
<Binding Path="HostnameOrIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
5051
<Binding.ValidationRules>
@@ -54,7 +55,7 @@
5455
</ComboBox.Text>
5556
</ComboBox>
5657
<TextBlock Grid.Column="0" Grid.Row="2" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_Ports}" />
57-
<ComboBox Grid.Column="1" Grid.Row="2" x:Name="cbPorts" ItemsSource="{Binding PortsHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EamplePortScanRange}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
58+
<ComboBox Grid.Column="2" Grid.Row="2" x:Name="cbPorts" ItemsSource="{Binding PortsHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_EamplePortScanRange}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
5859
<ComboBox.Text>
5960
<Binding Path="Ports" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
6061
<Binding.ValidationRules>
@@ -65,7 +66,7 @@
6566
</ComboBox.Text>
6667
</ComboBox>
6768
</Grid>
68-
<Button Grid.Column="1" Grid.Row="1" Command="{Binding ScanCommand}" IsDefault="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" IsCancel="{Binding IsScanRunning}" HorizontalAlignment="Right">
69+
<Button Command="{Binding ScanCommand}" IsDefault="{Binding IsScanRunning, Converter={StaticResource BooleanReverseConverter}}" IsCancel="{Binding IsScanRunning}" HorizontalAlignment="Right">
6970
<Button.Resources>
7071
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
7172
<Setter Property="IsEnabled" Value="True" />

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,19 @@
2222
<RowDefinition Height="*" />
2323
<RowDefinition Height="Auto" />
2424
</Grid.RowDefinitions>
25-
<Grid Grid.Row="0" Width="450" HorizontalAlignment="Left" Margin="0,0,0,20">
25+
<Grid Grid.Row="0" HorizontalAlignment="Left" Margin="0,0,0,20">
2626
<Grid.RowDefinitions>
2727
<RowDefinition Height="Auto" />
2828
<RowDefinition Height="Auto" />
2929
<RowDefinition Height="Auto" />
3030
<RowDefinition Height="Auto" />
3131
</Grid.RowDefinitions>
32-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_WakeUp}" />
32+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Client}" />
3333
<Grid Grid.Row="1" Margin="0,0,0,10">
3434
<Grid.ColumnDefinitions>
35-
<ColumnDefinition Width="1*" />
36-
<ColumnDefinition Width="1*" />
35+
<ColumnDefinition Width="Auto" />
36+
<ColumnDefinition Width="10" />
37+
<ColumnDefinition MinWidth="150" Width="*" />
3738
</Grid.ColumnDefinitions>
3839
<Grid.RowDefinitions>
3940
<RowDefinition Height="Auto" />
@@ -43,7 +44,7 @@
4344
<RowDefinition Height="Auto" />
4445
</Grid.RowDefinitions>
4546
<TextBlock Grid.Column="0" Grid.Row="0" Style="{StaticResource CenterTextBlock}" Text="{DynamicResource String_MACAddress}" />
46-
<TextBox Grid.Column="1" Grid.Row="0" x:Name="txtMACAddress" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleMACAddress}" Style="{StaticResource DefaultTextBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
47+
<TextBox Grid.Column="2" Grid.Row="0" x:Name="txtMACAddress" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding MACAddressHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleMACAddress}" Style="{StaticResource DefaultTextBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
4748
<TextBox.InputBindings>
4849
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
4950
</TextBox.InputBindings>
@@ -57,7 +58,7 @@
5758
</TextBox.Text>
5859
</TextBox>
5960
<TextBlock Grid.Column="0" Grid.Row="2" Text="{DynamicResource String_Broadcast}" Style="{StaticResource CenterTextBlock}" />
60-
<TextBox x:Name="txtBroadcast" Grid.Column="1" Grid.Row="2" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding BroadcastHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPv4Broadcast}" Style="{StaticResource DefaultTextBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
61+
<TextBox x:Name="txtBroadcast" Grid.Column="2" Grid.Row="2" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding BroadcastHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExampleIPv4Broadcast}" Style="{StaticResource DefaultTextBox}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
6162
<TextBox.InputBindings>
6263
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
6364
</TextBox.InputBindings>
@@ -71,7 +72,7 @@
7172
</TextBox.Text>
7273
</TextBox>
7374
<TextBlock Grid.Column="0" Grid.Row="4" Text="{DynamicResource String_Port}" Style="{StaticResource CenterTextBlock}" />
74-
<TextBox x:Name="txtPort" Grid.Column="1" Grid.Row="4" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExamplePort}" Style="{StaticResource DefaultTextBox}" HorizontalAlignment="Left" Width="65" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
75+
<TextBox x:Name="txtPort" Grid.Column="2" Grid.Row="4" WpfHelper:ProtocolSettingsLayout.MVVMHasError="{Binding PortHasError}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_ExamplePort}" Style="{StaticResource DefaultTextBox}" HorizontalAlignment="Left" Width="65" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}">
7576
<TextBox.InputBindings>
7677
<KeyBinding Key="Enter" Command="{Binding WakeUpCommand}" />
7778
</TextBox.InputBindings>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<RowDefinition Height="Auto" />
2323
<RowDefinition Height="*" />
2424
</Grid.RowDefinitions>
25-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_MACAddressOrVendor}" />
25+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Search}" />
2626
<Grid Grid.Row="1" Margin="0,0,0,20">
2727
<Grid.RowDefinitions>
2828
<RowDefinition Height="Auto" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<RowDefinition Height="Auto" />
2222
<RowDefinition Height="*" />
2323
</Grid.RowDefinitions>
24-
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_PortPortRangeOrService}" />
24+
<TextBlock Grid.Row="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Search}" />
2525
<Grid Grid.Row="1" Margin="0,0,0,20">
2626
<Grid.RowDefinitions>
2727
<RowDefinition Height="Auto" />

0 commit comments

Comments
 (0)