merge pull request #60

- update ActionKeyword window - settings: UI improvements in plugin/hotkey tabs
Flow-Launcher · Jun 23, 2020 · a3374f2 · a3374f2
2 parents 50e0ca3 + d6b4b40
commit a3374f2
Show file tree

Hide file tree

Showing 25 changed files with 150 additions and 127 deletions.
diff --git a/Flow.Launcher/ActionKeywords.xaml b/Flow.Launcher/ActionKeywords.xaml
@@ -1,43 +1,41 @@
-<Window x:Class="Flow.Launcher.ActionKeywords"
+<Window x:Class="Flow.Launcher.ActionKeywords"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="ActionKeywords"
         Icon="Images\app.png"
         ResizeMode="NoResize"
         Loaded="ActionKeyword_OnLoaded"
         WindowStartupLocation="CenterScreen"
-        Height="200" Width="600">
+        Height="250" Width="500">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
-            <RowDefinition />
+            <RowDefinition Height="60"/>
             <RowDefinition />
             <RowDefinition />
         </Grid.RowDefinitions>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="170" />
+            <ColumnDefinition Width="150" />
             <ColumnDefinition />
         </Grid.ColumnDefinitions>
-        <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}" />
-        <TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1"
-                   VerticalAlignment="Center" HorizontalAlignment="Left">
-            Old ActionKeywords:
-        </TextBlock>
-
-        <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
-                   HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}" />
+        <TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
+        <TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
+                   VerticalAlignment="Center" HorizontalAlignment="Left" />
+
+        <TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
+                   HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
         <StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
-            <TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
+            <TextBox x:Name="tbAction" Margin="170 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
         </StackPanel>
 
-        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray"
+        <TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
                    Text="{DynamicResource actionkeyword_tips}" />
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
                     Content="{DynamicResource cancel}" />
-            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="25" Click="btnDone_OnClick">
+            <Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>

diff --git a/Flow.Launcher/ActionKeywords.xaml.cs b/Flow.Launcher/ActionKeywords.xaml.cs
@@ -4,30 +4,33 @@
 using Flow.Launcher.Infrastructure.Exception;
 using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher
 {
     public partial class ActionKeywords : Window
     {
-        private PluginPair _plugin;
-        private Settings _settings;
-        private readonly Internationalization _translater = InternationalizationManager.Instance;
+        private readonly PluginPair plugin;
+        private Settings settings;
+        private readonly Internationalization translater = InternationalizationManager.Instance;
+        private readonly PluginViewModel pluginViewModel;
 
-        public ActionKeywords(string pluginId, Settings settings)
+        public ActionKeywords(string pluginId, Settings settings, PluginViewModel pluginViewModel)
         {
             InitializeComponent();
-            _plugin = PluginManager.GetPluginForId(pluginId);
-            _settings = settings;
-            if (_plugin == null)
+            plugin = PluginManager.GetPluginForId(pluginId);
+            this.settings = settings;
+            this.pluginViewModel = pluginViewModel;
+            if (plugin == null)
             {
-                MessageBox.Show(_translater.GetTranslation("cannotFindSpecifiedPlugin"));
+                MessageBox.Show(translater.GetTranslation("cannotFindSpecifiedPlugin"));
                 Close();
             }
         }
 
         private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
         {
-            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, _plugin.Metadata.ActionKeywords.ToArray());
+            tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, plugin.Metadata.ActionKeywords.ToArray());
             tbAction.Focus();
         }
 
@@ -38,19 +41,17 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
 
         private void btnDone_OnClick(object sender, RoutedEventArgs _)
         {
-            var oldActionKeyword = _plugin.Metadata.ActionKeywords[0];
+            var oldActionKeyword = plugin.Metadata.ActionKeywords[0];
             var newActionKeyword = tbAction.Text.Trim();
             newActionKeyword = newActionKeyword.Length > 0 ? newActionKeyword : "*";
-            if (!PluginManager.ActionKeywordRegistered(newActionKeyword))
+            if (!pluginViewModel.IsActionKeywordRegistered(newActionKeyword))
             {
-                var id = _plugin.Metadata.ID;
-                PluginManager.ReplaceActionKeyword(id, oldActionKeyword, newActionKeyword);
-                MessageBox.Show(_translater.GetTranslation("success"));
+                pluginViewModel.ChangeActionKeyword(newActionKeyword, oldActionKeyword);
                 Close();
             }
             else
             {
-                string msg = _translater.GetTranslation("newActionKeywordsHasBeenAssigned");
+                string msg = translater.GetTranslation("newActionKeywordsHasBeenAssigned");
                 MessageBox.Show(msg);
             }
         }

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml b/Flow.Launcher/CustomQueryHotkeySetting.xaml
@@ -1,11 +1,17 @@
-<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
+<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:flowlauncher="clr-namespace:Flow.Launcher"
         Icon="Images\app.png"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Title="Custom Plugin Hotkey" Height="200" Width="674.766">
