From 085e3a4e867b746a1b60d277e7b59e1979e7456b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A7=E7=9C=BC=E4=BB=94=E6=97=AD?= <86864914+wcxu21@users.noreply.github.com> Date: Mon, 24 Jan 2022 09:58:22 +0800 Subject: [PATCH 01/34] Updated Simplified Chinese translation Updated Simplified Chinese translation --- Passliss/Properties/Resources.zh-CN.resx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 0e09f2ee..34e5b57c 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -448,12 +448,12 @@ 纯文本 - Decrypted string + 解密字符串 - Disable history + 禁用历史 - Do you want to enable automatic checks for updates at startup? + 是否要在启动时启用自动检查更新？ \ No newline at end of file From 6d788b71da2d128ba7863a7b9951026f157fcd71 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 13 Feb 2022 08:41:05 +0000 Subject: [PATCH 02/34] Bump LeoCorpLibrary from 4.2.0.2201 to 4.3.0.2202 in /Passliss Bumps [LeoCorpLibrary](https://github.com/Leo-Corporation/LeoCorpLibrary) from 4.2.0.2201 to 4.3.0.2202. - [Release notes](https://github.com/Leo-Corporation/LeoCorpLibrary/releases) - [Commits](https://github.com/Leo-Corporation/LeoCorpLibrary/compare/4.2.0.2201...4.3.0.2202) --- updated-dependencies: - dependency-name: LeoCorpLibrary dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Passliss/Passliss.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Passliss/Passliss.csproj b/Passliss/Passliss.csproj index 3f9a158d..15e8464e 100644 --- a/Passliss/Passliss.csproj +++ b/Passliss/Passliss.csproj @@ -34,7 +34,7 @@ - + From 144452c0b0cc2d564e7e9b38364c528341ae3c04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 09:54:06 +0100 Subject: [PATCH 03/34] Added translations (#127) --- Passliss/Properties/Resources.Designer.cs | 27 +++++++++++++++++++++++ Passliss/Properties/Resources.en-US.resx | 9 ++++++++ Passliss/Properties/Resources.fr-FR.resx | 9 ++++++++ Passliss/Properties/Resources.resx | 9 ++++++++ Passliss/Properties/Resources.zh-CN.resx | 9 ++++++++ 5 files changed, 63 insertions(+) diff --git a/Passliss/Properties/Resources.Designer.cs b/Passliss/Properties/Resources.Designer.cs index 60b1862f..edebe1d8 100644 --- a/Passliss/Properties/Resources.Designer.cs +++ b/Passliss/Properties/Resources.Designer.cs @@ -141,6 +141,15 @@ public static string AvailableUpdates { } } + /// + /// Looks up a localized string similar to Back. + /// + public static string Back { + get { + return ResourceManager.GetString("Back", resourceCulture); + } + } + /// /// Looks up a localized string similar to Between. /// @@ -627,6 +636,15 @@ public static string NeedRestartToApplyChanges { } } + /// + /// Looks up a localized string similar to Next. + /// + public static string Next { + get { + return ResourceManager.GetString("Next", resourceCulture); + } + } + /// /// Looks up a localized string similar to There is no Password Configurations created. Create one to get started.. /// @@ -1076,5 +1094,14 @@ public static string Version { return ResourceManager.GetString("Version", resourceCulture); } } + + /// + /// Looks up a localized string similar to Welcome. + /// + public static string Welcome { + get { + return ResourceManager.GetString("Welcome", resourceCulture); + } + } } } diff --git a/Passliss/Properties/Resources.en-US.resx b/Passliss/Properties/Resources.en-US.resx index 022bea83..ea7ddd6e 100644 --- a/Passliss/Properties/Resources.en-US.resx +++ b/Passliss/Properties/Resources.en-US.resx @@ -456,4 +456,13 @@ Do you want to enable automatic checks for updates at startup? + + Welcome + + + Next + + + Back + \ No newline at end of file diff --git a/Passliss/Properties/Resources.fr-FR.resx b/Passliss/Properties/Resources.fr-FR.resx index 589c1fe3..2f8d7291 100644 --- a/Passliss/Properties/Resources.fr-FR.resx +++ b/Passliss/Properties/Resources.fr-FR.resx @@ -456,4 +456,13 @@ Voulez-vous activer les vérifications automatiques des mises à jour au démarrage ? + + Bienvenue + + + Suivant + + + Retour + \ No newline at end of file diff --git a/Passliss/Properties/Resources.resx b/Passliss/Properties/Resources.resx index a483d1f6..b6fbc95f 100644 --- a/Passliss/Properties/Resources.resx +++ b/Passliss/Properties/Resources.resx @@ -436,4 +436,13 @@ Do you want to enable automatic checks for updates at startup? + + Welcome + + + Next + + + Back + \ No newline at end of file diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 34e5b57c..607937c6 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -456,4 +456,13 @@ 是否要在启动时启用自动检查更新？ + + 欢迎 + + + Next + + + Back + \ No newline at end of file From e183f9535d8272e7caeb7763a416818e910bb9b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 09:56:27 +0100 Subject: [PATCH 04/34] Added "First run" window (#127) --- Passliss/Windows/FirstRunWindow.xaml | 147 ++++++++++++++++++++++++ Passliss/Windows/FirstRunWindow.xaml.cs | 60 ++++++++++ 2 files changed, 207 insertions(+) create mode 100644 Passliss/Windows/FirstRunWindow.xaml create mode 100644 Passliss/Windows/FirstRunWindow.xaml.cs diff --git a/Passliss/Windows/FirstRunWindow.xaml b/Passliss/Windows/FirstRunWindow.xaml new file mode 100644 index 00000000..f832121f --- /dev/null +++ b/Passliss/Windows/FirstRunWindow.xaml @@ -0,0 +1,147 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs new file mode 100644 index 00000000..69a66bfd --- /dev/null +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -0,0 +1,60 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Shapes; + +namespace Passliss.Windows +{ + /// + /// Interaction logic for FirstRunWindow.xaml + /// + public partial class FirstRunWindow : Window + { + public FirstRunWindow() + { + InitializeComponent(); + } + + private void CloseBtn_Click(object sender, RoutedEventArgs e) + { + Environment.Exit(0); // Quit Passliss + } + + private void NextBtn_Click(object sender, RoutedEventArgs e) + { + //TODO: Add pages + } + } +} From 9ed0924f04a670ae6503288895ba99852039ecbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 10:01:43 +0100 Subject: [PATCH 05/34] First run window shows up on first run (#127) --- Passliss/App.xaml | 2 +- Passliss/App.xaml.cs | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Passliss/App.xaml b/Passliss/App.xaml index 94dd2920..f1da25e7 100644 --- a/Passliss/App.xaml +++ b/Passliss/App.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="clr-namespace:Passliss" xmlns:av="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="av" x:Class="Passliss.App" - StartupUri="MainWindow.xaml" + xmlns:theme="clr-namespace:Microsoft.Windows.Themes;assembly=PresentationFramework.Aero2"> diff --git a/Passliss/App.xaml.cs b/Passliss/App.xaml.cs index a2491411..22c0be54 100644 --- a/Passliss/App.xaml.cs +++ b/Passliss/App.xaml.cs @@ -22,6 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ using Passliss.Classes; +using Passliss.Windows; using System.Windows; namespace Passliss @@ -45,7 +46,14 @@ protected override void OnStartup(StartupEventArgs e) Global.StrenghtPage = new(); // Create a new strenght page Global.EncryptPage = new(); // Create a new encryption page - base.OnStartup(e); + if (Global.Settings.IsFirstRun.Value) + { + new FirstRunWindow().Show(); // Show first run experience + } + else + { + new MainWindow().Show(); // Open Passliss + } } } } From 2875df24635d5c44a7894519f1d0ac9660e180c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 10:14:23 +0100 Subject: [PATCH 06/34] Added "Welcome" page (#127) --- Passliss/Pages/FirstRunPages/WelcomePage.xaml | 19 ++++++++ .../Pages/FirstRunPages/WelcomePage.xaml.cs | 45 +++++++++++++++++++ Passliss/Passliss.csproj | 4 ++ Passliss/Properties/Resources.Designer.cs | 9 ++++ Passliss/Properties/Resources.en-US.resx | 3 ++ Passliss/Properties/Resources.fr-FR.resx | 3 ++ Passliss/Properties/Resources.resx | 3 ++ Passliss/Properties/Resources.zh-CN.resx | 3 ++ Passliss/Windows/FirstRunWindow.xaml | 2 +- Passliss/Windows/FirstRunWindow.xaml.cs | 9 ++++ 10 files changed, 99 insertions(+), 1 deletion(-) create mode 100644 Passliss/Pages/FirstRunPages/WelcomePage.xaml create mode 100644 Passliss/Pages/FirstRunPages/WelcomePage.xaml.cs diff --git a/Passliss/Pages/FirstRunPages/WelcomePage.xaml b/Passliss/Pages/FirstRunPages/WelcomePage.xaml new file mode 100644 index 00000000..aa316791 --- /dev/null +++ b/Passliss/Pages/FirstRunPages/WelcomePage.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/WelcomePage.xaml.cs b/Passliss/Pages/FirstRunPages/WelcomePage.xaml.cs new file mode 100644 index 00000000..7fbcc55d --- /dev/null +++ b/Passliss/Pages/FirstRunPages/WelcomePage.xaml.cs @@ -0,0 +1,45 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using System; +using System.Windows.Controls; + +namespace Passliss.Pages.FirstRunPages +{ + /// + /// Interaction logic for WelcomePage.xaml + /// + public partial class WelcomePage : Page + { + public WelcomePage() + { + InitializeComponent(); + InitUI(); // Load the UI + } + + private void InitUI() + { + WelcomeTxt.Text = $"{Properties.Resources.Welcome}, {Environment.UserName}."; // Say hello to the user + } + } +} diff --git a/Passliss/Passliss.csproj b/Passliss/Passliss.csproj index 15e8464e..6833230a 100644 --- a/Passliss/Passliss.csproj +++ b/Passliss/Passliss.csproj @@ -30,6 +30,7 @@ + @@ -86,6 +87,9 @@ Always + + Always + Always diff --git a/Passliss/Properties/Resources.Designer.cs b/Passliss/Properties/Resources.Designer.cs index edebe1d8..c2ab4e98 100644 --- a/Passliss/Properties/Resources.Designer.cs +++ b/Passliss/Properties/Resources.Designer.cs @@ -1103,5 +1103,14 @@ public static string Welcome { return ResourceManager.GetString("Welcome", resourceCulture); } } + + /// + /// Looks up a localized string similar to Thanks for using Passliss! Let's get started!. + /// + public static string WelcomeThanks { + get { + return ResourceManager.GetString("WelcomeThanks", resourceCulture); + } + } } } diff --git a/Passliss/Properties/Resources.en-US.resx b/Passliss/Properties/Resources.en-US.resx index ea7ddd6e..034dd5af 100644 --- a/Passliss/Properties/Resources.en-US.resx +++ b/Passliss/Properties/Resources.en-US.resx @@ -465,4 +465,7 @@ Back + + Thanks for using Passliss! Let's get started! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.fr-FR.resx b/Passliss/Properties/Resources.fr-FR.resx index 2f8d7291..5d8f6758 100644 --- a/Passliss/Properties/Resources.fr-FR.resx +++ b/Passliss/Properties/Resources.fr-FR.resx @@ -465,4 +465,7 @@ Retour + + Merci d'utiliser Passliss ! Commençons ! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.resx b/Passliss/Properties/Resources.resx index b6fbc95f..b868796d 100644 --- a/Passliss/Properties/Resources.resx +++ b/Passliss/Properties/Resources.resx @@ -445,4 +445,7 @@ Back + + Thanks for using Passliss! Let's get started! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 607937c6..36a826a7 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -465,4 +465,7 @@ Back + + Thanks for using Passliss! Let's get started! + \ No newline at end of file diff --git a/Passliss/Windows/FirstRunWindow.xaml b/Passliss/Windows/FirstRunWindow.xaml index f832121f..0b2aadf4 100644 --- a/Passliss/Windows/FirstRunWindow.xaml +++ b/Passliss/Windows/FirstRunWindow.xaml @@ -128,7 +128,7 @@ - + diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index 69a66bfd..c22272bd 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -21,6 +21,7 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +using Passliss.Pages.FirstRunPages; using System; using System.Collections.Generic; using System.Linq; @@ -42,9 +43,17 @@ namespace Passliss.Windows /// public partial class FirstRunWindow : Window { + WelcomePage WelcomePage => new(); + public FirstRunWindow() { InitializeComponent(); + InitUI(); // Load the UI + } + + private void InitUI() + { + PageViewer.Navigate(WelcomePage); // Show welcome page } private void CloseBtn_Click(object sender, RoutedEventArgs e) From 8303c97015d8434d47f1946ead539d0608fbf955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 10:42:09 +0100 Subject: [PATCH 07/34] Added "Tutorial" page (#127) --- .../Pages/FirstRunPages/TutorialPage.xaml | 39 +++++++++++++++++++ .../Pages/FirstRunPages/TutorialPage.xaml.cs | 38 ++++++++++++++++++ Passliss/Pages/FirstRunPages/WelcomePage.xaml | 32 +++++++-------- Passliss/Properties/Resources.Designer.cs | 27 +++++++++++++ Passliss/Properties/Resources.en-US.resx | 9 +++++ Passliss/Properties/Resources.fr-FR.resx | 9 +++++ Passliss/Properties/Resources.resx | 9 +++++ Passliss/Properties/Resources.zh-CN.resx | 9 +++++ Passliss/Windows/FirstRunWindow.xaml | 2 +- Passliss/Windows/FirstRunWindow.xaml.cs | 12 +++++- 10 files changed, 167 insertions(+), 19 deletions(-) create mode 100644 Passliss/Pages/FirstRunPages/TutorialPage.xaml create mode 100644 Passliss/Pages/FirstRunPages/TutorialPage.xaml.cs diff --git a/Passliss/Pages/FirstRunPages/TutorialPage.xaml b/Passliss/Pages/FirstRunPages/TutorialPage.xaml new file mode 100644 index 00000000..28cefd7d --- /dev/null +++ b/Passliss/Pages/FirstRunPages/TutorialPage.xaml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/TutorialPage.xaml.cs b/Passliss/Pages/FirstRunPages/TutorialPage.xaml.cs new file mode 100644 index 00000000..92e39ba0 --- /dev/null +++ b/Passliss/Pages/FirstRunPages/TutorialPage.xaml.cs @@ -0,0 +1,38 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using System.Windows.Controls; + +namespace Passliss.Pages.FirstRunPages +{ + /// + /// Interaction logic for TutorialPage.xaml + /// + public partial class TutorialPage : Page + { + public TutorialPage() + { + InitializeComponent(); + } + } +} diff --git a/Passliss/Pages/FirstRunPages/WelcomePage.xaml b/Passliss/Pages/FirstRunPages/WelcomePage.xaml index aa316791..7a22e482 100644 --- a/Passliss/Pages/FirstRunPages/WelcomePage.xaml +++ b/Passliss/Pages/FirstRunPages/WelcomePage.xaml @@ -1,19 +1,19 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Passliss.Pages.FirstRunPages" + xmlns:lang="clr-namespace:Passliss.Properties" + mc:Ignorable="d" FontFamily="..\..\Fonts\#Montserrat" + d:DesignHeight="450" d:DesignWidth="800" + Title="WelcomePage" Foreground="{Binding Source={StaticResource Foreground1}}"> - - - - - - - + + + + + + + diff --git a/Passliss/Properties/Resources.Designer.cs b/Passliss/Properties/Resources.Designer.cs index c2ab4e98..260de0d2 100644 --- a/Passliss/Properties/Resources.Designer.cs +++ b/Passliss/Properties/Resources.Designer.cs @@ -1104,6 +1104,33 @@ public static string Welcome { } } + /// + /// Looks up a localized string similar to Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key!. + /// + public static string WelcomeEncrypt { + get { + return ResourceManager.GetString("WelcomeEncrypt", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Generate strong and safe passwords with Passliss. Custom every settings to make the strongest password ever! Save these configurations thanks to "Password Configurations".. + /// + public static string WelcomeGenerate { + get { + return ResourceManager.GetString("WelcomeGenerate", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Test the strength of any passwords and generate a new one if yours is too weak.. + /// + public static string WelcomeTestStrength { + get { + return ResourceManager.GetString("WelcomeTestStrength", resourceCulture); + } + } + /// /// Looks up a localized string similar to Thanks for using Passliss! Let's get started!. /// diff --git a/Passliss/Properties/Resources.en-US.resx b/Passliss/Properties/Resources.en-US.resx index 034dd5af..81ed57a5 100644 --- a/Passliss/Properties/Resources.en-US.resx +++ b/Passliss/Properties/Resources.en-US.resx @@ -468,4 +468,13 @@ Thanks for using Passliss! Let's get started! + + Generate strong and safe passwords with Passliss. Custom every settings to make the strongest password ever! Save these configurations thanks to "Password Configurations". + + + Test the strength of any passwords and generate a new one if yours is too weak. + + + Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.fr-FR.resx b/Passliss/Properties/Resources.fr-FR.resx index 5d8f6758..a29ace25 100644 --- a/Passliss/Properties/Resources.fr-FR.resx +++ b/Passliss/Properties/Resources.fr-FR.resx @@ -468,4 +468,13 @@ Merci d'utiliser Passliss ! Commençons ! + + Générez des mots de passe forts et sûrs avec Passliss. Personnalisez tous les paramètres pour créer le mot de passe le plus fort de tous les temps! Enregistrez ces configurations grâce aux "Configurations de mot de passe". + + + Testez la force de tous les mots de passe et générez-en un nouveau si le vôtre est trop faible. + + + Vous voulez garder quelque chose de secret? Chiffrez n’importe quelle chaîne de caractères à l’aide de différents algorithmes de chiffrement. Bien sûr, vous pouvez également les déchiffrer à l’aide d’une clé secrète! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.resx b/Passliss/Properties/Resources.resx index b868796d..ac6a05c4 100644 --- a/Passliss/Properties/Resources.resx +++ b/Passliss/Properties/Resources.resx @@ -448,4 +448,13 @@ Thanks for using Passliss! Let's get started! + + Generate strong and safe passwords with Passliss. Custom every settings to make the strongest password ever! Save these configurations thanks to "Password Configurations". + + + Test the strength of any passwords and generate a new one if yours is too weak. + + + Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + \ No newline at end of file diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 36a826a7..7c551830 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -468,4 +468,13 @@ Thanks for using Passliss! Let's get started! + + Generate strong and safe passwords with Passliss. Custom every settings to make the strongest password ever! Save these configurations thanks to "Password Configurations". + + + Test the strength of any passwords and generate a new one if yours is too weak. + + + Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + \ No newline at end of file diff --git a/Passliss/Windows/FirstRunWindow.xaml b/Passliss/Windows/FirstRunWindow.xaml index 0b2aadf4..83f854b7 100644 --- a/Passliss/Windows/FirstRunWindow.xaml +++ b/Passliss/Windows/FirstRunWindow.xaml @@ -6,7 +6,7 @@ xmlns:lang="clr-namespace:Passliss.Properties" mc:Ignorable="d" Foreground="{Binding Source={StaticResource Foreground1}}" FontFamily="/Fonts/#Montserrat" - Title="{x:Static lang:Resources.Passliss}" Height="450" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" ResizeMode="NoResize" Background="Transparent" AllowsTransparency="True"> + Title="{x:Static lang:Resources.Passliss}" Height="500" Width="800" WindowStartupLocation="CenterScreen" WindowStyle="None" ResizeMode="NoResize" Background="Transparent" AllowsTransparency="True"> diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index c22272bd..83b60af3 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -43,8 +43,10 @@ namespace Passliss.Windows /// public partial class FirstRunWindow : Window { - WelcomePage WelcomePage => new(); + WelcomePage WelcomePage => new(); // PageID = 0 + TutorialPage TutorialPage => new(); // PageID = 1 + int pageID = 0; public FirstRunWindow() { InitializeComponent(); @@ -63,7 +65,13 @@ private void CloseBtn_Click(object sender, RoutedEventArgs e) private void NextBtn_Click(object sender, RoutedEventArgs e) { - //TODO: Add pages + pageID++; // Increment + PageViewer.Navigate(pageID switch + { + 0 => WelcomePage, + 1 => TutorialPage, + _ => WelcomePage + }); // Navigate to the next page } } } From 33732e1a750457b8ac5fd42d7c8453b2edaf1ec5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:00:15 +0100 Subject: [PATCH 08/34] Added "Theme" page (#127) --- Passliss/Pages/FirstRunPages/ThemePage.xaml | 70 ++++++++++ .../Pages/FirstRunPages/ThemePage.xaml.cs | 122 ++++++++++++++++++ Passliss/Properties/Resources.Designer.cs | 18 +++ Passliss/Properties/Resources.en-US.resx | 6 + Passliss/Properties/Resources.fr-FR.resx | 6 + Passliss/Properties/Resources.resx | 6 + Passliss/Properties/Resources.zh-CN.resx | 6 + Passliss/Windows/FirstRunWindow.xaml.cs | 4 +- 8 files changed, 237 insertions(+), 1 deletion(-) create mode 100644 Passliss/Pages/FirstRunPages/ThemePage.xaml create mode 100644 Passliss/Pages/FirstRunPages/ThemePage.xaml.cs diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml new file mode 100644 index 00000000..819aa2fd --- /dev/null +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml.cs b/Passliss/Pages/FirstRunPages/ThemePage.xaml.cs new file mode 100644 index 00000000..67f60ad2 --- /dev/null +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml.cs @@ -0,0 +1,122 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using Passliss.Classes; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Input; +using System.Windows.Media; + +namespace Passliss.Pages.FirstRunPages +{ + /// + /// Interaction logic for ThemePage.xaml + /// + public partial class ThemePage : Page + { + Border CheckedBorder { get; set; } + + public ThemePage() + { + InitializeComponent(); + InitUI(); + } + + private void InitUI() + { + CheckedBorder = SystemBorder; + SystemRadioBtn.IsChecked = true; + RefreshBorders(); + ThemeApplyBtn.Visibility = Visibility.Collapsed; + } + + private void RefreshBorders() + { + LightBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color + DarkBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color + SystemBorder.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color + + CheckedBorder.BorderBrush = new SolidColorBrush() { Color = (Color)ColorConverter.ConvertFromString(App.Current.Resources["AccentColor"].ToString()) }; // Set color + } + + private void Border_MouseEnter(object sender, MouseEventArgs e) + { + Border border = (Border)sender; + border.BorderBrush = new SolidColorBrush() { Color = (Color)ColorConverter.ConvertFromString(App.Current.Resources["AccentColor"].ToString()) }; // Set color + + } + + private void Border_MouseLeave(object sender, MouseEventArgs e) + { + Border border = (Border)sender; + if (border != CheckedBorder) + { + border.BorderBrush = new SolidColorBrush() { Color = Colors.Transparent }; // Set color + } + } + + private void LightBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + LightRadioBtn.IsChecked = true; // Set IsChecked + CheckedBorder = LightBorder; // Set + RefreshBorders(); + } + + private void DarkBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + DarkRadioBtn.IsChecked = true; // Set IsChecked + CheckedBorder = DarkBorder; // Set + RefreshBorders(); + } + + private void SystemBorder_MouseLeftButtonUp(object sender, MouseButtonEventArgs e) + { + SystemRadioBtn.IsChecked = true; // Set IsChecked + CheckedBorder = SystemBorder; // Set + RefreshBorders(); + } + + private void LightRadioBtn_Checked(object sender, RoutedEventArgs e) + { + ThemeApplyBtn.Visibility = Visibility.Visible; // Show the ThemeApplyBtn button + } + + private void DarkRadioBtn_Checked(object sender, RoutedEventArgs e) + { + ThemeApplyBtn.Visibility = Visibility.Visible; // Show the ThemeApplyBtn button + } + + private void SystemRadioBtn_Checked(object sender, RoutedEventArgs e) + { + ThemeApplyBtn.Visibility = Visibility.Visible; // Show the ThemeApplyBtn button + } + + private void ThemeApplyBtn_Click(object sender, RoutedEventArgs e) + { + Global.Settings.IsDarkTheme = DarkRadioBtn.IsChecked.Value; // Set the settings + Global.Settings.IsThemeSystem = SystemRadioBtn.IsChecked.Value; // Set the settings + SettingsManager.Save(); // Save the changes + ThemeApplyBtn.Visibility = Visibility.Hidden; // Hide + } + } +} diff --git a/Passliss/Properties/Resources.Designer.cs b/Passliss/Properties/Resources.Designer.cs index 260de0d2..ffa208c3 100644 --- a/Passliss/Properties/Resources.Designer.cs +++ b/Passliss/Properties/Resources.Designer.cs @@ -177,6 +177,15 @@ public static string ChangeLanguage { } } + /// + /// Looks up a localized string similar to Changes will be applied after a restart of Passliss.. + /// + public static string ChangesApplyAfterRestart { + get { + return ResourceManager.GetString("ChangesApplyAfterRestart", resourceCulture); + } + } + /// /// Looks up a localized string similar to Change Passliss theme.. /// @@ -1139,5 +1148,14 @@ public static string WelcomeThanks { return ResourceManager.GetString("WelcomeThanks", resourceCulture); } } + + /// + /// Looks up a localized string similar to Make Passliss yours.. + /// + public static string WelcomeThemeTitle { + get { + return ResourceManager.GetString("WelcomeThemeTitle", resourceCulture); + } + } } } diff --git a/Passliss/Properties/Resources.en-US.resx b/Passliss/Properties/Resources.en-US.resx index 81ed57a5..ca19c1c7 100644 --- a/Passliss/Properties/Resources.en-US.resx +++ b/Passliss/Properties/Resources.en-US.resx @@ -477,4 +477,10 @@ Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + + Make Passliss yours. + + + Changes will be applied after a restart of Passliss. + \ No newline at end of file diff --git a/Passliss/Properties/Resources.fr-FR.resx b/Passliss/Properties/Resources.fr-FR.resx index a29ace25..ecaaa42c 100644 --- a/Passliss/Properties/Resources.fr-FR.resx +++ b/Passliss/Properties/Resources.fr-FR.resx @@ -477,4 +477,10 @@ Vous voulez garder quelque chose de secret? Chiffrez n’importe quelle chaîne de caractères à l’aide de différents algorithmes de chiffrement. Bien sûr, vous pouvez également les déchiffrer à l’aide d’une clé secrète! + + Faites de Passliss le vôtre. + + + Les modifications seront appliquées après un redémarrage de Passliss. + \ No newline at end of file diff --git a/Passliss/Properties/Resources.resx b/Passliss/Properties/Resources.resx index ac6a05c4..6e13a92c 100644 --- a/Passliss/Properties/Resources.resx +++ b/Passliss/Properties/Resources.resx @@ -457,4 +457,10 @@ Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + + Make Passliss yours. + + + Changes will be applied after a restart of Passliss. + \ No newline at end of file diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 7c551830..3e20d80a 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -477,4 +477,10 @@ Want to keep something secret? Encrypt any string using different encryption algorithms. Of course, you can also decrypt them using a secret key! + + Make Passliss yours. + + + Changes will be applied after a restart of Passliss. + \ No newline at end of file diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index 83b60af3..f6566b58 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -45,6 +45,7 @@ public partial class FirstRunWindow : Window { WelcomePage WelcomePage => new(); // PageID = 0 TutorialPage TutorialPage => new(); // PageID = 1 + ThemePage ThemePage => new(); // PageID = 2 int pageID = 0; public FirstRunWindow() @@ -70,7 +71,8 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) { 0 => WelcomePage, 1 => TutorialPage, - _ => WelcomePage + 2 => ThemePage, + _ => WelcomePage // By default go the home page }); // Navigate to the next page } } From 31adcd090d0163fb51379739acbe66812b6428f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:11:11 +0100 Subject: [PATCH 09/34] Added "Language" page (#127) --- .../Pages/FirstRunPages/LanguagePage.xaml | 38 ++++++ .../Pages/FirstRunPages/LanguagePage.xaml.cs | 74 ++++++++++ Passliss/Pages/FirstRunPages/ThemePage.xaml | 128 +++++++++--------- .../Pages/FirstRunPages/TutorialPage.xaml | 68 +++++----- Passliss/Windows/FirstRunWindow.xaml.cs | 3 + 5 files changed, 213 insertions(+), 98 deletions(-) create mode 100644 Passliss/Pages/FirstRunPages/LanguagePage.xaml create mode 100644 Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs diff --git a/Passliss/Pages/FirstRunPages/LanguagePage.xaml b/Passliss/Pages/FirstRunPages/LanguagePage.xaml new file mode 100644 index 00000000..93582881 --- /dev/null +++ b/Passliss/Pages/FirstRunPages/LanguagePage.xaml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs b/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs new file mode 100644 index 00000000..fae427ee --- /dev/null +++ b/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs @@ -0,0 +1,74 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using Passliss.Classes; +using System.Windows; +using System.Windows.Controls; + +namespace Passliss.Pages.FirstRunPages +{ + /// + /// Interaction logic for LanguagePage.xaml + /// + public partial class LanguagePage : Page + { + public LanguagePage() + { + InitializeComponent(); + InitUI(); // Load the UI + } + + private void InitUI() + { + // Load LangComboBox + LangComboBox.Items.Clear(); // Clear + LangComboBox.Items.Add(Properties.Resources.Default); // Add "default" + + for (int i = 0; i < Global.LanguageList.Count; i++) + { + LangComboBox.Items.Add(Global.LanguageList[i]); + } + + LangComboBox.SelectedIndex = (Global.Settings.Language == "_default") ? 0 : Global.LanguageCodeList.IndexOf(Global.Settings.Language) + 1; + + } + + private void LangComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + LangApplyBtn.Visibility = Visibility.Visible; // Show + } + + private void LangApplyBtn_Click(object sender, RoutedEventArgs e) + { + Global.Settings.Language = LangComboBox.Text switch + { + "English (United States)" => Global.LanguageCodeList[0], // Set the settings value + "Français (France)" => Global.LanguageCodeList[1], // Set the settings value + "中文（简体）" => Global.LanguageCodeList[2], // Set the settings value + _ => "_default" // Set the settings value + }; + SettingsManager.Save(); // Save the changes + LangApplyBtn.Visibility = Visibility.Hidden; // Hide + } + } +} diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index 819aa2fd..35f63ba9 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -1,70 +1,70 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Passliss.Pages.FirstRunPages" + xmlns:lang="clr-namespace:Passliss.Properties" + mc:Ignorable="d" FontFamily="..\..\Fonts\#Montserrat" + d:DesignHeight="450" d:DesignWidth="800" Foreground="{Binding Source={StaticResource Foreground1}}" + Title="ThemePage"> - - - - - - - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/TutorialPage.xaml b/Passliss/Pages/FirstRunPages/TutorialPage.xaml index 28cefd7d..c2b83ba6 100644 --- a/Passliss/Pages/FirstRunPages/TutorialPage.xaml +++ b/Passliss/Pages/FirstRunPages/TutorialPage.xaml @@ -1,39 +1,39 @@  + xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" + xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:local="clr-namespace:Passliss.Pages.FirstRunPages" + xmlns:lang="clr-namespace:Passliss.Properties" + mc:Ignorable="d" FontFamily="..\..\Fonts\#Montserrat" + d:DesignHeight="450" d:DesignWidth="800" Foreground="{Binding Source={StaticResource Foreground1}}" + Title="TutorialPage"> - - - - - - - - - + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index f6566b58..dc0f705d 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -47,6 +47,8 @@ public partial class FirstRunWindow : Window TutorialPage TutorialPage => new(); // PageID = 1 ThemePage ThemePage => new(); // PageID = 2 + LanguagePage LanguagePage => new(); // PageID = 3 + int pageID = 0; public FirstRunWindow() { @@ -72,6 +74,7 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) 0 => WelcomePage, 1 => TutorialPage, 2 => ThemePage, + 3 => LanguagePage, _ => WelcomePage // By default go the home page }); // Navigate to the next page } From 5f300d9609d91024c27408ec5fa6b0591bd9d659 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:16:30 +0100 Subject: [PATCH 10/34] Added the possibility to end the "First run" experience (#127) --- Passliss/Properties/Resources.Designer.cs | 9 +++++++++ Passliss/Properties/Resources.en-US.resx | 3 +++ Passliss/Properties/Resources.fr-FR.resx | 3 +++ Passliss/Properties/Resources.resx | 3 +++ Passliss/Properties/Resources.zh-CN.resx | 3 +++ Passliss/Windows/FirstRunWindow.xaml | 2 +- Passliss/Windows/FirstRunWindow.xaml.cs | 17 +++++++++++++++++ 7 files changed, 39 insertions(+), 1 deletion(-) diff --git a/Passliss/Properties/Resources.Designer.cs b/Passliss/Properties/Resources.Designer.cs index ffa208c3..d8c10ccf 100644 --- a/Passliss/Properties/Resources.Designer.cs +++ b/Passliss/Properties/Resources.Designer.cs @@ -591,6 +591,15 @@ public static string Lenght { } } + /// + /// Looks up a localized string similar to Let's go. + /// + public static string LetsGo { + get { + return ResourceManager.GetString("LetsGo", resourceCulture); + } + } + /// /// Looks up a localized string similar to Licenses. /// diff --git a/Passliss/Properties/Resources.en-US.resx b/Passliss/Properties/Resources.en-US.resx index ca19c1c7..6c89c59e 100644 --- a/Passliss/Properties/Resources.en-US.resx +++ b/Passliss/Properties/Resources.en-US.resx @@ -483,4 +483,7 @@ Changes will be applied after a restart of Passliss. + + Let's go + \ No newline at end of file diff --git a/Passliss/Properties/Resources.fr-FR.resx b/Passliss/Properties/Resources.fr-FR.resx index ecaaa42c..215d7ea0 100644 --- a/Passliss/Properties/Resources.fr-FR.resx +++ b/Passliss/Properties/Resources.fr-FR.resx @@ -483,4 +483,7 @@ Les modifications seront appliquées après un redémarrage de Passliss. + + Allons-y + \ No newline at end of file diff --git a/Passliss/Properties/Resources.resx b/Passliss/Properties/Resources.resx index 6e13a92c..1c072479 100644 --- a/Passliss/Properties/Resources.resx +++ b/Passliss/Properties/Resources.resx @@ -463,4 +463,7 @@ Changes will be applied after a restart of Passliss. + + Let's go + \ No newline at end of file diff --git a/Passliss/Properties/Resources.zh-CN.resx b/Passliss/Properties/Resources.zh-CN.resx index 3e20d80a..60a96090 100644 --- a/Passliss/Properties/Resources.zh-CN.resx +++ b/Passliss/Properties/Resources.zh-CN.resx @@ -483,4 +483,7 @@ Changes will be applied after a restart of Passliss. + + Let's go + \ No newline at end of file diff --git a/Passliss/Windows/FirstRunWindow.xaml b/Passliss/Windows/FirstRunWindow.xaml index 83f854b7..b20c2e2e 100644 --- a/Passliss/Windows/FirstRunWindow.xaml +++ b/Passliss/Windows/FirstRunWindow.xaml @@ -136,7 +136,7 @@ diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index dc0f705d..48519a4f 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -21,9 +21,12 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +using Passliss.Classes; using Passliss.Pages.FirstRunPages; using System; using System.Collections.Generic; +using System.Diagnostics; +using System.IO; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -77,6 +80,20 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) 3 => LanguagePage, _ => WelcomePage // By default go the home page }); // Navigate to the next page + + if (pageID == 4) + { + NextTxt.Text = Properties.Resources.LetsGo; // Set text + } + + if (pageID == 5) + { + Global.Settings.IsFirstRun = false; + SettingsManager.Save(); + + Process.Start(Directory.GetCurrentDirectory() + @"\Passliss.exe"); // Start + Environment.Exit(0); // Close + } } } } From 39742fb85cb390ce3741c75193fb28897242f08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:22:14 +0100 Subject: [PATCH 11/34] Added the "Update" page (#127) --- Passliss/Pages/FirstRunPages/ThemePage.xaml | 1 - Passliss/Pages/FirstRunPages/UpdatePage.xaml | 19 ++++++ .../Pages/FirstRunPages/UpdatePage.xaml.cs | 59 +++++++++++++++++++ Passliss/Windows/FirstRunWindow.xaml.cs | 3 +- 4 files changed, 80 insertions(+), 2 deletions(-) create mode 100644 Passliss/Pages/FirstRunPages/UpdatePage.xaml create mode 100644 Passliss/Pages/FirstRunPages/UpdatePage.xaml.cs diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index 35f63ba9..e31b9dc0 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -17,7 +17,6 @@ - diff --git a/Passliss/Pages/FirstRunPages/UpdatePage.xaml b/Passliss/Pages/FirstRunPages/UpdatePage.xaml new file mode 100644 index 00000000..eb30d2bc --- /dev/null +++ b/Passliss/Pages/FirstRunPages/UpdatePage.xaml @@ -0,0 +1,19 @@ + + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/UpdatePage.xaml.cs b/Passliss/Pages/FirstRunPages/UpdatePage.xaml.cs new file mode 100644 index 00000000..17f230ee --- /dev/null +++ b/Passliss/Pages/FirstRunPages/UpdatePage.xaml.cs @@ -0,0 +1,59 @@ +/* +MIT License + +Copyright (c) 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: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +*/ +using Passliss.Classes; +using System.Windows; +using System.Windows.Controls; + +namespace Passliss.Pages.FirstRunPages +{ + /// + /// Interaction logic for UpdatePage.xaml + /// + public partial class UpdatePage : Page + { + public UpdatePage() + { + InitializeComponent(); + InitUI(); // Load the UI + } + + private void InitUI() + { + CheckUpdatesOnStartChk.IsChecked = Global.Settings.CheckUpdatesOnStart ?? true; // Set + NotifyUpdatesChk.IsChecked = Global.Settings.NotifyUpdates ?? true; // Set + } + + private void CheckUpdatesOnStartChk_Checked(object sender, RoutedEventArgs e) + { + Global.Settings.CheckUpdatesOnStart = CheckUpdatesOnStartChk.IsChecked; // Set + SettingsManager.Save(); // Save changes + } + + private void NotifyUpdatesChk_Checked(object sender, RoutedEventArgs e) + { + Global.Settings.NotifyUpdates = NotifyUpdatesChk.IsChecked; // Set + SettingsManager.Save(); // Save changes + } + } +} diff --git a/Passliss/Windows/FirstRunWindow.xaml.cs b/Passliss/Windows/FirstRunWindow.xaml.cs index 48519a4f..b2d69777 100644 --- a/Passliss/Windows/FirstRunWindow.xaml.cs +++ b/Passliss/Windows/FirstRunWindow.xaml.cs @@ -49,8 +49,8 @@ public partial class FirstRunWindow : Window WelcomePage WelcomePage => new(); // PageID = 0 TutorialPage TutorialPage => new(); // PageID = 1 ThemePage ThemePage => new(); // PageID = 2 - LanguagePage LanguagePage => new(); // PageID = 3 + UpdatePage UpdatePage => new(); // PageID = 4 int pageID = 0; public FirstRunWindow() @@ -78,6 +78,7 @@ private void NextBtn_Click(object sender, RoutedEventArgs e) 1 => TutorialPage, 2 => ThemePage, 3 => LanguagePage, + 4 => UpdatePage, _ => WelcomePage // By default go the home page }); // Navigate to the next page From 009f4b542f91038945cf056f6a194df4a6c581f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:30:50 +0100 Subject: [PATCH 12/34] Improved design of the "First run" experience (#127) --- .../Pages/FirstRunPages/LanguagePage.xaml | 2 +- Passliss/Pages/FirstRunPages/ThemePage.xaml | 16 +++++++++--- Passliss/Pages/FirstRunPages/UpdatePage.xaml | 26 ++++++++++++++----- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/Passliss/Pages/FirstRunPages/LanguagePage.xaml b/Passliss/Pages/FirstRunPages/LanguagePage.xaml index 93582881..3e6824d3 100644 --- a/Passliss/Pages/FirstRunPages/LanguagePage.xaml +++ b/Passliss/Pages/FirstRunPages/LanguagePage.xaml @@ -16,7 +16,7 @@ - + diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index e31b9dc0..d3ed3a0a 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -14,8 +14,18 @@ - - + + + + + + + + + + + + @@ -59,7 +69,7 @@ - + diff --git a/Passliss/Pages/FirstRunPages/UpdatePage.xaml b/Passliss/Pages/FirstRunPages/UpdatePage.xaml index eb30d2bc..8be1ca49 100644 --- a/Passliss/Pages/FirstRunPages/UpdatePage.xaml +++ b/Passliss/Pages/FirstRunPages/UpdatePage.xaml @@ -9,11 +9,23 @@ d:DesignHeight="450" d:DesignWidth="800" Foreground="{Binding Source={StaticResource Foreground1}}" Title="UpdatePage"> - - - - - - - + + + + + + + + + + + + + + + + + + + From 9e1ed005af3774606ce1f83b7308a2cf5b847692 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:34:30 +0100 Subject: [PATCH 13/34] Fixed an issue with "Apply" buttons (#127) --- Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs | 2 +- Passliss/Pages/FirstRunPages/ThemePage.xaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs b/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs index fae427ee..d67c3400 100644 --- a/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs +++ b/Passliss/Pages/FirstRunPages/LanguagePage.xaml.cs @@ -50,7 +50,7 @@ private void InitUI() } LangComboBox.SelectedIndex = (Global.Settings.Language == "_default") ? 0 : Global.LanguageCodeList.IndexOf(Global.Settings.Language) + 1; - + LangApplyBtn.Visibility = Visibility.Collapsed; // Hide } private void LangComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e) diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index d3ed3a0a..4ee58d11 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -62,7 +62,7 @@ From 595494ec88e0e9e4c8fb37306a2842660535dc6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:35:05 +0100 Subject: [PATCH 14/34] When resetting settings, the "First run" experience no longer shows up (#127) --- Passliss/Pages/SettingsPage.xaml.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Passliss/Pages/SettingsPage.xaml.cs b/Passliss/Pages/SettingsPage.xaml.cs index ef2957b1..ef8ec08f 100644 --- a/Passliss/Pages/SettingsPage.xaml.cs +++ b/Passliss/Pages/SettingsPage.xaml.cs @@ -561,7 +561,7 @@ private void ResetSettingsLink_Click(object sender, RoutedEventArgs e) HidePasswordInStrengthPage = false, AlwaysHidePasswordInHistory = false, DisableHistory = false, - IsFirstRun = true + IsFirstRun = false }; // Create default settings SettingsManager.Save(); // Save the changes From ad71d5e6b1e8e592f2129470d214647a49d5080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Sun, 13 Feb 2022 11:46:45 +0100 Subject: [PATCH 15/34] Added animations (#127) --- Passliss/Pages/FirstRunPages/ThemePage.xaml | 49 +++++++++++++++++-- .../Pages/FirstRunPages/TutorialPage.xaml | 49 +++++++++++++++++-- 2 files changed, 88 insertions(+), 10 deletions(-) diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index 4ee58d11..49285adb 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -30,7 +30,7 @@ - + @@ -39,8 +39,21 @@ + + + + + + + + + + + + + - + @@ -49,8 +62,21 @@ - - + + + + + + + + + + + + + + + @@ -59,7 +85,20 @@ - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From d1274d42837943ee6e45ad5dcb2a57b515c065b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 10:30:24 +0100 Subject: [PATCH 21/34] Added "Password length" category in Settings (#128) --- Passliss/Pages/SettingsPage.xaml | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index cad1cb81..88041d12 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -87,7 +87,34 @@ - + + + + + + + + + + + + + + + + + + + + + + + From d24065a4e8b2a69b36bda367ebb0571d9e25e793 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 10:36:45 +0100 Subject: [PATCH 22/34] Added "Language" category in Settings (#128) --- Passliss/Pages/SettingsPage.xaml | 52 ++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 19 deletions(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 88041d12..9f32176e 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -87,6 +87,33 @@ + + + + + + + + + + + + + + + + + + + + + + @@ -148,25 +175,12 @@ - - - - - - - - - + From e3ec418e1397c25ec934f440af69297604882ee0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 10:43:25 +0100 Subject: [PATCH 23/34] Fixed resizing issues (#128) --- Passliss/Pages/SettingsPage.xaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 9f32176e..6d452b30 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -39,7 +39,7 @@ - + @@ -94,8 +94,8 @@ - - + + @@ -105,10 +105,11 @@ @@ -117,7 +118,7 @@ - + From ae728b1afc84633e0a1eafd27d9de4f06b13a2b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 10:50:11 +0100 Subject: [PATCH 24/34] Added "Startup" category in Settings (#128) --- Passliss/Pages/SettingsPage.xaml | 65 +++++++++++++++++++------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 6d452b30..7659d935 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -144,36 +144,47 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - + + + + + + + + + + + + + + + From 9fc8a5cfe992a3f8208373745db75997f0d87d1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 10:58:32 +0100 Subject: [PATCH 26/34] Added "History" category in Settings (#128) --- Passliss/Pages/SettingsPage.xaml | 21 ++++++++++++++++----- Passliss/Properties/Resources.Designer.cs | 9 +++++++++ Passliss/Properties/Resources.en-US.resx | 3 +++ Passliss/Properties/Resources.fr-FR.resx | 3 +++ Passliss/Properties/Resources.resx | 3 +++ Passliss/Properties/Resources.zh-CN.resx | 3 +++ 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 93fd2ede..357affef 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -179,8 +179,6 @@ - - @@ -203,12 +201,25 @@ - - - + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - + + + - - - - - - - - - - + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + - + - - + + - - + + + + + - - - - - - - - + + + + + + + + - + - - + + - - - - + - + - - - - - + From 8ae685783c0f9a6457247ea151f6a81b3d460d25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:15:25 +0100 Subject: [PATCH 29/34] Added a minimum width for the "About" section in Settings (#129) --- Passliss/Pages/SettingsPage.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 5ce4f001..823bd1fb 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -15,7 +15,7 @@ - + From dce30e085824811aaf8cc14eb0ccd446f173ce23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:16:23 +0100 Subject: [PATCH 30/34] Code cleanup --- Passliss/Pages/EncryptPage.xaml | 152 +++++++++--------- .../Pages/FirstRunPages/LanguagePage.xaml | 48 +++--- Passliss/Pages/FirstRunPages/ThemePage.xaml | 96 +++++------ .../Pages/FirstRunPages/TutorialPage.xaml | 76 ++++----- Passliss/Pages/FirstRunPages/UpdatePage.xaml | 32 ++-- Passliss/Pages/GeneratePage.xaml | 56 +++---- Passliss/Pages/SettingsPage.xaml | 36 ++--- 7 files changed, 248 insertions(+), 248 deletions(-) diff --git a/Passliss/Pages/EncryptPage.xaml b/Passliss/Pages/EncryptPage.xaml index 4cd4f3b9..7ac158ad 100644 --- a/Passliss/Pages/EncryptPage.xaml +++ b/Passliss/Pages/EncryptPage.xaml @@ -10,87 +10,87 @@ FontFamily="../Fonts/#Montserrat" Title="EncryptPage"> - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/LanguagePage.xaml b/Passliss/Pages/FirstRunPages/LanguagePage.xaml index 3e6824d3..6e0ac1c6 100644 --- a/Passliss/Pages/FirstRunPages/LanguagePage.xaml +++ b/Passliss/Pages/FirstRunPages/LanguagePage.xaml @@ -9,30 +9,30 @@ d:DesignHeight="450" d:DesignWidth="800" Foreground="{Binding Source={StaticResource Foreground1}}" Title="LanguagePage"> - - - - - - - - - + + + + + + + + + - - - + + + - - - - - - - + + + + + + + diff --git a/Passliss/Pages/FirstRunPages/ThemePage.xaml b/Passliss/Pages/FirstRunPages/ThemePage.xaml index 49285adb..c47f3ea2 100644 --- a/Passliss/Pages/FirstRunPages/ThemePage.xaml +++ b/Passliss/Pages/FirstRunPages/ThemePage.xaml @@ -15,17 +15,17 @@ - - - - + + + + - - - - - - + + + + + + @@ -40,18 +40,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -63,19 +63,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -86,19 +86,19 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - + + + + + + + @@ -108,10 +108,10 @@ - - + + - - - + + + diff --git a/Passliss/Pages/SettingsPage.xaml b/Passliss/Pages/SettingsPage.xaml index 823bd1fb..d4bd5342 100644 --- a/Passliss/Pages/SettingsPage.xaml +++ b/Passliss/Pages/SettingsPage.xaml @@ -257,25 +257,25 @@ - - - - - - - - - - + + + + + + + + + + - - - + + + From 522444b64aee29984b53aea201b78fe490ca5981 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:17:56 +0100 Subject: [PATCH 31/34] Updated Setup --- Passliss.Setup/Setup.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Passliss.Setup/Setup.iss b/Passliss.Setup/Setup.iss index 5bd56a8d..d599cc4c 100644 --- a/Passliss.Setup/Setup.iss +++ b/Passliss.Setup/Setup.iss @@ -3,7 +3,7 @@ #define MyAppName "Passliss" #define MyAppVersion "2.2.0.2202" -#define MyAppFullVersion "2.2.0.2202-pre1" +#define MyAppFullVersion "2.2.0.2202-rc1" #define MyAppPublisher "Lo Corporation" #define MyAppURL "https://leocorporation.dev/" #define MyAppExeName "Passliss.exe" From 79aed44ac4d18ad4f56c50feac534ea19e779868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:18:21 +0100 Subject: [PATCH 32/34] Version 2.2.0.2202-rc1 --- Passliss/Classes/Global.cs | 2 +- Passliss/Passliss.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Passliss/Classes/Global.cs b/Passliss/Classes/Global.cs index 2cc70bf8..4d85e007 100644 --- a/Passliss/Classes/Global.cs +++ b/Passliss/Classes/Global.cs @@ -105,7 +105,7 @@ public static class Global /// /// The current version of Passliss. /// - public static string Version => "2.2.0.2202-pre1"; + public static string Version => "2.2.0.2202-rc1"; /// /// GitHub link for the last version (). diff --git a/Passliss/Passliss.csproj b/Passliss/Passliss.csproj index 968aefdb..156d0dca 100644 --- a/Passliss/Passliss.csproj +++ b/Passliss/Passliss.csproj @@ -6,7 +6,7 @@ true Passliss.ico app.manifest - 2.2.0.2202-pre1 + 2.2.0.2202-rc1 Léo Corporation MIT git From 0af91d74caebf6d25bad7bd0f2de4a964e55d8d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:43:58 +0100 Subject: [PATCH 33/34] Updated Setup --- Passliss.Setup/Setup.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Passliss.Setup/Setup.iss b/Passliss.Setup/Setup.iss index d599cc4c..94ccdbea 100644 --- a/Passliss.Setup/Setup.iss +++ b/Passliss.Setup/Setup.iss @@ -3,7 +3,7 @@ #define MyAppName "Passliss" #define MyAppVersion "2.2.0.2202" -#define MyAppFullVersion "2.2.0.2202-rc1" +#define MyAppFullVersion "2.2.0.2202" #define MyAppPublisher "Lo Corporation" #define MyAppURL "https://leocorporation.dev/" #define MyAppExeName "Passliss.exe" From 0ef157d6fe7f618db905f223697deef2553eee41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Peyronnet?= Date: Mon, 14 Feb 2022 11:44:08 +0100 Subject: [PATCH 34/34] Version 2.2.0.2202 --- Passliss/Classes/Global.cs | 2 +- Passliss/Passliss.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Passliss/Classes/Global.cs b/Passliss/Classes/Global.cs index 4d85e007..cec3e7d9 100644 --- a/Passliss/Classes/Global.cs +++ b/Passliss/Classes/Global.cs @@ -105,7 +105,7 @@ public static class Global /// /// The current version of Passliss. /// - public static string Version => "2.2.0.2202-rc1"; + public static string Version => "2.2.0.2202"; /// /// GitHub link for the last version (). diff --git a/Passliss/Passliss.csproj b/Passliss/Passliss.csproj index 156d0dca..3dd5625b 100644 --- a/Passliss/Passliss.csproj +++ b/Passliss/Passliss.csproj @@ -6,7 +6,7 @@ true Passliss.ico app.manifest - 2.2.0.2202-rc1 + 2.2.0.2202 Léo Corporation MIT git