Merge pull request #42 from Leo-Corporation/vNext

Version 1.4.0.2401

PermaTop/App.xaml.cs

@@ -45,7 +45,8 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
 		if (!Global.Settings.IsFirstRun)
 		{
-			new MainWindow().Show();
+			var mw = new MainWindow();
+			if (Global.Settings.LaunchAtStart == false) mw.Show();
 		}
 		else
 		{

PermaTop/Classes/Global.cs

@@ -48,7 +48,7 @@ public static class Global
 	internal static string SettingsPath => $@"{FileSys.AppDataPath}\Léo Corporation\PermaTop\Settings.xml";
 	public static Settings Settings { get; set; } = XmlSerializerManager.LoadFromXml<Settings>(SettingsPath) ?? new();
 
-	public static string Version => "1.3.0.2311";
+	public static string Version => "1.4.0.2401";
 	public static string LastVersionLink => "https://raw.githubusercontent.com/Leo-Corporation/LeoCorp-Docs/master/Liens/Update%20System/PermaTop/Version.txt";
 
 	public static string GetHiSentence
@@ -343,6 +343,18 @@ public static void ChangeLanguage()
 		}
 	}
 
+	public static void SetLaunchAtStart(bool launchAtStart)
+	{
+		var key = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run", true);
+		if (launchAtStart)
+		{
+			key?.SetValue("PermaTop", Environment.ProcessPath ?? $@"{AppContext.BaseDirectory}\PermaTop.exe");
+			return;
+		}
+
+		key?.DeleteValue("PermaTop", false);
+	}
+
 	[DllImport("user32.dll")]
 	internal static extern IntPtr GetClassLong(IntPtr hWnd, int nIndex);
 

PermaTop/Classes/Settings.cs

@@ -31,11 +31,13 @@ public class Settings
 	public Languages Language { get; set; }
 	public bool IsFirstRun { get; set; }
 	public bool CheckUpdateOnStart { get; set; }
+	public bool? LaunchAtStart { get; set; }
 	public Settings()
 	{
 		Theme = Themes.System;
 		Language = Languages.Default;
 		IsFirstRun = true;
 		CheckUpdateOnStart = true;
+		LaunchAtStart = false;
 	}
 }

PermaTop/MainWindow.xaml.cs

@@ -38,6 +38,10 @@ public MainWindow()
 	{
 		InitializeComponent();
 		InitUI();
+		if (Global.Settings.LaunchAtStart ?? false)
+		{
+			HideMenu_Click(this, null);
+		}
 	}
 
 	private void InitUI()
@@ -50,7 +54,7 @@ private void InitUI()
 			CheckButton(SettingsPageBtn);
 		};
 
-		WindowsMenu.Loaded += (o, e) => { GenerateMenu(); };
+		WindowsMenu.Loaded += (o, e) => { GenerateMenu(); };		
 	}
 
 	private void CheckButton(Button btn)
@@ -73,6 +77,11 @@ private void MinimizeBtn_Click(object sender, RoutedEventArgs e)
 
 	private void CloseBtn_Click(object sender, RoutedEventArgs e)
 	{
+		if (Global.Settings.LaunchAtStart ?? false)
+		{
+			HideMenu_Click(sender, e);
+			return;
+		}
 		Application.Current.Shutdown();
 	}
 
@@ -105,7 +114,6 @@ private void SettingsPageBtn_Click(object sender, RoutedEventArgs e)
 	bool isHidden = false;
 	private void HideMenu_Click(object sender, RoutedEventArgs e)
 	{
-
 		isHidden = !isHidden;
 		if (isHidden)
 		{

PermaTop/Pages/SettingsPage.xaml.cs

@@ -52,6 +52,9 @@ public SettingsPage()
 
 		private async void InitUI()
 		{
+			// Upgrade settings
+			Global.Settings.LaunchAtStart ??= false;
+
 			// About section
 			VersionTxt.Text = Global.Version; // Update the current version label
 
@@ -74,6 +77,7 @@ private async void InitUI()
 
 			// Checkboxes
 			UpdateOnStartChk.IsChecked = Global.Settings.CheckUpdateOnStart;
+			LaunchOnStartChk.IsChecked = Global.Settings.LaunchAtStart ?? false;
 
 			if (!Global.Settings.CheckUpdateOnStart) return;
 			try
@@ -123,8 +127,8 @@ private void SeeLicensesBtn_Click(object sender, RoutedEventArgs e)
 		{
 			MessageBox.Show($"{Properties.Resources.Licenses}\n\n" +
 			"Fluent System Icons - MIT License - © 2020 Microsoft Corporation\n" +
-			"PeyrSharp - MIT License - © 2022-2023 Léo Corporation\n" +
-			"PermaTop - MIT License - © 2023 Léo Corporation", $"{Properties.Resources.PermaTop} - {Properties.Resources.Licenses}", MessageBoxButton.OK, MessageBoxImage.Information);
+			"PeyrSharp - MIT License - © 2022-2024 Devyus\n" +
+			"PermaTop - MIT License - © 2023-2024 Léo Corporation", $"{Properties.Resources.PermaTop} - {Properties.Resources.Licenses}", MessageBoxButton.OK, MessageBoxImage.Information);
 		}
 
 		Border ThemeSelectedBorder;
@@ -263,5 +267,13 @@ private void UpdateOnStartChk_Checked(object sender, RoutedEventArgs e)
 			Global.Settings.CheckUpdateOnStart = UpdateOnStartChk.IsChecked ?? true;
 			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
 		}
-	}
+
+		private void LaunchOnStartChk_Checked(object sender, RoutedEventArgs e)
+		{
+			Global.Settings.LaunchAtStart = LaunchOnStartChk.IsChecked;
+			XmlSerializerManager.SaveToXml(Global.Settings, Global.SettingsPath);
+
+			Global.SetLaunchAtStart(Global.Settings.LaunchAtStart ?? false);
+		}
+    }
 }

