Skip to content
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.

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

Version 1.4.0.2401 #42

Merged
merged 18 commits into from
Jan 6, 2024
Merged
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Added information message (#39)
  • Loading branch information
lpeyr committed Jan 6, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit bd6afabf3c31774fb37d46fd6ee2ee5f573da8ce
11 changes: 11 additions & 0 deletions PermaTop/Pages/SettingsPage.xaml
Original file line number Diff line number Diff line change
@@ -352,6 +352,17 @@
Foreground="{DynamicResource Foreground1}"
Style="{DynamicResource CheckBoxStyle1}"
Unchecked="LaunchOnStartChk_Checked" />
<StackPanel Margin="10 0 0 0" Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
FontFamily="..\Fonts\#FluentSystemIcons-Regular"
FontSize="14"
Text="&#xF4A4;" />
<TextBlock
Margin="5 0 0 0"
VerticalAlignment="Center"
Text="{x:Static lang:Resources.PermaTopOnStartInfo}" />
</StackPanel>
</StackPanel>
</Expander>
<Expander
9 changes: 9 additions & 0 deletions PermaTop/Properties/Resources.Designer.cs

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

3 changes: 3 additions & 0 deletions PermaTop/Properties/Resources.en-US.resx
Original file line number Diff line number Diff line change
@@ -321,4 +321,7 @@
<data name="LaunchOnStart" xml:space="preserve">
<value>Launch PermaTop at Windows startup</value>
</data>
<data name="PermaTopOnStartInfo" xml:space="preserve">
<value>PermaTop will start minimized in the system tray if you enable this option.</value>
</data>
</root>
3 changes: 3 additions & 0 deletions PermaTop/Properties/Resources.fr-FR.resx
Original file line number Diff line number Diff line change
@@ -321,4 +321,7 @@
<data name="LaunchOnStart" xml:space="preserve">
<value>Lancer PermaTop lors du démarrage de Windows</value>
</data>
<data name="PermaTopOnStartInfo" xml:space="preserve">
<value>PermaTop démarrera minimisé dans la barre d'état système si vous activez cette option.</value>
</data>
</root>
3 changes: 3 additions & 0 deletions PermaTop/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -301,4 +301,7 @@
<data name="LaunchOnStart" xml:space="preserve">
<value>Launch PermaTop at Windows startup</value>
</data>
<data name="PermaTopOnStartInfo" xml:space="preserve">
<value>PermaTop will start minimized in the system tray if you enable this option.</value>
</data>
</root>