Skip to content

Commit 4de3143

Browse files
committed
Settings/Appearance/Transparency warning added
1 parent 5405556 commit 4de3143

File tree

5 files changed

+39
-5
lines changed

5 files changed

+39
-5
lines changed

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<system:String x:Key="String_Header_ARPTable">ARP-Tabelle</system:String>
8585
<system:String x:Key="String_Header_Website">Webseite</system:String>
8686
<system:String x:Key="String_Header_Headers">Headers</system:String>
87-
87+
8888
<!-- Normal strings -->
8989
<system:String x:Key="String_ProductName">NETworkManager</system:String>
9090
<system:String x:Key="String_Slogan">Ein leistungsstarkes Tool zum Verwalten von Netzwerken und zur Behebung von Netzwerkproblemen!</system:String>
@@ -175,7 +175,7 @@
175175
<system:String x:Key="String_ConfirmClose">Schließen bestätigen</system:String>
176176
<system:String x:Key="String_ConfirmCloseQuesiton">Sind Sie sicher, dass Sie die Anwendung beenden möchten?</system:String>
177177
<system:String x:Key="String_UntrayBringWindowToFront">Untray / Fenster in den Vordergrund bringen</system:String>
178-
<system:String x:Key="String_MaximumNumberOfHopsReached">Maximale Anzahl ({0}) an Hops/Router erreicht! </system:String>
178+
<system:String x:Key="String_MaximumNumberOfHopsReached">Maximale Anzahl ({0}) an Hops/Router erreicht!</system:String>
179179
<system:String x:Key="String_CanceledByUser">Der Vorgang wurde vom Benutzer abgebrochen!</system:String>
180180
<system:String x:Key="String_ApplicationSettings">Anwendungseinstellungen</system:String>
181181
<system:String x:Key="String_NetworkInterfaceProfiles">Netzwerkinterface Profile</system:String>
@@ -297,7 +297,10 @@
297297
<system:String x:Key="String_HelpMessage_ParameterHelp">Zeigt diesen Dialog an.</system:String>
298298
<system:String x:Key="String_HelpMessage_ParameterResetSettings">Setzt alle Einstellungen zurück.</system:String>
299299
<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>
300-
300+
301+
<!-- Warn message -->
302+
<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>
303+
301304
<!-- Buttons -->
302305
<system:String x:Key="String_Button_Change">Wechseln</system:String>
303306
<system:String x:Key="String_Button_Default">Standard</system:String>
@@ -391,7 +394,7 @@
391394
<system:String x:Key="String_ValidateError_EnterValidIPAddress">Geben Sie eine gültige IP-Adresse ein!</system:String>
392395
<system:String x:Key="String_ValidateError_EnterValidSubnet">Geben Sie ein gültiges Subnetz ein (z.B. 192.168.178.133/26)</system:String>
393396
<system:String x:Key="String_ValidateError_EnterValidWebsiteUri">Geben Sie eine gültige Webseite ein (z.B. https://example.com/index.html)</system:String>
394-
397+
395398
<!-- ApplicationInfo.Name -->
396399
<system:String x:Key="String_ApplicationName_IPScanner">IP-Scanner</system:String>
397400
<system:String x:Key="String_ApplicationName_NetworkInterface">Netzwerkinterface</system:String>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,9 @@
298298
<system:String x:Key="String_HelpMessage_ParameterResetSettings">Reset all settings.</system:String>
299299
<system:String x:Key="String_HelpMessage_Tags">Tags help you organize sessions by topics/projects. Multiple tags can be used with ";" be separated. Search by tags with "tag=xxx".</system:String>
300300

301+
<!-- Warn message -->
302+
<system:String x:Key="String_WarnMessage_SettingsGeneralAppearanceTransparency">Some graphics cards / drivers have problems maximizing the application when transparency is enabled. The function must be disabled for using "Remote Desktop"! Enabling or disabling this feature requires a restart of the application.</system:String>
303+
301304
<!-- Buttons -->
302305
<system:String x:Key="String_Button_Change">Change</system:String>
303306
<system:String x:Key="String_Button_Default">Default</system:String>

Source/NETworkManager/Resources/Styles/RectangleStyles.xaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,18 @@
1414
<Setter Property="ToolTipService.InitialShowDelay" Value="0" />
1515
<Setter Property="ToolTipService.ShowDuration" Value="600000" />
1616
</Style>
17+
18+
<Style x:Key="WarnImageRectangle" TargetType="{x:Type Rectangle}">
19+
<Style.Resources>
20+
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource DefaultToolTip}" />
21+
</Style.Resources>
22+
<Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
23+
<Setter Property="OpacityMask">
24+
<Setter.Value>
25+
<VisualBrush Stretch="Uniform" Visual="{IconPacks:PackIconModern Kind=Warning}"/>
26+
</Setter.Value>
27+
</Setter>
28+
<Setter Property="ToolTipService.InitialShowDelay" Value="0" />
29+
<Setter Property="ToolTipService.ShowDuration" Value="600000" />
30+
</Style>
1731
</ResourceDictionary>

Source/NETworkManager/Resources/Styles/ToolTipStyles.xaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,6 @@
4747
</Setter.Value>
4848
</Setter>
4949
</Style>
50+
51+
<Style x:Key="WarnToolTip" TargetType="{x:Type ToolTip}" BasedOn="{StaticResource HelpToolTip}" />
5052
</ResourceDictionary>

Source/NETworkManager/Views/Settings/SettingsGeneralAppearanceView.xaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,19 @@
4848
<Binding Path="AccentSelectedItem" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged" />
4949
</ListView.SelectedItem>
5050
</ListView>
51-
<TextBlock Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Transparency}" />
51+
<Grid>
52+
<Grid.ColumnDefinitions>
53+
<ColumnDefinition Width="*" />
54+
<ColumnDefinition Width="10" />
55+
<ColumnDefinition Width="Auto" />
56+
</Grid.ColumnDefinitions>
57+
<TextBlock Grid.Column="0" Style="{StaticResource HeaderTextBlock}" Text="{DynamicResource String_Header_Transparency}" />
58+
<Rectangle Grid.Column="2" Width="24" Height="24" ToolTip="{DynamicResource String_WarnMessage_SettingsGeneralAppearanceTransparency}" Style="{StaticResource WarnImageRectangle}">
59+
<Rectangle.Resources>
60+
<Style TargetType="{x:Type ToolTip}" BasedOn="{StaticResource WarnToolTip}" />
61+
</Rectangle.Resources>
62+
</Rectangle>
63+
</Grid>
5264
<mah:ToggleSwitch Header="{DynamicResource String_EnableTransparency}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding EnableTransparency}" Margin="0,0,0,10"/>
5365
<Grid>
5466
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)