Skip to content

Commit e812b62

Browse files
BornToBeRootBornToBeRoot
authored
Feature: ToolTips, Buttons, etc. (#2955)
* Feature: ToolTips, Buttons, etc. * Docs: #2955
1 parent 396f13e commit e812b62

File tree

8 files changed

+278
-245
lines changed

8 files changed

+278
-245
lines changed

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

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

‎Source/NETworkManager.Localization/Resources/Strings.resx

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -809,9 +809,6 @@ First make a backup copy of your profile files before enabling encryption!</valu
809809
<data name="DNSServer" xml:space="preserve">
810810
<value>DNS server</value>
811811
</data>
812-
<data name="OpenDocumentation" xml:space="preserve">
813-
<value>Open documentation</value>
814-
</data>
815812
<data name="Domain" xml:space="preserve">
816813
<value>Domain</value>
817814
</data>
@@ -854,9 +851,6 @@ First make a backup copy of your profile files before enabling encryption!</valu
854851
<data name="FixedScreenSize" xml:space="preserve">
855852
<value>Fixed screen size:</value>
856853
</data>
857-
<data name="StarForkTheProjectOnGitHub" xml:space="preserve">
858-
<value>Star/Fork the Project on GitHub</value>
859-
</data>
860854
<data name="Found" xml:space="preserve">
861855
<value>Found</value>
862856
</data>
@@ -1958,14 +1952,14 @@ URL: https://api.ipify.org and https://api6.ipify.org</value>
19581952
<data name="ExternalServices" xml:space="preserve">
19591953
<value>External services</value>
19601954
</data>
1961-
<data name="ToolTip_GitHubProjectUrl" xml:space="preserve">
1955+
<data name="ToolTip_StarForkProjectOnGitHub" xml:space="preserve">
19621956
<value>Star/Fork the Project on GitHub.</value>
19631957
</data>
1964-
<data name="ToolTip_TransifexProjectUrl" xml:space="preserve">
1958+
<data name="ToolTip_HelpTranslateOnTransifex" xml:space="preserve">
19651959
<value>Help translate the project on Transifex.</value>
19661960
</data>
1967-
<data name="ToolTip_TwitterContactUrl" xml:space="preserve">
1968-
<value>Contact via Twitter.</value>
1961+
<data name="ToolTip_ContactOrContactMeViaX" xml:space="preserve">
1962+
<value>Follow or contact me via X.</value>
19691963
</data>
19701964
<data name="Connection" xml:space="preserve">
19711965
<value>Connection</value>
@@ -2283,10 +2277,7 @@ $$hostname$$ --&gt; Hostname</value>
22832277
<data name="TimeoutS" xml:space="preserve">
22842278
<value>Timeout (s)</value>
22852279
</data>
2286-
<data name="ReportAnIssueOrCreateAFeatureRequest" xml:space="preserve">
2287-
<value>Report an issue or create a feature request</value>
2288-
</data>
2289-
<data name="ToolTip_GithubNewIssueUrl" xml:space="preserve">
2280+
<data name="ToolTip_ReportIssueOrCreateFeatureRequest" xml:space="preserve">
22902281
<value>Report an issue or create a feature request.</value>
22912282
</data>
22922283
<data name="BeaconInterval" xml:space="preserve">
@@ -2346,8 +2337,8 @@ $$hostname$$ --&gt; Hostname</value>
23462337
<data name="IsEncrypted" xml:space="preserve">
23472338
<value>Is encrypted</value>
23482339
</data>
2349-
<data name="ToolTip_GithubDocumentationUrl" xml:space="preserve">
2350-
<value>Open documentation on GitHub.</value>
2340+
<data name="ToolTip_OpenTheDocumentation" xml:space="preserve">
2341+
<value>Open the documentation.</value>
23512342
</data>
23522343
<data name="ExampleProfileFileName" xml:space="preserve">
23532344
<value>Customer 1</value>
@@ -3855,4 +3846,10 @@ Right-click for more options.</value>
38553846
<data name="GHz6" xml:space="preserve">
38563847
<value>6 GHz</value>
38573848
</data>
3849+
<data name="ToolTip_SupportThisProjectWithADonation" xml:space="preserve">
3850+
<value>Support this project with a donation.</value>
3851+
</data>
3852+
<data name="OpenDocumentation" xml:space="preserve">
3853+
<value>Open documentation</value>
3854+
</data>
38583855
</root>

‎Source/NETworkManager/CommandLineWindow.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<mahAppsControls:WindowCommands>
2424
<StackPanel Orientation="Horizontal">
2525
<Button Command="{Binding OpenDocumentationCommand}"
26-
ToolTip="{x:Static localization:Strings.OpenDocumentation}" Cursor="Hand">
26+
ToolTip="{x:Static localization:Strings.ToolTip_OpenTheDocumentation}" Cursor="Hand">
2727
<StackPanel Orientation="Horizontal">
2828
<Rectangle Width="20" Height="20"
2929
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">

‎Source/NETworkManager/MainWindow.xaml

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
IsDropDownOpen="{Binding IsProfileFileDropDownOpened}"
149149
Background="{DynamicResource MahApps.Brushes.Gray10}"
150150
BorderThickness="0"
151-
MinWidth="100"
151+
MinWidth="180"
152152
HorizontalAlignment="Left"
153153
Focusable="False"
154154
VerticalAlignment="Center"
@@ -188,10 +188,10 @@
188188
</Grid>
189189
</DataTemplate>
190190
</ComboBox.ItemTemplate>
191-
</ComboBox>
191+
</ComboBox>
192192
<Button Command="{Binding OpenWebsiteCommand}"
193-
ToolTip="{x:Static localization:Strings.StarForkTheProjectOnGitHub}"
194-
CommandParameter="{x:Static resources:Resources.NETworkManager_RepoUrl}"
193+
ToolTip="{x:Static localization:Strings.ToolTip_StarForkProjectOnGitHub}"
194+
CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubRepoUrl}"
195195
Cursor="Hand"
196196
Focusable="False">
197197
<StackPanel Orientation="Horizontal">
@@ -203,9 +203,10 @@
203203
</Rectangle>
204204
</StackPanel>
205205
</Button>
206+
206207
<Button Command="{Binding OpenWebsiteCommand}"
207-
ToolTip="{x:Static localization:Strings.ReportAnIssueOrCreateAFeatureRequest}"
208-
CommandParameter="{x:Static resources:Resources.NETworkManager_NewIssueUrl}"
208+
ToolTip="{x:Static localization:Strings.ToolTip_ReportIssueOrCreateFeatureRequest}"
209+
CommandParameter="{x:Static resources:Resources.NETworkManager_GitHubNewIssueUrl}"
209210
Cursor="Hand"
210211
Focusable="False">
211212
<StackPanel Orientation="Horizontal">
@@ -218,7 +219,7 @@
218219
</StackPanel>
219220
</Button>
220221
<Button Command="{Binding OpenDocumentationCommand}"
221-
ToolTip="{x:Static localization:Strings.OpenDocumentation}"
222+
ToolTip="{x:Static localization:Strings.ToolTip_OpenTheDocumentation}"
222223
Cursor="Hand"
223224
Focusable="False">
224225
<StackPanel Orientation="Horizontal">
@@ -230,6 +231,20 @@
230231
</Rectangle>
231232
</StackPanel>
232233
</Button>
234+
<Button Command="{Binding OpenWebsiteCommand}"
235+
ToolTip="{x:Static localization:Strings.ToolTip_SupportThisProjectWithADonation}"
236+
CommandParameter="{x:Static resources:Resources.NETworkManager_DonateUrl}"
237+
Cursor="Hand"
238+
Focusable="False">
239+
<StackPanel Orientation="Horizontal">
240+
<Rectangle Width="20" Height="20"
241+
Fill="{Binding RelativeSource={RelativeSource AncestorType=Button}, Path=Foreground}">
242+
<Rectangle.OpacityMask>
243+
<VisualBrush Stretch="Uniform" Visual="{iconPacks:Material Kind=Heart}" />
244+
</Rectangle.OpacityMask>
245+
</Rectangle>
246+
</StackPanel>
247+
</Button>
233248
</mah:WindowCommands>
234249
</mah:MetroWindow.RightWindowCommands>
235250
<mah:MetroWindow.Flyouts>

0 commit comments

Comments
 (0)