+    <Window.InputBindings>
+        <KeyBinding Key="Escape" Command="Close"/>
+    </Window.InputBindings>
+    <Window.CommandBindings>
+        <CommandBinding Command="Close" Executed="cmdEsc_OnPress"/>
+    </Window.CommandBindings>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition />
@@ -18,7 +24,7 @@
         </Grid.ColumnDefinitions>
         <TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
-        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10" Grid.Column="1" />
+        <flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
 
         <TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
                    HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
@@ -29,9 +35,9 @@
         </StackPanel>
 
         <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
-            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
+            <Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
                     Content="{DynamicResource cancel}" />
-            <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="25" Click="btnAdd_OnClick">
+            <Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">
                 <TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
             </Button>
         </StackPanel>

diff --git a/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs b/Flow.Launcher/CustomQueryHotkeySetting.xaml.cs
@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
+using Flow.Launcher.Core.Resource;
+using Flow.Launcher.Infrastructure.Hotkey;
+using Flow.Launcher.Infrastructure.UserSettings;
+using NHotkey;
+using NHotkey.Wpf;
+using System;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows;
-using NHotkey;
-using NHotkey.Wpf;
-using Flow.Launcher.Core.Resource;
-using Flow.Launcher.Infrastructure.Hotkey;
-using Flow.Launcher.Infrastructure.UserSettings;
+using System.Windows.Input;
 
 namespace Flow.Launcher
 {
@@ -125,5 +125,10 @@ private void SetHotkey(HotkeyModel hotkey, EventHandler<HotkeyEventArgs> action)
                 MessageBox.Show(errorMsg);
             }
         }
+
+        private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
+        {
+            Close();
+        }
     }
 }
diff --git a/Flow.Launcher/Languages/da.xaml b/Flow.Launcher/Languages/da.xaml
@@ -36,8 +36,8 @@
     <system:String x:Key="actionKeywords">Nøgleord</system:String>
     <system:String x:Key="pluginDirectory">Plugin bibliotek</system:String>
     <system:String x:Key="author">Forfatter</system:String>
-    <system:String x:Key="plugin_init_time">Initaliseringstid: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Søgetid: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Initaliseringstid:</system:String>
+    <system:String x:Key="plugin_query_time">Søgetid:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>

diff --git a/Flow.Launcher/Languages/de.xaml b/Flow.Launcher/Languages/de.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -36,8 +36,8 @@
     <system:String x:Key="actionKeywords">Aktionsschlüsselwörter</system:String>
     <system:String x:Key="pluginDirectory">Pluginordner</system:String>
     <system:String x:Key="author">Autor</system:String>
-    <system:String x:Key="plugin_init_time">Initialisierungszeit: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Abfragezeit: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Initialisierungszeit:</system:String>
+    <system:String x:Key="plugin_query_time">Abfragezeit:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>

diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -40,11 +40,13 @@
     <system:String x:Key="plugin">Plugin</system:String>
     <system:String x:Key="browserMorePlugins">Find more plugins</system:String>
     <system:String x:Key="disable">Disable</system:String>
-    <system:String x:Key="actionKeywords">Action keywords</system:String>
+    <system:String x:Key="actionKeywords">Action keyword:</system:String>
+    <system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
+    <system:String x:Key="newActionKeyword">New action keyword:</system:String>
     <system:String x:Key="pluginDirectory">Plugin Directory</system:String>
     <system:String x:Key="author">Author</system:String>
-    <system:String x:Key="plugin_init_time">Init time: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Query time: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Init time:</system:String>
+    <system:String x:Key="plugin_query_time">Query time:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Theme</system:String>

diff --git a/Flow.Launcher/Languages/fr.xaml b/Flow.Launcher/Languages/fr.xaml
@@ -40,8 +40,8 @@
     <system:String x:Key="actionKeywords">Mot-clé d'action :</system:String>
     <system:String x:Key="pluginDirectory">Répertoire</system:String>
     <system:String x:Key="author">Auteur </system:String>
