Skip to content

Commit eeab1f1

Browse files
committed
Help added BornToBeRoot#190
1 parent c0959dc commit eeab1f1

3 files changed

Lines changed: 60 additions & 3 deletions

File tree

Source/NETworkManager/Resources/Localization/Strings.Designer.cs

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Source/NETworkManager/Resources/Localization/Strings.resx

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2262,4 +2262,13 @@ is disabled!</value>
22622262
<data name="RemoteDesktopAudioRedirectionMode_PlayOnThisComputer" xml:space="preserve">
22632263
<value>Play on this computer</value>
22642264
</data>
2265+
<data name="HelpMessage_PublicDNSTestDomain" xml:space="preserve">
2266+
<value>Domain to test dns server settings (Domain must resolve A or AAAA record).</value>
2267+
</data>
2268+
<data name="HelpMessage_PublicDNSTestIPAddress" xml:space="preserve">
2269+
<value>IP address to test dns server settings (IP address must resolve PTR record).</value>
2270+
</data>
2271+
<data name="HelpMessage_PublicICMPTestIPAddress" xml:space="preserve">
2272+
<value>IP address to test connection via ping (ICMP).</value>
2273+
</data>
22652274
</root>

Source/NETworkManager/Views/DashboardSettingsView.xaml

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,14 @@
1010
mc:Ignorable="d" d:DataContext="{d:DesignInstance viewModels:DashboardSettingsViewModel}">
1111
<StackPanel>
1212
<TextBlock Text="{x:Static localization:Strings.Dashboard}" Style="{StaticResource HeaderTextBlock}" />
13-
<TextBlock Text="{x:Static localization:Strings.PublicICMPTestIPAddress}" Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
13+
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
14+
<TextBlock Text="{x:Static localization:Strings.PublicICMPTestIPAddress}" Style="{DynamicResource DefaultTextBlock}" />
15+
<Rectangle Width="24" Height="24" ToolTip="{x:Static localization:Strings.HelpMessage_PublicICMPTestIPAddress}" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
16+
<Rectangle.Resources>
17+
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
18+
</Rectangle.Resources>
19+
</Rectangle>
20+
</StackPanel>
1421
<TextBox Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" mahAppsControls:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort53}" Style="{StaticResource DefaultTextBox}">
1522
<TextBox.Text>
1623
<Binding Path="PublicICMPTestIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -21,7 +28,14 @@
2128
</Binding>
2229
</TextBox.Text>
2330
</TextBox>
24-
<TextBlock Text="{x:Static localization:Strings.PublicDNSTestDomain}" Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
31+
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
32+
<TextBlock Text="{x:Static localization:Strings.PublicDNSTestDomain}" Style="{DynamicResource DefaultTextBlock}" />
33+
<Rectangle Width="24" Height="24" ToolTip="{x:Static localization:Strings.HelpMessage_PublicDNSTestDomain}" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
34+
<Rectangle.Resources>
35+
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
36+
</Rectangle.Resources>
37+
</Rectangle>
38+
</StackPanel>
2539
<TextBox Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" mahAppsControls:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort53}" Style="{StaticResource DefaultTextBox}">
2640
<TextBox.Text>
2741
<Binding Path="PublicDNSTestDomain" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
@@ -32,7 +46,14 @@
3246
</Binding>
3347
</TextBox.Text>
3448
</TextBox>
35-
<TextBlock Text="{x:Static localization:Strings.PublicDNSTestIPAddress}" Style="{DynamicResource DefaultTextBlock}" Margin="0,0,0,10" />
49+
<StackPanel Orientation="Horizontal" Margin="0,0,0,10">
50+
<TextBlock Text="{x:Static localization:Strings.PublicDNSTestIPAddress}" Style="{DynamicResource DefaultTextBlock}" />
51+
<Rectangle Width="24" Height="24" ToolTip="{x:Static localization:Strings.HelpMessage_PublicDNSTestIPAddress}" Style="{StaticResource HelpImageRectangle}" Margin="10,0,0,0">
52+
<Rectangle.Resources>
53+
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
54+
</Rectangle.Resources>
55+
</Rectangle>
56+
</StackPanel>
3657
<TextBox Width="250" HorizontalAlignment="Left" Margin="0,0,0,10" mahAppsControls:TextBoxHelper.Watermark="{x:Static localization:StaticStrings.ExamplePort53}" Style="{StaticResource DefaultTextBox}">
3758
<TextBox.Text>
3859
<Binding Path="PublicDNSTestIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">

0 commit comments

Comments
 (0)