diff --git a/Flow.Launcher/PriorityChangeWindow.xaml b/Flow.Launcher/PriorityChangeWindow.xaml index d8fda81e3..408f8a3cd 100644 --- a/Flow.Launcher/PriorityChangeWindow.xaml +++ b/Flow.Launcher/PriorityChangeWindow.xaml @@ -105,14 +105,12 @@ diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml index 3d0f2761b..b31cd7894 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml @@ -1,22 +1,132 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs index 481f6879f..045d363b3 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml.cs @@ -42,6 +42,11 @@ namespace Flow.Launcher.Plugin.Program } } + private void BtnCancel_OnClick(object sender, RoutedEventArgs e) + { + Close(); + } + private void ButtonAdd_OnClick(object sender, RoutedEventArgs e) { string s = Directory.Text; diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml index 1ea8ecb4b..78dc2e979 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml @@ -19,12 +19,12 @@ When enabled, Flow will load programs from the registry Hide Apps path For executable files such as UWP or lnk, hide the file path from being visible - Enable Program Description + Search in Program Description Disabling this will also stop Flow from searching via the program desciption Suffixes Max Depth - Directory: + Directory Browse File Suffixes: Maximum Search Depth (-1 is unlimited): @@ -33,8 +33,7 @@ Are you sure you want to delete the selected program sources? OK - Flow Launcher will only index files that end with the following suffixes: - (Each suffix should split by ';' ) + Flow Launcher will only index files that end with the following suffixes. (Each suffix should split by ';' ) Successfully updated file suffixes File suffixes can't be empty diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml index 9f0053426..5af43867b 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml @@ -1,19 +1,101 @@ - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs index 6b1f072f1..2a10928e6 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/ProgramSuffixes.xaml.cs @@ -18,7 +18,10 @@ namespace Flow.Launcher.Plugin.Program _settings = settings; tbSuffixes.Text = string.Join(Settings.SuffixSeperator.ToString(), _settings.ProgramSuffixes); } - + private void BtnCancel_OnClick(object sender, RoutedEventArgs e) + { + Close(); + } private void ButtonBase_OnClick(object sender, RoutedEventArgs e) { var suffixes = tbSuffixes.Text.Split(Settings.SuffixSeperator, StringSplitOptions.RemoveEmptyEntries); diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 4979bf66a..95074c850 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -5,12 +5,12 @@ xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:program="clr-namespace:Flow.Launcher.Plugin.Program" - Height="550" + Height="520" DataContext="{Binding RelativeSource={RelativeSource Self}}" mc:Ignorable="d"> - + @@ -19,38 +19,49 @@ HorizontalAlignment="Stretch" Orientation="Vertical"> - - - - - - - - + + + + + + + + + + + + + + + - - - -