From 9555007690000f6f4272cc69e174bb48101f07bf Mon Sep 17 00:00:00 2001 From: Hongtao Zhang Date: Thu, 18 Jan 2024 22:22:24 -0600 Subject: [PATCH] finish porting welcome pages --- .../Resource/Internationalization.cs | 2 + Flow.Launcher/Flow.Launcher.csproj | 13 ++++ .../WelcomePages/WelcomePage5ViewModel.cs | 18 ----- .../MainViewModel.cs | 0 .../PluginStoreItemViewModel.cs | 0 .../PluginViewModel.cs | 0 .../{ViewModel => ViewModels}/RelayCommand.cs | 0 .../ResultViewModel.cs | 0 .../ResultsForUpdate.cs | 0 .../ResultsViewModel.cs | 0 .../SettingWindowViewModel.cs | 0 .../WelcomePages/PageViewModelBase.cs | 6 +- .../WelcomePages/WelcomePage1ViewModel.cs | 2 +- .../WelcomePages/WelcomePage2ViewModel.cs | 11 ++- .../WelcomePages/WelcomePage3ViewModel.cs | 6 +- .../WelcomePages/WelcomePage4ViewModel.cs | 6 +- .../WelcomePages/WelcomePage5ViewModel.cs | 69 +++++++++++++++++++ .../WelcomeWindowViewModel.cs | 2 +- .../WelcomePages/WelcomePage1View.axaml} | 8 +-- .../WelcomePages/WelcomePage1View.axaml.cs} | 6 +- .../WelcomePages/WelcomePage2View.axaml} | 4 +- .../WelcomePages/WelcomePage2View.axaml.cs} | 9 +-- .../WelcomePages/WelcomePage3View.axaml} | 6 +- .../WelcomePages/WelcomePage3View.axaml.cs} | 10 ++- .../WelcomePages/WelcomePage4View.axaml} | 6 +- .../WelcomePages/WelcomePage4View.axaml.cs} | 10 ++- .../WelcomePages/WelcomePage5View.axaml} | 14 ++-- .../WelcomePages/WelcomePage5View.axaml.cs | 18 +++++ .../WelcomePages/WelcomePage5.axaml.cs | 56 --------------- Flow.Launcher/WelcomeWindow.axaml.cs | 11 --- 30 files changed, 150 insertions(+), 143 deletions(-) delete mode 100644 Flow.Launcher/ViewModel/WelcomePages/WelcomePage5ViewModel.cs rename Flow.Launcher/{ViewModel => ViewModels}/MainViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/PluginStoreItemViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/PluginViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/RelayCommand.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/ResultViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/ResultsForUpdate.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/ResultsViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/SettingWindowViewModel.cs (100%) rename Flow.Launcher/{ViewModel => ViewModels}/WelcomePages/PageViewModelBase.cs (75%) rename Flow.Launcher/{ViewModel => ViewModels}/WelcomePages/WelcomePage1ViewModel.cs (96%) rename Flow.Launcher/{ViewModel => ViewModels}/WelcomePages/WelcomePage2ViewModel.cs (66%) rename Flow.Launcher/{ViewModel => ViewModels}/WelcomePages/WelcomePage3ViewModel.cs (86%) rename Flow.Launcher/{ViewModel => ViewModels}/WelcomePages/WelcomePage4ViewModel.cs (85%) create mode 100644 Flow.Launcher/ViewModels/WelcomePages/WelcomePage5ViewModel.cs rename Flow.Launcher/{ViewModel => ViewModels}/WelcomeWindowViewModel.cs (98%) rename Flow.Launcher/{WelcomePages/WelcomePage1.axaml => Views/WelcomePages/WelcomePage1View.axaml} (97%) rename Flow.Launcher/{WelcomePages/WelcomePage1.axaml.cs => Views/WelcomePages/WelcomePage1View.axaml.cs} (51%) rename Flow.Launcher/{WelcomePages/WelcomePage2.axaml => Views/WelcomePages/WelcomePage2View.axaml} (97%) rename Flow.Launcher/{WelcomePages/WelcomePage2.axaml.cs => Views/WelcomePages/WelcomePage2View.axaml.cs} (85%) rename Flow.Launcher/{WelcomePages/WelcomePage3.axaml => Views/WelcomePages/WelcomePage3View.axaml} (98%) rename Flow.Launcher/{WelcomePages/WelcomePage3.axaml.cs => Views/WelcomePages/WelcomePage3View.axaml.cs} (51%) rename Flow.Launcher/{WelcomePages/WelcomePage4.axaml => Views/WelcomePages/WelcomePage4View.axaml} (97%) rename Flow.Launcher/{WelcomePages/WelcomePage4.axaml.cs => Views/WelcomePages/WelcomePage4View.axaml.cs} (52%) rename Flow.Launcher/{WelcomePages/WelcomePage5.axaml => Views/WelcomePages/WelcomePage5View.axaml} (88%) create mode 100644 Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml.cs delete mode 100644 Flow.Launcher/WelcomePages/WelcomePage5.axaml.cs diff --git a/Flow.Launcher.Core/Resource/Internationalization.cs b/Flow.Launcher.Core/Resource/Internationalization.cs index 4bafa95e1..7ef5d46a1 100644 --- a/Flow.Launcher.Core/Resource/Internationalization.cs +++ b/Flow.Launcher.Core/Resource/Internationalization.cs @@ -66,6 +66,7 @@ namespace Flow.Launcher.Core.Resource public void ChangeLanguage(string languageCode) { + return; languageCode = languageCode.NonNull(); Language language = GetLanguageByLanguageCode(languageCode); ChangeLanguage(language); @@ -73,6 +74,7 @@ namespace Flow.Launcher.Core.Resource private Language GetLanguageByLanguageCode(string languageCode) { + return new Language("a", "b"); var lowercase = languageCode.ToLower(); var language = AvailableLanguages.GetAvailableLanguages().FirstOrDefault(o => o.LanguageCode.ToLower() == lowercase); if (language == null) diff --git a/Flow.Launcher/Flow.Launcher.csproj b/Flow.Launcher/Flow.Launcher.csproj index 8fb95b992..7c7f56670 100644 --- a/Flow.Launcher/Flow.Launcher.csproj +++ b/Flow.Launcher/Flow.Launcher.csproj @@ -93,6 +93,7 @@ PreserveNewest + @@ -130,6 +131,18 @@ + + + + + + + + + + + + diff --git a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage5ViewModel.cs b/Flow.Launcher/ViewModel/WelcomePages/WelcomePage5ViewModel.cs deleted file mode 100644 index 34e175f28..000000000 --- a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage5ViewModel.cs +++ /dev/null @@ -1,18 +0,0 @@ -using Flow.Launcher.Infrastructure.UserSettings; - -namespace Flow.Launcher.ViewModel.WelcomePages -{ - public class WelcomePage5ViewModel : PageViewModelBase - { - public override bool CanNavigateNext { get; protected set; } - public override bool CanNavigatePrevious { get; protected set; } - public override string PageTitle { get; } - - public WelcomePage5ViewModel(Settings settings) - { - Settings = settings; - } - - public Settings Settings { get; set; } - } -} diff --git a/Flow.Launcher/ViewModel/MainViewModel.cs b/Flow.Launcher/ViewModels/MainViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/MainViewModel.cs rename to Flow.Launcher/ViewModels/MainViewModel.cs diff --git a/Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs b/Flow.Launcher/ViewModels/PluginStoreItemViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/PluginStoreItemViewModel.cs rename to Flow.Launcher/ViewModels/PluginStoreItemViewModel.cs diff --git a/Flow.Launcher/ViewModel/PluginViewModel.cs b/Flow.Launcher/ViewModels/PluginViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/PluginViewModel.cs rename to Flow.Launcher/ViewModels/PluginViewModel.cs diff --git a/Flow.Launcher/ViewModel/RelayCommand.cs b/Flow.Launcher/ViewModels/RelayCommand.cs similarity index 100% rename from Flow.Launcher/ViewModel/RelayCommand.cs rename to Flow.Launcher/ViewModels/RelayCommand.cs diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModels/ResultViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/ResultViewModel.cs rename to Flow.Launcher/ViewModels/ResultViewModel.cs diff --git a/Flow.Launcher/ViewModel/ResultsForUpdate.cs b/Flow.Launcher/ViewModels/ResultsForUpdate.cs similarity index 100% rename from Flow.Launcher/ViewModel/ResultsForUpdate.cs rename to Flow.Launcher/ViewModels/ResultsForUpdate.cs diff --git a/Flow.Launcher/ViewModel/ResultsViewModel.cs b/Flow.Launcher/ViewModels/ResultsViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/ResultsViewModel.cs rename to Flow.Launcher/ViewModels/ResultsViewModel.cs diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModels/SettingWindowViewModel.cs similarity index 100% rename from Flow.Launcher/ViewModel/SettingWindowViewModel.cs rename to Flow.Launcher/ViewModels/SettingWindowViewModel.cs diff --git a/Flow.Launcher/ViewModel/WelcomePages/PageViewModelBase.cs b/Flow.Launcher/ViewModels/WelcomePages/PageViewModelBase.cs similarity index 75% rename from Flow.Launcher/ViewModel/WelcomePages/PageViewModelBase.cs rename to Flow.Launcher/ViewModels/WelcomePages/PageViewModelBase.cs index ce8a74f33..b197ca300 100644 --- a/Flow.Launcher/ViewModel/WelcomePages/PageViewModelBase.cs +++ b/Flow.Launcher/ViewModels/WelcomePages/PageViewModelBase.cs @@ -1,8 +1,8 @@ -using Flow.Launcher.Plugin; +using ReactiveUI; -namespace Flow.Launcher.ViewModel.WelcomePages +namespace Flow.Launcher.ViewModels.WelcomePages { - public abstract class PageViewModelBase : BaseModel + public abstract class PageViewModelBase : ReactiveObject { /// /// Gets if the user can navigate to the next page diff --git a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage1ViewModel.cs b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage1ViewModel.cs similarity index 96% rename from Flow.Launcher/ViewModel/WelcomePages/WelcomePage1ViewModel.cs rename to Flow.Launcher/ViewModels/WelcomePages/WelcomePage1ViewModel.cs index 6b85959b2..f4ee47ea2 100644 --- a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage1ViewModel.cs +++ b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage1ViewModel.cs @@ -2,7 +2,7 @@ using Flow.Launcher.Core.Resource; using Flow.Launcher.Infrastructure.UserSettings; -namespace Flow.Launcher.ViewModel.WelcomePages +namespace Flow.Launcher.ViewModels.WelcomePages { public class WelcomePage1ViewModel : PageViewModelBase { diff --git a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage2ViewModel.cs b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage2ViewModel.cs similarity index 66% rename from Flow.Launcher/ViewModel/WelcomePages/WelcomePage2ViewModel.cs rename to Flow.Launcher/ViewModels/WelcomePages/WelcomePage2ViewModel.cs index a317d9fd6..98f349307 100644 --- a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage2ViewModel.cs +++ b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage2ViewModel.cs @@ -1,14 +1,11 @@ -using Avalonia.Interactivity; -using Flow.Launcher.Helper; -using Flow.Launcher.Infrastructure.Hotkey; -using Flow.Launcher.Infrastructure.UserSettings; +using Flow.Launcher.Infrastructure.UserSettings; -namespace Flow.Launcher.ViewModel.WelcomePages +namespace Flow.Launcher.ViewModels.WelcomePages { public class WelcomePage2ViewModel : PageViewModelBase { - public override bool CanNavigateNext { get; protected set; } - public override bool CanNavigatePrevious { get; protected set; } + public override bool CanNavigateNext { get; protected set; } = true; + public override bool CanNavigatePrevious { get; protected set; } = true; public override string PageTitle { get; } public Settings Settings { get; set; } diff --git a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage3ViewModel.cs b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage3ViewModel.cs similarity index 86% rename from Flow.Launcher/ViewModel/WelcomePages/WelcomePage3ViewModel.cs rename to Flow.Launcher/ViewModels/WelcomePages/WelcomePage3ViewModel.cs index 4d3a3f754..1802eb7e8 100644 --- a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage3ViewModel.cs +++ b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage3ViewModel.cs @@ -1,11 +1,11 @@ using Flow.Launcher.Infrastructure.UserSettings; -namespace Flow.Launcher.ViewModel.WelcomePages +namespace Flow.Launcher.ViewModels.WelcomePages { public class WelcomePage3ViewModel : PageViewModelBase { - public override bool CanNavigateNext { get; protected set; } - public override bool CanNavigatePrevious { get; protected set; } + public override bool CanNavigateNext { get; protected set; } = true; + public override bool CanNavigatePrevious { get; protected set; } = true; public override string PageTitle { get; } public WelcomePage3ViewModel(Settings settings) diff --git a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage4ViewModel.cs b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage4ViewModel.cs similarity index 85% rename from Flow.Launcher/ViewModel/WelcomePages/WelcomePage4ViewModel.cs rename to Flow.Launcher/ViewModels/WelcomePages/WelcomePage4ViewModel.cs index 319cc380f..4be15b9a1 100644 --- a/Flow.Launcher/ViewModel/WelcomePages/WelcomePage4ViewModel.cs +++ b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage4ViewModel.cs @@ -1,11 +1,11 @@ using Flow.Launcher.Infrastructure.UserSettings; -namespace Flow.Launcher.ViewModel.WelcomePages +namespace Flow.Launcher.ViewModels.WelcomePages { public class WelcomePage4ViewModel : PageViewModelBase { - public override bool CanNavigateNext { get; protected set; } - public override bool CanNavigatePrevious { get; protected set; } + public override bool CanNavigateNext { get; protected set; } = true; + public override bool CanNavigatePrevious { get; protected set; } = true; public override string PageTitle { get; } public WelcomePage4ViewModel(Settings settings) diff --git a/Flow.Launcher/ViewModels/WelcomePages/WelcomePage5ViewModel.cs b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage5ViewModel.cs new file mode 100644 index 000000000..1b811808e --- /dev/null +++ b/Flow.Launcher/ViewModels/WelcomePages/WelcomePage5ViewModel.cs @@ -0,0 +1,69 @@ +using Flow.Launcher.Infrastructure; +using Flow.Launcher.Infrastructure.UserSettings; +using Microsoft.Win32; + +namespace Flow.Launcher.ViewModels.WelcomePages +{ + public class WelcomePage5ViewModel : PageViewModelBase + { + public override bool CanNavigateNext { get; protected set; } = false; + public override bool CanNavigatePrevious { get; protected set; } = true; + public override string PageTitle { get; } + + public WelcomePage5ViewModel(Settings settings) + { + Settings = settings; + } + + public bool AutoStartup + { + get + { + return Settings.StartFlowLauncherOnSystemStartup; + } + set + { + if (value) + { + SetStartup(); + } + else + { + RemoveStartup(); + } + + Settings.StartFlowLauncherOnSystemStartup = value; + } + } + + public bool HideOnStartup + { + get + { + return Settings.HideOnStartup; + } + set + { + Settings.HideOnStartup = value; + } + } + + public Settings Settings { get; set; } + + private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"; + + private void RemoveStartup() + { + using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true); + key?.DeleteValue(Constant.FlowLauncher, false); + Settings.StartFlowLauncherOnSystemStartup = false; + } + + private void SetStartup() + { + using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true); + key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath); + Settings.StartFlowLauncherOnSystemStartup = true; + } + } +} diff --git a/Flow.Launcher/ViewModel/WelcomeWindowViewModel.cs b/Flow.Launcher/ViewModels/WelcomeWindowViewModel.cs similarity index 98% rename from Flow.Launcher/ViewModel/WelcomeWindowViewModel.cs rename to Flow.Launcher/ViewModels/WelcomeWindowViewModel.cs index f3c827a57..cd21c6a12 100644 --- a/Flow.Launcher/ViewModel/WelcomeWindowViewModel.cs +++ b/Flow.Launcher/ViewModels/WelcomeWindowViewModel.cs @@ -2,7 +2,7 @@ using System.Windows.Input; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Plugin; -using Flow.Launcher.ViewModel.WelcomePages; +using Flow.Launcher.ViewModels.WelcomePages; using ReactiveUI; namespace Flow.Launcher.ViewModel diff --git a/Flow.Launcher/WelcomePages/WelcomePage1.axaml b/Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml similarity index 97% rename from Flow.Launcher/WelcomePages/WelcomePage1.axaml rename to Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml index a00c70320..ce5fefe08 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage1.axaml +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml @@ -1,10 +1,10 @@  @@ -121,7 +121,7 @@ Canvas.Left="140" Width="60" Height="60" - Source="../../images/app.png" /> + Source="/Images/app.png" /> + Source="/Images/wizard.png" /> diff --git a/Flow.Launcher/WelcomePages/WelcomePage1.axaml.cs b/Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml.cs similarity index 51% rename from Flow.Launcher/WelcomePages/WelcomePage1.axaml.cs rename to Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml.cs index 14c429249..a7898bee0 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage1.axaml.cs +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage1View.axaml.cs @@ -1,12 +1,12 @@ using Avalonia.Controls; using PropertyChanged; -namespace Flow.Launcher.WelcomePages +namespace Flow.Launcher.Views.WelcomePages { [DoNotNotify] - public partial class WelcomePage1 : UserControl + public partial class WelcomePage1View : UserControl { - public WelcomePage1() + public WelcomePage1View() { InitializeComponent(); } diff --git a/Flow.Launcher/WelcomePages/WelcomePage2.axaml b/Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml similarity index 97% rename from Flow.Launcher/WelcomePages/WelcomePage2.axaml rename to Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml index 6a57880f9..e7c2ea5ce 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage2.axaml +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml @@ -1,11 +1,11 @@  diff --git a/Flow.Launcher/WelcomePages/WelcomePage2.axaml.cs b/Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml.cs similarity index 85% rename from Flow.Launcher/WelcomePages/WelcomePage2.axaml.cs rename to Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml.cs index 8033da2e2..3f89eb743 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage2.axaml.cs +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage2View.axaml.cs @@ -4,12 +4,13 @@ using Avalonia.Media; using Flow.Launcher.Helper; using Flow.Launcher.Infrastructure.Hotkey; using Flow.Launcher.Infrastructure.UserSettings; +using Flow.Launcher.ViewModels.WelcomePages; using PropertyChanged; -namespace Flow.Launcher.WelcomePages +namespace Flow.Launcher.Views.WelcomePages { [DoNotNotify] - public partial class WelcomePage2 : UserControl + public partial class WelcomePage2View : UserControl { private Settings Settings { get; set; } @@ -17,12 +18,12 @@ namespace Flow.Launcher.WelcomePages private string tbMsgTextOriginal; - public WelcomePage2() + public WelcomePage2View() { InitializeComponent(); - hotkeyControl.SetHotkeyAsync(Settings.Hotkey, false); } + private void HotkeyControl_OnGotFocus(object sender, RoutedEventArgs args) { HotKeyMapper.RemoveHotkey(Settings.Hotkey); diff --git a/Flow.Launcher/WelcomePages/WelcomePage3.axaml b/Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml similarity index 98% rename from Flow.Launcher/WelcomePages/WelcomePage3.axaml rename to Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml index 62fcd05a8..a01ecda25 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage3.axaml +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml @@ -1,10 +1,10 @@  @@ -48,7 +48,7 @@ Width="300" Height="100" Margin="0,0,0,0" - Source="../../images/page_img02.png" /> + Source="/Images/page_img01.png" /> diff --git a/Flow.Launcher/WelcomePages/WelcomePage3.axaml.cs b/Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml.cs similarity index 51% rename from Flow.Launcher/WelcomePages/WelcomePage3.axaml.cs rename to Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml.cs index 01d8113e6..1b5987a91 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage3.axaml.cs +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage3View.axaml.cs @@ -1,15 +1,13 @@ -using System; -using System.Windows.Navigation; -using Avalonia.Controls; +using Avalonia.Controls; using Flow.Launcher.Infrastructure.UserSettings; using PropertyChanged; -namespace Flow.Launcher.WelcomePages +namespace Flow.Launcher.Views.WelcomePages { [DoNotNotify] - public partial class WelcomePage3 : UserControl + public partial class WelcomePage3View : UserControl { - public WelcomePage3() + public WelcomePage3View() { InitializeComponent(); } diff --git a/Flow.Launcher/WelcomePages/WelcomePage4.axaml b/Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml similarity index 97% rename from Flow.Launcher/WelcomePages/WelcomePage4.axaml rename to Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml index fa7b27f75..bdb1547f3 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage4.axaml +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml @@ -1,10 +1,10 @@  @@ -79,7 +79,7 @@ Width="450" Height="280" Margin="0,0,0,0" - Source="../../images/page_img01.png" /> + Source="/Images/page_img01.png" /> diff --git a/Flow.Launcher/WelcomePages/WelcomePage4.axaml.cs b/Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml.cs similarity index 52% rename from Flow.Launcher/WelcomePages/WelcomePage4.axaml.cs rename to Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml.cs index 2d5e6ddc9..2375b7f10 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage4.axaml.cs +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage4View.axaml.cs @@ -1,15 +1,13 @@ -using System; -using System.Windows.Navigation; -using Avalonia.Controls; +using Avalonia.Controls; using Flow.Launcher.Infrastructure.UserSettings; using PropertyChanged; -namespace Flow.Launcher.WelcomePages +namespace Flow.Launcher.Views.WelcomePages { [DoNotNotify] - public partial class WelcomePage4 : UserControl + public partial class WelcomePage4View : UserControl { - public WelcomePage4() + public WelcomePage4View() { InitializeComponent(); } diff --git a/Flow.Launcher/WelcomePages/WelcomePage5.axaml b/Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml similarity index 88% rename from Flow.Launcher/WelcomePages/WelcomePage5.axaml rename to Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml index ec67aaa38..1f6ac969f 100644 --- a/Flow.Launcher/WelcomePages/WelcomePage5.axaml +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml @@ -1,10 +1,10 @@  @@ -68,7 +68,7 @@ Canvas.Left="225" Width="100" Height="100" - Source="../../images/app.png" /> + Source="/Images/app.png" /> @@ -86,17 +86,13 @@ TextWrapping="WrapWithOverflow" /> + IsChecked="{Binding AutoStartup}" /> + IsChecked="{Binding HideOnStartup}" /> diff --git a/Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml.cs b/Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml.cs new file mode 100644 index 000000000..81cb4a91d --- /dev/null +++ b/Flow.Launcher/Views/WelcomePages/WelcomePage5View.axaml.cs @@ -0,0 +1,18 @@ +using Avalonia.Controls; +using Avalonia.Interactivity; +using Flow.Launcher.Infrastructure; +using Flow.Launcher.Infrastructure.UserSettings; +using Microsoft.Win32; +using PropertyChanged; + +namespace Flow.Launcher.Views.WelcomePages +{ + [DoNotNotify] + public partial class WelcomePage5View : UserControl + { + public WelcomePage5View() + { + InitializeComponent(); + } + } +} diff --git a/Flow.Launcher/WelcomePages/WelcomePage5.axaml.cs b/Flow.Launcher/WelcomePages/WelcomePage5.axaml.cs deleted file mode 100644 index fbf7b0ef3..000000000 --- a/Flow.Launcher/WelcomePages/WelcomePage5.axaml.cs +++ /dev/null @@ -1,56 +0,0 @@ -using Avalonia.Controls; -using Avalonia.Interactivity; -using Flow.Launcher.Infrastructure; -using Flow.Launcher.Infrastructure.UserSettings; -using Microsoft.Win32; -using PropertyChanged; - -namespace Flow.Launcher.WelcomePages -{ - [DoNotNotify] - public partial class WelcomePage5 : UserControl - { - private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"; - public Settings Settings { get; set; } - public bool HideOnStartup { get; set; } - - public WelcomePage5() - { - InitializeComponent(); - } - - private void OnAutoStartupChecked(object sender, RoutedEventArgs e) - { - SetStartup(); - } - - private void OnAutoStartupUncheck(object sender, RoutedEventArgs e) - { - RemoveStartup(); - } - - private void RemoveStartup() - { - using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true); - key?.DeleteValue(Constant.FlowLauncher, false); - Settings.StartFlowLauncherOnSystemStartup = false; - } - - private void SetStartup() - { - using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true); - key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath); - Settings.StartFlowLauncherOnSystemStartup = true; - } - - private void OnHideOnStartupChecked(object sender, RoutedEventArgs e) - { - Settings.HideOnStartup = true; - } - - private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e) - { - Settings.HideOnStartup = false; - } - } -} diff --git a/Flow.Launcher/WelcomeWindow.axaml.cs b/Flow.Launcher/WelcomeWindow.axaml.cs index ed6a28b34..78e0992d4 100644 --- a/Flow.Launcher/WelcomeWindow.axaml.cs +++ b/Flow.Launcher/WelcomeWindow.axaml.cs @@ -17,18 +17,7 @@ namespace Flow.Launcher DataContext = new ViewModel.WelcomeWindowViewModel(settings); InitializeComponent(); - BackButton.IsEnabled = false; this.settings = settings; } - - private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo() - { - Effect = SlideNavigationTransitionEffect.FromRight - }; - - private NavigationTransitionInfo _backTransitionInfo = new SlideNavigationTransitionInfo() - { - Effect = SlideNavigationTransitionEffect.FromLeft - }; } }