Skip to content

Feature: ToolTips, Buttons, etc. #2955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mergify merged 2 commits into from
Dec 18, 2024
Merged

Feature: ToolTips, Buttons, etc. #2955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19b7751
Feature: ToolTips, Buttons, etc.
BornToBeRoot Dec 18, 2024
f293fd9
Docs: #2955
BornToBeRoot Dec 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 24 additions & 33 deletions Source/NETworkManager.Localization/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 13 additions & 16 deletions Source/NETworkManager.Localization/Resources/Strings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion Source/NETworkManager/CommandLineWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}">
Expand Down
29 changes: 22 additions & 7 deletions Source/NETworkManager/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@
IsDropDownOpen="{Binding IsProfileFileDropDownOpened}"
Background="{DynamicResource MahApps.Brushes.Gray10}"
BorderThickness="0"
MinWidth="100"
MinWidth="180"
HorizontalAlignment="Left"
Focusable="False"
VerticalAlignment="Center"
Expand Down Expand Up @@ -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">
Expand All @@ -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">
Expand All @@ -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">
Expand All @@ -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>
Expand Down
Loading
Loading