PermaTop/PermaTop.csproj

@@ -9,11 +9,11 @@
 		<ApplicationIcon>PermaTop.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
 		<Title>PermaTop</Title>
-		<Version>1.3.0.2311</Version>
+		<Version>1.4.0.2401</Version>
 		<Authors>Léo Corporation</Authors>
 		<Company>Léo Corporation</Company>
 		<Description>A simple utility to keep your windows in sight and in control.</Description>
-		<Copyright>© 2023</Copyright>
+		<Copyright>© 2024</Copyright>
 		<RepositoryUrl>https://github.com/Leo-Corporation/PermaTop</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/Leo-Corporation/PermaTop</PackageProjectUrl>
 	</PropertyGroup>
@@ -42,8 +42,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Hardcodet.NotifyIcon.Wpf" Version="1.1.0" />
-		<PackageReference Include="PeyrSharp.Core" Version="1.10.0.2310" />
-		<PackageReference Include="PeyrSharp.Env" Version="1.10.0.2310" />
+		<PackageReference Include="PeyrSharp.Core" Version="2.1.0.2312" />
+		<PackageReference Include="PeyrSharp.Env" Version="2.1.0.2312" />
 	</ItemGroup>
 
 	<ItemGroup>

PermaTop/Properties/Resources.en-US.resx

@@ -318,4 +318,10 @@
   <data name="UnPin" xml:space="preserve">
     <value>Unpin</value>
   </data>
+  <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>

PermaTop/Properties/Resources.fr-FR.resx

@@ -318,4 +318,10 @@
   <data name="UnPin" xml:space="preserve">
     <value>Désépingler</value>
   </data>
+  <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>

PermaTop/Properties/Resources.resx

@@ -298,4 +298,10 @@
   <data name="UnPin" xml:space="preserve">
     <value>Unpin</value>
   </data>
+  <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>

PermaTop/UserControls/WindowPropertyItem.xaml

@@ -230,7 +230,7 @@
                             Grid.Row="3"
                             Grid.ColumnSpan="2"
                             Margin="5"
-                            Padding="5"
+                            Padding="2"
                             HorizontalAlignment="Center"
                             Background="{DynamicResource Accent}"
                             Click="ApplyBtn_Click"
@@ -270,6 +270,7 @@
                             Click="SetPosBtn_Click"
                             Content="{x:Static lang:Resources.SetPosition}"
                             FontWeight="Bold"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource PrimaryButton}" />
                         <Button
                             x:Name="SetScreenBtn"
@@ -279,6 +280,7 @@
                             Click="SetScreenBtn_Click"
                             Content="{x:Static lang:Resources.MoveToScreen}"
                             FontWeight="Bold"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource PrimaryButton}" />
                     </StackPanel>
                 </Border>
@@ -313,10 +315,11 @@
                             x:Name="MoveBtn"
                             Padding="2"
                             HorizontalAlignment="Center"
-                            Background="Transparent"
+                            Background="{DynamicResource Accent}"
                             Click="MoveBtn_Click"
                             Content="{x:Static lang:Resources.SetPosition}"
                             FontWeight="Bold"
+                            Foreground="{DynamicResource Foreground1}"
                             Style="{DynamicResource PrimaryButton}" />
                     </StackPanel>
                 </Border>

SETUP_LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Léo Corporation
+Copyright (c) 2023-2024 Léo Corporation
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: