diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 54c567c88..a6f45257a 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -244,7 +244,7 @@ namespace Flow.Launcher } private void OpenWelcomeWindow() { - Flow.Launcher.WelcomeWindow WelcomeWindow = new WelcomeWindow(_settings); + var WelcomeWindow = new WelcomeWindow(_settings); WelcomeWindow.Show(); } private void ToggleGameMode() diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs index 84703d9be..98fb47288 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs @@ -1,39 +1,15 @@ 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.IO; -using System.Windows.Media.Imaging; using System.Windows.Navigation; -using System.Windows.Shapes; using Flow.Launcher.Infrastructure.UserSettings; -using System.Windows.Interop; -using Microsoft.Win32; -using Flow.Launcher.Infrastructure; -using Flow.Launcher.ViewModel; using Flow.Launcher.Core.Resource; -using ModernWpf.Navigation; -using Page = ModernWpf.Controls.Page; namespace Flow.Launcher.Resources.Pages { - /// - /// WelcomePage1.xaml에 대한 상호 작용 논리 - /// public partial class WelcomePage1 { - private bool initialize = false; - protected override void OnNavigatedTo(NavigationEventArgs e) { - if (e.ExtraData is Settings settings) Settings = settings; else diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs index f7ec0f270..5fad71b74 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs @@ -5,9 +5,6 @@ using System.Windows.Navigation; namespace Flow.Launcher.Resources.Pages { - /// - /// WelcomePage2.xaml에 대한 상호 작용 논리 - /// public partial class WelcomePage2 { private Settings Settings { get; set; } diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs index 8c2b188ef..9051e7c27 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs @@ -1,23 +1,9 @@ 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 Flow.Launcher.Core.Resource; -using System.Windows.Documents; -using System.Windows.Input; -using System.Windows.Media; -using System.Windows.Media.Imaging; using System.Windows.Navigation; -using System.Windows.Shapes; using Flow.Launcher.Infrastructure.UserSettings; namespace Flow.Launcher.Resources.Pages { - public partial class WelcomePage3 { protected override void OnNavigatedTo(NavigationEventArgs e) diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs index 1c701b200..11bbcd6ed 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs @@ -1,24 +1,9 @@ using Flow.Launcher.Infrastructure.UserSettings; 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.Navigation; -using System.Windows.Shapes; namespace Flow.Launcher.Resources.Pages { - /// - /// WelcomePage4.xaml에 대한 상호 작용 논리 - /// public partial class WelcomePage4 { protected override void OnNavigatedTo(NavigationEventArgs e) diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs index 5d432bc16..abb805303 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs @@ -1,23 +1,9 @@ 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.IO; -using System.Windows.Media.Imaging; using System.Windows.Navigation; -using System.Windows.Shapes; using Flow.Launcher.Infrastructure.UserSettings; -using System.Windows.Interop; using Microsoft.Win32; using Flow.Launcher.Infrastructure; -using Flow.Launcher.ViewModel; namespace Flow.Launcher.Resources.Pages { @@ -39,7 +25,6 @@ namespace Flow.Launcher.Resources.Pages private void OnAutoStartupChecked(object sender, RoutedEventArgs e) { SetStartup(); - } private void OnAutoStartupUncheck(object sender, RoutedEventArgs e) { @@ -62,7 +47,6 @@ namespace Flow.Launcher.Resources.Pages private void OnHideOnStartupChecked(object sender, RoutedEventArgs e) { Settings.HideOnStartup = true; - } private void OnHideOnStartupUnchecked(object sender, RoutedEventArgs e) { diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs index 4b052e2bd..11189b157 100644 --- a/Flow.Launcher/SettingWindow.xaml.cs +++ b/Flow.Launcher/SettingWindow.xaml.cs @@ -319,7 +319,6 @@ namespace Flow.Launcher _ => ThemeManager.Current.ApplicationTheme }; - /* Custom TitleBar */ private void OnMinimizeButtonClick(object sender, RoutedEventArgs e) diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs index f62f65531..b41bfa23b 100644 --- a/Flow.Launcher/WelcomeWindow.xaml.cs +++ b/Flow.Launcher/WelcomeWindow.xaml.cs @@ -1,17 +1,5 @@ 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.Animation; -using System.Windows.Media.Imaging; -using System.Windows.Shapes; using Flow.Launcher.Infrastructure.UserSettings; using Flow.Launcher.Resources.Pages; using ModernWpf.Media.Animation; @@ -38,7 +26,7 @@ namespace Flow.Launcher { Effect = SlideNavigationTransitionEffect.FromLeft }; - Storyboard sb = new Storyboard(); + private int pageNum = 1; private int MaxPage = 5; public string PageDisplay => $"{pageNum}/5";