From 08a482a6b4eb4bd34eebdaf42a476e2bc0578324 Mon Sep 17 00:00:00 2001 From: DB p Date: Mon, 31 Oct 2022 14:29:56 +0900 Subject: [PATCH 01/12] Check 'dev' version --- Flow.Launcher.Infrastructure/Constant.cs | 3 ++- Flow.Launcher/ViewModel/SettingWindowViewModel.cs | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher.Infrastructure/Constant.cs b/Flow.Launcher.Infrastructure/Constant.cs index 57b39e46e47..5ace463768d 100644 --- a/Flow.Launcher.Infrastructure/Constant.cs +++ b/Flow.Launcher.Infrastructure/Constant.cs @@ -1,4 +1,4 @@ -using System.Diagnostics; +using System.Diagnostics; using System.IO; using System.Reflection; @@ -21,6 +21,7 @@ public static class Constant public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); public const string Issue = "https://github.com/Flow-Launcher/Flow.Launcher/issues/new"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; + public static readonly string Dev = "Dev"; public const string Documentation = "https://flowlauncher.com/docs/#/usage-tips"; public static readonly int ThumbnailSize = 64; diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs index 192fee0f6e1..d7b1515f813 100644 --- a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs +++ b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs @@ -647,7 +647,20 @@ public FamilyTypeface SelectedResultFontFaces public string Documentation => Constant.Documentation; public string Docs => Constant.Docs; public string Github => Constant.GitHub; - public static string Version => Constant.Version; + public string Version + { + get + { + if (Constant.Version == "1.0.0") + { + return Constant.Dev; + } + else + { + return Constant.Version; + } + } + } public string ActivatedTimes => string.Format(_translater.GetTranslation("about_activate_times"), Settings.ActivateTimes); public string CheckLogFolder From 5b0860515d8ee89f09c4fa6d2f31ccc4b2b2a687 Mon Sep 17 00:00:00 2001 From: DB p Date: Thu, 17 Nov 2022 15:27:14 +0900 Subject: [PATCH 02/12] - Change Sidebar Width to Responsoive - Fix Narrow Things (in hotkey, themes page) --- Flow.Launcher/SettingWindow.xaml | 185 ++++++++++++++++--------------- 1 file changed, 98 insertions(+), 87 deletions(-) diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index e50d5be3c2f..f9e13661bd4 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -15,7 +15,7 @@ Title="{DynamicResource flowlauncher_settings}" Width="{Binding SettingWindowWidth, Mode=TwoWay}" Height="{Binding SettingWindowHeight, Mode=TwoWay}" - MinWidth="900" + MinWidth="940" MinHeight="600" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}" Closed="OnClosed" @@ -98,6 +98,7 @@ - - - - - - - + + + - @@ -306,16 +327,14 @@ - - - + + + - @@ -323,16 +342,14 @@ - - - + + + - diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 6a65a38f2ae..7095ed24fea 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.ComponentModel; using System.Threading.Tasks; using System.Windows; @@ -27,6 +27,9 @@ using System.IO; using System.Windows.Threading; using System.Windows.Data; +using ModernWpf.Controls; +using System.Drawing; +using System.Windows.Forms.Design.Behavior; namespace Flow.Launcher { @@ -224,11 +227,12 @@ private void InitializePosition() private void UpdateNotifyIconText() { var menu = contextMenu; - ((MenuItem)menu.Items[1]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")"; - ((MenuItem)menu.Items[2]).Header = InternationalizationManager.Instance.GetTranslation("GameMode"); - ((MenuItem)menu.Items[3]).Header = InternationalizationManager.Instance.GetTranslation("PositionReset"); - ((MenuItem)menu.Items[4]).Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings"); - ((MenuItem)menu.Items[5]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"); + ((MenuItem)menu.Items[0]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")"; + ((MenuItem)menu.Items[1]).Header = InternationalizationManager.Instance.GetTranslation("GameMode"); + ((MenuItem)menu.Items[2]).Header = InternationalizationManager.Instance.GetTranslation("PositionReset"); + ((MenuItem)menu.Items[3]).Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings"); + ((MenuItem)menu.Items[4]).Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"); + } private void InitializeNotifyIcon() @@ -240,31 +244,33 @@ private void InitializeNotifyIcon() Visible = !_settings.HideNotifyIcon }; contextMenu = new ContextMenu(); - - var header = new MenuItem - { - Header = "Flow Launcher", - IsEnabled = false - }; + var openIcon = new FontIcon { Glyph = "\ue71e" }; var open = new MenuItem { - Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" +_settings.Hotkey + ")" + Header = InternationalizationManager.Instance.GetTranslation("iconTrayOpen") + " (" + _settings.Hotkey + ")", + Icon = openIcon }; + var gamemodeIcon = new FontIcon { Glyph = "\ue7fc" }; var gamemode = new MenuItem { - Header = InternationalizationManager.Instance.GetTranslation("GameMode") + Header = InternationalizationManager.Instance.GetTranslation("GameMode"), + Icon = gamemodeIcon }; var positionreset = new MenuItem { Header = InternationalizationManager.Instance.GetTranslation("PositionReset") }; + var settingsIcon = new FontIcon { Glyph = "\ue713" }; var settings = new MenuItem { - Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings") + Header = InternationalizationManager.Instance.GetTranslation("iconTraySettings"), + Icon = settingsIcon }; + var exitIcon = new FontIcon { Glyph = "\ue7e8" }; var exit = new MenuItem { - Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit") + Header = InternationalizationManager.Instance.GetTranslation("iconTrayExit"), + Icon = exitIcon }; open.Click += (o, e) => _viewModel.ToggleFlowLauncher(); @@ -272,7 +278,6 @@ private void InitializeNotifyIcon() positionreset.Click += (o, e) => PositionReset(); settings.Click += (o, e) => App.API.OpenSettingDialog(); exit.Click += (o, e) => Close(); - contextMenu.Items.Add(header); contextMenu.Items.Add(open); gamemode.ToolTip = InternationalizationManager.Instance.GetTranslation("GameModeToolTip"); positionreset.ToolTip = InternationalizationManager.Instance.GetTranslation("PositionResetToolTip"); diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 6e82940313a..70fe02c9575 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -2727,73 +2727,491 @@ - + + - + + + + + diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 50f63edfe75..636d2d4cd93 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -2361,7 +2361,7 @@ TextAlignment="left" /> - + @@ -2814,54 +2814,54 @@ Style="{DynamicResource PageTitle}" Text="{DynamicResource about}" TextAlignment="left" /> - - - - - - - - - + + - + + -  +  + - From 9be732279f5fdee33afc9a8740ef48955a655feb Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 18 Nov 2022 03:13:44 +0900 Subject: [PATCH 06/12] Add icons / Change "Flow Launcher Settings" to "Settings" in context menu --- Flow.Launcher/Languages/en.xaml | 2 +- Flow.Launcher/MainWindow.xaml | 12 ++++++++++-- Flow.Launcher/MainWindow.xaml.cs | 4 +++- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index 9d21a5d5c45..b9f65a58ca1 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -27,7 +27,7 @@ Reset search window position - Flow Launcher Settings + Settings General Portable Mode Store all settings and user data in one folder (Useful when used with removable drives or cloud services). diff --git a/Flow.Launcher/MainWindow.xaml b/Flow.Launcher/MainWindow.xaml index db798087f04..3bf855da7b1 100644 --- a/Flow.Launcher/MainWindow.xaml +++ b/Flow.Launcher/MainWindow.xaml @@ -229,8 +229,16 @@ Margin="0" Padding="0,4,0,4" Background="{DynamicResource ContextSeparator}" /> - - + + + + + + + + + + diff --git a/Flow.Launcher/MainWindow.xaml.cs b/Flow.Launcher/MainWindow.xaml.cs index 7095ed24fea..747509d7776 100644 --- a/Flow.Launcher/MainWindow.xaml.cs +++ b/Flow.Launcher/MainWindow.xaml.cs @@ -256,9 +256,11 @@ private void InitializeNotifyIcon() Header = InternationalizationManager.Instance.GetTranslation("GameMode"), Icon = gamemodeIcon }; + var positionresetIcon = new FontIcon { Glyph = "\ue73f" }; var positionreset = new MenuItem { - Header = InternationalizationManager.Instance.GetTranslation("PositionReset") + Header = InternationalizationManager.Instance.GetTranslation("PositionReset"), + Icon = positionresetIcon }; var settingsIcon = new FontIcon { Glyph = "\ue713" }; var settings = new MenuItem From 087df5143ef57f564bef3f783c39e2c05cf6b827 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 18 Nov 2022 13:26:29 +0900 Subject: [PATCH 07/12] Changed ActionKeywordWindow to Responsive (Explorer Plugin) --- .../Views/ActionKeywordSetting.xaml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml index 195fc7df998..8397145cf01 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ActionKeywordSetting.xaml @@ -6,12 +6,13 @@ xmlns:local="clr-namespace:Flow.Launcher.Plugin.Explorer.Views" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="{DynamicResource plugin_explorer_manageactionkeywords_header}" - Width="400" - SizeToContent="Height" + Width="Auto" + Height="255" Background="{DynamicResource PopuBGColor}" DataContext="{Binding RelativeSource={RelativeSource Self}}" Foreground="{DynamicResource PopupTextColor}" ResizeMode="NoResize" + SizeToContent="Width" WindowStartupLocation="CenterScreen" mc:Ignorable="d"> @@ -68,7 +69,7 @@ - Date: Fri, 18 Nov 2022 13:57:09 +0900 Subject: [PATCH 08/12] Changed Icons(about) label to string --- Flow.Launcher/Languages/en.xaml | 1 + Flow.Launcher/SettingWindow.xaml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml index b9f65a58ca1..e3312d7880e 100644 --- a/Flow.Launcher/Languages/en.xaml +++ b/Flow.Launcher/Languages/en.xaml @@ -188,6 +188,7 @@ Github Docs Version + Icons You have activated Flow Launcher {0} times Check for Updates New version {0} is available, would you like to restart Flow Launcher to use the update? diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 636d2d4cd93..097da029f56 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -2922,7 +2922,7 @@ Style="{DynamicResource SettingGroupBox}"> - + Date: Fri, 18 Nov 2022 14:43:28 +0900 Subject: [PATCH 09/12] Adjust Context Menu Hover/Click Colors --- Flow.Launcher/Resources/CustomControlTemplate.xaml | 4 ++-- Flow.Launcher/Resources/Dark.xaml | 3 ++- Flow.Launcher/Resources/Light.xaml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 70fe02c9575..50c7cf612b6 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -2956,13 +2956,13 @@ - + - + diff --git a/Flow.Launcher/Resources/Dark.xaml b/Flow.Launcher/Resources/Dark.xaml index 674e04debc2..a5eec29ab49 100644 --- a/Flow.Launcher/Resources/Dark.xaml +++ b/Flow.Launcher/Resources/Dark.xaml @@ -65,7 +65,8 @@ - + + diff --git a/Flow.Launcher/Resources/Light.xaml b/Flow.Launcher/Resources/Light.xaml index 8b04196dda0..a78b14d65ee 100644 --- a/Flow.Launcher/Resources/Light.xaml +++ b/Flow.Launcher/Resources/Light.xaml @@ -58,7 +58,8 @@ - + + From 65920a50a5330148917a697fc96d12cde4fe3e66 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 18 Nov 2022 15:28:16 +0900 Subject: [PATCH 10/12] Fix ProgramSetting's Button Area --- .../Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 227c23ebc62..74c29576ee6 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -11,7 +11,7 @@ - + @@ -145,8 +145,8 @@ DragEnter="programSourceView_DragEnter" Drop="programSourceView_Drop" GridViewColumnHeader.Click="GridViewColumnHeaderClickedHandler" - PreviewMouseRightButtonUp="ProgramSourceView_PreviewMouseRightButtonUp" MouseDoubleClick="programSourceView_MouseDoubleClick" + PreviewMouseRightButtonUp="ProgramSourceView_PreviewMouseRightButtonUp" SelectionChanged="programSourceView_SelectionChanged" SelectionMode="Extended"> From c57a2be5f0edee85fbb888767326c517dbea384f Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 18 Nov 2022 16:07:43 +0900 Subject: [PATCH 11/12] Adjust Button Template --- Flow.Launcher/Resources/CustomControlTemplate.xaml | 3 ++- Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Flow.Launcher/Resources/CustomControlTemplate.xaml b/Flow.Launcher/Resources/CustomControlTemplate.xaml index 50c7cf612b6..07897361c9e 100644 --- a/Flow.Launcher/Resources/CustomControlTemplate.xaml +++ b/Flow.Launcher/Resources/CustomControlTemplate.xaml @@ -1407,7 +1407,8 @@ Padding="{TemplateBinding Padding}" BorderBrush="{DynamicResource ButtonInsideBorder}" BorderThickness="{DynamicResource CustomButtonInsideBorderThickness}" - CornerRadius="4"> + CornerRadius="4" + SnapsToDevicePixels="True"> - + From 16abd9d4f0443b04b438cac5dce37c0ae6e9a435 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 18 Nov 2022 16:22:19 +0900 Subject: [PATCH 12/12] Fix Button Moving in programSetting panel --- Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 387ed905e46..3f9e7196c21 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -91,6 +91,7 @@ BorderThickness="1" />