From 8498883cd9e6142c7557c43a084d1870b345d3a7 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 10:15:14 +0900 Subject: [PATCH 1/7] - Add BoolToTranslation Logic by Style in Program - Add Responsive Width for Removing horizon scrollbar --- .../Languages/en.xaml | 2 ++ .../Views/ProgramSetting.xaml | 25 +++++++++++++------ .../Views/ProgramSetting.xaml.cs | 16 ++++++++++++ 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml index 700c37046d4..d932a39e686 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml @@ -12,6 +12,8 @@ Enable Enabled Disable + Enabled + Disabled Location All Programs File Type diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 3f9e7196c21..cedcc71c954 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -149,7 +149,8 @@ MouseDoubleClick="programSourceView_MouseDoubleClick" PreviewMouseRightButtonUp="ProgramSourceView_PreviewMouseRightButtonUp" SelectionChanged="programSourceView_SelectionChanged" - SelectionMode="Extended"> + SelectionMode="Extended" + SizeChanged="ListView_SizeChanged"> @@ -159,20 +160,28 @@ - + - + + + + + - + - + diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs index b8c2bca2245..b14979337a2 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml.cs @@ -9,6 +9,7 @@ using Flow.Launcher.Plugin.Program.Programs; using System.ComponentModel; using System.Windows.Data; +using System; namespace Flow.Launcher.Plugin.Program.Views { @@ -383,5 +384,20 @@ private bool IsAllItemsUserAdded(List items) { return items.All(x => _settings.ProgramSources.Any(y => y.UniqueIdentifier == x.UniqueIdentifier)); } + + private void ListView_SizeChanged(object sender, SizeChangedEventArgs e) + { + ListView listView = sender as ListView; + GridView gView = listView.View as GridView; + + var workingWidth = listView.ActualWidth - SystemParameters.VerticalScrollBarWidth; // take into account vertical scrollbar + var col1 = 0.25; + var col2 = 0.15; + var col3 = 0.60; + + gView.Columns[0].Width = workingWidth * col1; + gView.Columns[1].Width = workingWidth * col2; + gView.Columns[2].Width = workingWidth * col3; + } } } From df27a21df74f05ad499235e8c5a3ef3a2f4b61e4 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 10:19:08 +0900 Subject: [PATCH 2/7] Fixed TextboxWidth --- Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml index b1a8744fda1..9ee97e3e953 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/AddProgramSource.xaml @@ -101,7 +101,7 @@ DockPanel.Dock="Right" /> From 2dc508aa75dacfc283732379428018c39745aaea Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 10:33:23 +0900 Subject: [PATCH 3/7] Bool To Translation by style in websearch plugin --- .../Views/ProgramSetting.xaml | 2 +- .../Languages/en.xaml | 4 +++- .../SettingsControl.xaml | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index cedcc71c954..49a22532161 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -163,7 +163,7 @@ - + + + From 056dcb38884d407442f7cd0e9dc8f8ec406f20e5 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 10:48:56 +0900 Subject: [PATCH 4/7] Change Header 'Enabled' to 'Status' --- Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml | 1 + Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml | 2 +- Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml index d932a39e686..4a43a5f06de 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml @@ -12,6 +12,7 @@ Enable Enabled Disable + Status Enabled Disabled Location diff --git a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml index 49a22532161..ec1f2b5e7f9 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml @@ -160,7 +160,7 @@ - + diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml index cfc8af882ce..0e2b85b9319 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/Languages/en.xaml @@ -34,7 +34,7 @@ Title - Enabled + Status Select Icon Icon Cancel From fead578b410b971d0f6514298be2a71f532b1654 Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 14:45:25 +0900 Subject: [PATCH 5/7] Change 'Search Description' Tooltip --- Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml index 4a43a5f06de..8d642b60053 100644 --- a/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml @@ -31,7 +31,7 @@ Hide app path For executable files such as UWP or lnk, hide the file path from being visible Search in Program Description - Disabling this will also stop Flow from searching via the program desciption + Flow will search program's description Suffixes Max Depth From 12fae66b920902c619836902d8d565d6734395be Mon Sep 17 00:00:00 2001 From: DB p Date: Fri, 9 Dec 2022 15:13:01 +0900 Subject: [PATCH 6/7] Adjust WebSearch Plugin Setting Panel Layout --- .../SettingsControl.xaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml index dc90eae53b9..b9ca47e4fa8 100644 --- a/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml +++ b/Plugins/Flow.Launcher.Plugin.WebSearch/SettingsControl.xaml @@ -35,7 +35,7 @@ - + @@ -44,7 +44,7 @@