Feature: ToolTips, Buttons, etc. (#2955)

* Feature: ToolTips, Buttons, etc. * Docs: #2955
BornToBeRoot · Dec 18, 2024 · e812b62 · e812b62
1 parent 396f13e
commit e812b62
Show file tree

Hide file tree

Showing 8 changed files with 278 additions and 245 deletions.
diff --git a/Source/NETworkManager.Localization/Resources/Strings.Designer.cs b/Source/NETworkManager.Localization/Resources/Strings.Designer.cs
diff --git a/Source/NETworkManager.Localization/Resources/Strings.resx b/Source/NETworkManager.Localization/Resources/Strings.resx
@@ -809,9 +809,6 @@ First make a backup copy of your profile files before enabling encryption!</valu
   <data name="DNSServer" xml:space="preserve">
     <value>DNS server</value>
   </data>
-  <data name="OpenDocumentation" xml:space="preserve">
-    <value>Open documentation</value>
-  </data>
   <data name="Domain" xml:space="preserve">
     <value>Domain</value>
   </data>
@@ -854,9 +851,6 @@ First make a backup copy of your profile files before enabling encryption!</valu
   <data name="FixedScreenSize" xml:space="preserve">
     <value>Fixed screen size:</value>
   </data>
-  <data name="StarForkTheProjectOnGitHub" xml:space="preserve">
-    <value>Star/Fork the Project on GitHub</value>
-  </data>
   <data name="Found" xml:space="preserve">
     <value>Found</value>
   </data>
@@ -1958,14 +1952,14 @@ URL: https://api.ipify.org and https://api6.ipify.org</value>
   <data name="ExternalServices" xml:space="preserve">
     <value>External services</value>
   </data>
-  <data name="ToolTip_GitHubProjectUrl" xml:space="preserve">
+  <data name="ToolTip_StarForkProjectOnGitHub" xml:space="preserve">
     <value>Star/Fork the Project on GitHub.</value>
   </data>
-  <data name="ToolTip_TransifexProjectUrl" xml:space="preserve">
+  <data name="ToolTip_HelpTranslateOnTransifex" xml:space="preserve">
     <value>Help translate the project on Transifex.</value>
   </data>
-  <data name="ToolTip_TwitterContactUrl" xml:space="preserve">
-    <value>Contact via Twitter.</value>
+  <data name="ToolTip_ContactOrContactMeViaX" xml:space="preserve">
+    <value>Follow or contact me via X.</value>
   </data>
   <data name="Connection" xml:space="preserve">
     <value>Connection</value>
@@ -2283,10 +2277,7 @@ $$hostname$$	--&gt;	Hostname</value>
   <data name="TimeoutS" xml:space="preserve">
     <value>Timeout (s)</value>
   </data>
-  <data name="ReportAnIssueOrCreateAFeatureRequest" xml:space="preserve">
-    <value>Report an issue or create a feature request</value>
-  </data>
-  <data name="ToolTip_GithubNewIssueUrl" xml:space="preserve">
+  <data name="ToolTip_ReportIssueOrCreateFeatureRequest" xml:space="preserve">
     <value>Report an issue or create a feature request.</value>
   </data>
   <data name="BeaconInterval" xml:space="preserve">
@@ -2346,8 +2337,8 @@ $$hostname$$	--&gt;	Hostname</value>
   <data name="IsEncrypted" xml:space="preserve">
     <value>Is encrypted</value>
   </data>
-  <data name="ToolTip_GithubDocumentationUrl" xml:space="preserve">
-    <value>Open documentation on GitHub.</value>
+  <data name="ToolTip_OpenTheDocumentation" xml:space="preserve">
+    <value>Open the documentation.</value>
   </data>
   <data name="ExampleProfileFileName" xml:space="preserve">
     <value>Customer 1</value>
@@ -3855,4 +3846,10 @@ Right-click for more options.</value>
   <data name="GHz6" xml:space="preserve">
     <value>6 GHz</value>
   </data>
+  <data name="ToolTip_SupportThisProjectWithADonation" xml:space="preserve">
+    <value>Support this project with a donation.</value>
+  </data>
+  <data name="OpenDocumentation" xml:space="preserve">
+    <value>Open documentation</value>
+  </data>
 </root>
diff --git a/Source/NETworkManager/CommandLineWindow.xaml b/Source/NETworkManager/CommandLineWindow.xaml
@@ -23,7 +23,7 @@
         <mahAppsControls:WindowCommands>
             <StackPanel Orientation="Horizontal">
                 <Button Command="{Binding OpenDocumentationCommand}"
-                        ToolTip="{x:Static localization:Strings.OpenDocumentation}" Cursor="Hand">
+                        ToolTip="{x:Static localization:Strings.ToolTip_OpenTheDocumentation}" Cursor="Hand">
                     <StackPanel Orientation="Horizontal">
                         <Rectangle Width="20" Height="20"
                                    Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">

diff --git a/Source/NETworkManager/MainWindow.xaml b/Source/NETworkManager/MainWindow.xaml
@@ -148,7 +148,7 @@
                       IsDropDownOpen="{Binding IsProfileFileDropDownOpened}"
                       Background="{DynamicResource MahApps.Brushes.Gray10}"
                       BorderThickness="0"
-                      MinWidth="100"
+                      MinWidth="180"
                       HorizontalAlignment="Left"
                       Focusable="False"
                       VerticalAlignment="Center"
@@ -188,10 +188,10 @@
                         </Grid>
                     </DataTemplate>
                 </ComboBox.ItemTemplate>
-            </ComboBox>
+            </ComboBox>           
             <Button Command="{Binding OpenWebsiteCommand}"
-                    ToolTip="{x:Static localization:Strings.StarForkTheProjectOnGitHub}"
-                    CommandParameter="{x:Static resources:Resources.NETworkManager_RepoUrl}"
+                    ToolTip="{x:Static localization:Strings.ToolTip_StarForkProjectOnGitHub}"
+                    CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubRepoUrl}"
                     Cursor="Hand"
                     Focusable="False">
                 <StackPanel Orientation="Horizontal">
