diff --git a/Flow.Launcher/Images/page_img01.png b/Flow.Launcher/Images/page_img01.png
new file mode 100644
index 000000000..fdc411898
Binary files /dev/null and b/Flow.Launcher/Images/page_img01.png differ
diff --git a/Flow.Launcher/Images/page_img02.png b/Flow.Launcher/Images/page_img02.png
new file mode 100644
index 000000000..c2a6cb51e
Binary files /dev/null and b/Flow.Launcher/Images/page_img02.png differ
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
index 283140fb7..adb6e1bff 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -6,14 +6,93 @@
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="WelcomePage1"
- d:DesignHeight="450"
- d:DesignWidth="800"
- Background="#cecece"
mc:Ignorable="d">
-
+
+
+
- Page1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Flow Launcher
+
+
+
+
+
+
+ Welcome to Flow Launcher
+
+ Hello, It's your first time to run a Flow Launcher!
+
+
+ Before starting, proceed with a simple setting. Surely, You can skip. Please choose the language you use.
+
+
+
+
+
+
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
index 9962d56ab..c1bb9d44f 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -9,9 +9,16 @@ 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
{
@@ -22,6 +29,7 @@ namespace Flow.Launcher.Resources.Pages
{
public WelcomePage1()
{
+
InitializeComponent();
}
}
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index 4c0d5ded4..c3748a252 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -2,16 +2,128 @@
x:Class="Flow.Launcher.Resources.Pages.WelcomePage2"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:converters="clr-namespace:Flow.Launcher.Converters"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+ xmlns:flowlauncher="clr-namespace:Flow.Launcher"
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage2"
+ d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"
mc:Ignorable="d">
-
+
+
+
+
- Page2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Search and run everything in everywhere
+
+ To start Flow, start with the hotkey below. To change, select input and press the wanted hotkey in keyboard.
+
+
+
+
+
+
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index 6d0659e32..f75628d04 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -9,6 +9,70 @@
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Hotkeys and Commands
+
+ You can search the web or run various functions. Certain functions start with the expression action keyword, and if necessary, they can be used without action keywords. Type "youtube bts" in querybox.
+
+
+
+
+
+
+
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
index 40d14ea37..f9408e138 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -1,14 +1,57 @@
-
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Action Keyword
+
+ You can search the web or run various functions. Certain functions start with the expression action keyword, and if necessary, they can be used without action keywords. Type "youtube bts" in querybox.
+
+
+
+
+
+
+
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
index 9e0a26923..f1ec73805 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -1,14 +1,109 @@
-
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Let's Start Flow Launcher
+
+ Finished. Enjoy Flow Launcher. Don't forget the hotkey to start :)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
index 341249f48..062fa06ef 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -9,9 +9,15 @@ 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
{
@@ -20,9 +26,33 @@ namespace Flow.Launcher.Resources.Pages
///
public partial class WelcomePage5 : Page
{
+ private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run";
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);
+ }
+ public static void SetStartup()
+ {
+ using var key = Registry.CurrentUser.OpenSubKey(StartupPath, true);
+ key?.SetValue(Constant.FlowLauncher, Constant.ExecutablePath);
+ }
+
+
}
}
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 6430da1d4..f61eeb29e 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -91,28 +91,64 @@
Background="{DynamicResource Color00B}"
BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
BorderThickness="0,1,0,0">
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+ FontSize="14" />
+
+
+
+
+
+
+
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index daa4abd0a..b2a725e76 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -9,6 +9,7 @@ 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 ModernWpf.Media.Animation;
@@ -17,38 +18,16 @@ using WelcomePages = Flow.Launcher.Resources.Pages;
namespace Flow.Launcher
{
- ///
- /// WelcomeWindow.xaml에 대한 상호 작용 논리
- ///
public partial class WelcomeWindow : Window
{
public WelcomeWindow()
{
InitializeComponent();
- //ContentFrame.Navigate(typeof(SamplePages.SamplePage1));
ContentFrame.Navigate(typeof(WelcomePages.WelcomePage1));
BackButton.IsEnabled = false;
}
private int page;
private int MaxPage = 5;
-
- /*public int Page
- {
- get { return this.page; }
- set
- {
- this.page = value;
- if (this.page == 1)
- {
- this.BackButton.IsEnabled = false;
- }
- else
- {
- this.BackButton.IsEnabled = true;
- };
- }
- }
- */
private void ButtonDisabler()
{
@@ -69,9 +48,11 @@ namespace Flow.Launcher
}
}
private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo() { Effect = SlideNavigationTransitionEffect.FromRight };
+ Storyboard sb = new Storyboard();
private static Type PageSelector(int a)
{
+
switch (a)
{
case 0: