diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml index 020ce7692..23b741575 100644 --- a/Flow.Launcher/SettingWindow.xaml +++ b/Flow.Launcher/SettingWindow.xaml @@ -13,9 +13,11 @@ mc:Ignorable="d" Icon="Images\app.ico" Title="{DynamicResource flowlauncher_settings}" - ResizeMode="NoResize" + ResizeMode="CanResizeWithGrip" WindowStartupLocation="CenterScreen" - Height="600" Width="800" + Height="600" Width="900" + MinWidth="850" + MinHeight="500" Closed="OnClosed" d:DataContext="{d:DesignInstance vm:SettingWindowViewModel}"> @@ -141,60 +143,58 @@ + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + Width="48" Height="48" + HorizontalAlignment="Left" VerticalAlignment="Top" + Grid.RowSpan="2"/> + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json index 2bb40c644..7c6efaae4 100644 --- a/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json @@ -2,7 +2,7 @@ "ID":"b64d0a79-329a-48b0-b53f-d658318a1bf6", "ActionKeyword":"kill", "Name":"Process Killer", - "Description":"kill running processes from Flow", + "Description":"Kill running processes from Flow", "Author":"Flow-Launcher", "Version":"1.2.2", "Language":"csharp", diff --git a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json index b38db70ed..592dbdbbd 100644 --- a/Plugins/Flow.Launcher.Plugin.Shell/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Shell/plugin.json @@ -2,7 +2,7 @@ "ID": "D409510CD0D2481F853690A07E6DC426", "ActionKeyword": ">", "Name": "Shell", - "Description": "Provide executing commands from Flow Launcher. Commands should start with >", + "Description": "Provide executing commands from Flow Launcher", "Author": "qianlifeng", "Version": "1.2.0", "Language": "csharp", diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml index ec05b621d..4f841c07f 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Sys/Languages/en.xaml @@ -18,6 +18,8 @@ Hibernate computer Save all Flow Launcher settings Refreshes plugin data with new content + Open Flow Launcher's log location + Check for new Flow Launcher update Success diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs index 8828f3cef..380782650 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs +++ b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs @@ -261,7 +261,7 @@ namespace Flow.Launcher.Plugin.Sys new Result { Title = "Check For Update", - SubTitle = "Check for new Flow Launcher update", + SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_check_for_update"), IcoPath = "Images\\checkupdate.png", Action = c => { @@ -273,7 +273,7 @@ namespace Flow.Launcher.Plugin.Sys new Result { Title = "Open Log Location", - SubTitle = "Open Log Position", + SubTitle = context.API.GetTranslation("flowlauncher_plugin_sys_open_log_location"), IcoPath = "Images\\app.png", Action = c => { diff --git a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json index 844bcfb53..40cab074e 100644 --- a/Plugins/Flow.Launcher.Plugin.Sys/plugin.json +++ b/Plugins/Flow.Launcher.Plugin.Sys/plugin.json @@ -2,9 +2,9 @@ "ID": "CEA08895D2544B019B2E9C5009600DF4", "ActionKeyword": "*", "Name": "System Commands", - "Description": "Provide System related commands. e.g. shutdown,lock,setting etc.", + "Description": "Provide System related commands. e.g. shutdown,lock, setting etc.", "Author": "qianlifeng", - "Version": "1.2.2", + "Version": "1.2.3", "Language": "csharp", "Website": "https://github.com/Flow-Launcher/Flow.Launcher", "ExecuteFileName": "Flow.Launcher.Plugin.Sys.dll",