@@ -203,9 +203,10 @@
                     </Rectangle>
                 </StackPanel>
             </Button>
+
             <Button Command="{Binding OpenWebsiteCommand}"
-                    ToolTip="{x:Static localization:Strings.ReportAnIssueOrCreateAFeatureRequest}"
-                    CommandParameter="{x:Static resources:Resources.NETworkManager_NewIssueUrl}"
+                    ToolTip="{x:Static localization:Strings.ToolTip_ReportIssueOrCreateFeatureRequest}"
+                    CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubNewIssueUrl}"
                     Cursor="Hand"
                     Focusable="False">
                 <StackPanel Orientation="Horizontal">
@@ -218,7 +219,7 @@
                 </StackPanel>
             </Button>
             <Button Command="{Binding OpenDocumentationCommand}"
-                    ToolTip="{x:Static localization:Strings.OpenDocumentation}"
+                    ToolTip="{x:Static localization:Strings.ToolTip_OpenTheDocumentation}"
                     Cursor="Hand"
                     Focusable="False">
                 <StackPanel Orientation="Horizontal">
@@ -230,6 +231,20 @@
                     </Rectangle>
                 </StackPanel>
             </Button>
+            <Button Command="{Binding OpenWebsiteCommand}"
+          ToolTip="{x:Static localization:Strings.ToolTip_SupportThisProjectWithADonation}"
+          CommandParameter="{x:Static resources:Resources.NETworkManager_DonateUrl}"
+          Cursor="Hand"
+          Focusable="False">
+                <StackPanel Orientation="Horizontal">
+                    <Rectangle Width="20" Height="20"
+                     Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
+                        <Rectangle.OpacityMask>
+                            <VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Heart}" />
+                        </Rectangle.OpacityMask>
+                    </Rectangle>
+                </StackPanel>
+            </Button>
         </mah:WindowCommands>
     </mah:MetroWindow.RightWindowCommands>
     <mah:MetroWindow.Flyouts>