-    <system:String x:Key="plugin_init_time">Chargement : {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Utilisation : {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Chargement :</system:String>
+    <system:String x:Key="plugin_query_time">Utilisation :</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Thèmes</system:String>

diff --git a/Flow.Launcher/Languages/it.xaml b/Flow.Launcher/Languages/it.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -40,8 +40,8 @@
     <system:String x:Key="actionKeywords">Parole chiave</system:String>
     <system:String x:Key="pluginDirectory">Cartella Plugin</system:String>
     <system:String x:Key="author">Autore</system:String>
-    <system:String x:Key="plugin_init_time">Tempo di avvio: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Tempo ricerca: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Tempo di avvio:</system:String>
+    <system:String x:Key="plugin_query_time">Tempo ricerca:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>

diff --git a/Flow.Launcher/Languages/ja.xaml b/Flow.Launcher/Languages/ja.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -41,8 +41,8 @@
     <system:String x:Key="actionKeywords">キーワード</system:String>
     <system:String x:Key="pluginDirectory">プラグイン・ディレクトリ</system:String>
     <system:String x:Key="author">作者</system:String>
-    <system:String x:Key="plugin_init_time">初期化時間: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">クエリ時間: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">初期化時間:</system:String>
+    <system:String x:Key="plugin_query_time">クエリ時間:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">テーマ</system:String>

diff --git a/Flow.Launcher/Languages/ko.xaml b/Flow.Launcher/Languages/ko.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -40,8 +40,8 @@
     <system:String x:Key="actionKeywords">액션 키워드</system:String>
     <system:String x:Key="pluginDirectory">플러그인 디렉토리</system:String>
     <system:String x:Key="author">저자</system:String>
-    <system:String x:Key="plugin_init_time">초기화 시간: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">쿼리 시간: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">초기화 시간:</system:String>
+    <system:String x:Key="plugin_query_time">쿼리 시간:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">테마</system:String>

diff --git a/Flow.Launcher/Languages/nb-NO.xaml b/Flow.Launcher/Languages/nb-NO.xaml
@@ -40,8 +40,8 @@
     <system:String x:Key="actionKeywords">Handlingsnøkkelord</system:String>
     <system:String x:Key="pluginDirectory">Utvidelseskatalog</system:String>
     <system:String x:Key="author">Forfatter</system:String>
-    <system:String x:Key="plugin_init_time">Oppstartstid: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Spørringstid: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Oppstartstid:</system:String>
+    <system:String x:Key="plugin_query_time">Spørringstid:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>

diff --git a/Flow.Launcher/Languages/nl.xaml b/Flow.Launcher/Languages/nl.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -36,8 +36,8 @@
     <system:String x:Key="actionKeywords">Action terfwoorden</system:String>
     <system:String x:Key="pluginDirectory">Plugin map</system:String>
     <system:String x:Key="author">Auteur</system:String>
-    <system:String x:Key="plugin_init_time">Init tijd: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Query tijd: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Init tijd:</system:String>
+    <system:String x:Key="plugin_query_time">Query tijd:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Thema</system:String>

diff --git a/Flow.Launcher/Languages/pl.xaml b/Flow.Launcher/Languages/pl.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -36,8 +36,8 @@
     <system:String x:Key="actionKeywords">Wyzwalacze</system:String>
     <system:String x:Key="pluginDirectory">Folder wtyczki</system:String>
     <system:String x:Key="author">Autor</system:String>
-    <system:String x:Key="plugin_init_time">Czas ładowania: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Czas zapytania: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Czas ładowania:</system:String>
+    <system:String x:Key="plugin_query_time">Czas zapytania:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Skórka</system:String>

diff --git a/Flow.Launcher/Languages/pt-br.xaml b/Flow.Launcher/Languages/pt-br.xaml
@@ -1,4 +1,4 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
     <!--MainWindow-->
@@ -40,8 +40,8 @@
     <system:String x:Key="actionKeywords">Palavras-chave de ação</system:String>
     <system:String x:Key="pluginDirectory">Diretório de Plugins</system:String>
     <system:String x:Key="author">Autor</system:String>
-    <system:String x:Key="plugin_init_time">Tempo de inicialização: {0}ms</system:String>
-    <system:String x:Key="plugin_query_time">Tempo de consulta: {0}ms</system:String>
+    <system:String x:Key="plugin_init_time">Tempo de inicialização:</system:String>
+    <system:String x:Key="plugin_query_time">Tempo de consulta:</system:String>
 
     <!--Setting Theme-->
     <system:String x:Key="theme">Tema</system:String>