Skip to content

Commit a3374f2

Browse files
JohnTheGr8JohnTheGr8
authored
merge pull request #60
- update ActionKeyword window - settings: UI improvements in plugin/hotkey tabs
2 parents 50e0ca3 + d6b4b40 commit a3374f2

25 files changed

+150
-127
lines changed

‎Flow.Launcher/ActionKeywords.xaml‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,41 @@
1-
<Window x:Class="Flow.Launcher.ActionKeywords"
1+
<Window x:Class="Flow.Launcher.ActionKeywords"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
Title="ActionKeywords"
55
Icon="Images\app.png"
66
ResizeMode="NoResize"
77
Loaded="ActionKeyword_OnLoaded"
88
WindowStartupLocation="CenterScreen"
9-
Height="200" Width="600">
9+
Height="250" Width="500">
1010
<Grid>
1111
<Grid.RowDefinitions>
1212
<RowDefinition />
13-
<RowDefinition />
13+
<RowDefinition Height="60"/>
1414
<RowDefinition />
1515
<RowDefinition />
1616
</Grid.RowDefinitions>
1717
<Grid.ColumnDefinitions>
18-
<ColumnDefinition Width="170" />
18+
<ColumnDefinition Width="150" />
1919
<ColumnDefinition />
2020
</Grid.ColumnDefinitions>
21-
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
22-
HorizontalAlignment="Right" Text="{DynamicResource oldActionKeyword}" />
23-
<TextBlock x:Name="tbOldActionKeyword" Margin="10" FontSize="14" Grid.Row="0" Grid.Column="1"
24-
VerticalAlignment="Center" HorizontalAlignment="Left">
25-
Old ActionKeywords:
26-
</TextBlock>
27-
28-
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
29-
HorizontalAlignment="Right" Text="{DynamicResource newActionKeyword}" />
21+
<TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
22+
HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
23+
<TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="170 10 10 10" FontSize="14"
24+
VerticalAlignment="Center" HorizontalAlignment="Left" />
25+
26+
<TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
27+
HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
3028
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
31-
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
29+
<TextBox x:Name="tbAction" Margin="170 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
3230
</StackPanel>
3331

34-
<TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Padding="5" Foreground="Gray"
32+
<TextBlock Grid.Row="2" Grid.ColumnSpan="1" Grid.Column="1" Foreground="Gray"
3533
Text="{DynamicResource actionkeyword_tips}" />
3634

3735
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="3" Grid.Column="1">
38-
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
36+
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="30"
3937
Content="{DynamicResource cancel}" />
40-
<Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="25" Click="btnDone_OnClick">
38+
<Button x:Name="btnDone" Margin="10 0 10 0" Width="80" Height="30" Click="btnDone_OnClick">
4139
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
4240
</Button>
4341
</StackPanel>

‎Flow.Launcher/ActionKeywords.xaml.cs‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,33 @@
44
using Flow.Launcher.Infrastructure.Exception;
55
using Flow.Launcher.Infrastructure.UserSettings;
66
using Flow.Launcher.Plugin;
7+
using Flow.Launcher.ViewModel;
78

89
namespace Flow.Launcher
910
{
1011
public partial class ActionKeywords : Window
1112
{
12-
private PluginPair _plugin;
13-
private Settings _settings;
14-
private readonly Internationalization _translater = InternationalizationManager.Instance;
13+
private readonly PluginPair plugin;
14+
private Settings settings;
15+
private readonly Internationalization translater = InternationalizationManager.Instance;
16+
private readonly PluginViewModel pluginViewModel;
1517

16-
public ActionKeywords(string pluginId, Settings settings)
18+
public ActionKeywords(string pluginId, Settings settings, PluginViewModel pluginViewModel)
1719
{
1820
InitializeComponent();
19-
_plugin = PluginManager.GetPluginForId(pluginId);
20-
_settings = settings;
21-
if (_plugin == null)
21+
plugin = PluginManager.GetPluginForId(pluginId);
22+
this.settings = settings;
23+
this.pluginViewModel = pluginViewModel;
24+
if (plugin == null)
2225
{
23-
MessageBox.Show(_translater.GetTranslation("cannotFindSpecifiedPlugin"));
26+
MessageBox.Show(translater.GetTranslation("cannotFindSpecifiedPlugin"));
2427
Close();
2528
}
2629
}
2730

2831
private void ActionKeyword_OnLoaded(object sender, RoutedEventArgs e)
2932
{
30-
tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, _plugin.Metadata.ActionKeywords.ToArray());
33+
tbOldActionKeyword.Text = string.Join(Query.ActionKeywordSeperater, plugin.Metadata.ActionKeywords.ToArray());
3134
tbAction.Focus();
3235
}
3336

@@ -38,19 +41,17 @@ private void BtnCancel_OnClick(object sender, RoutedEventArgs e)
3841

3942
private void btnDone_OnClick(object sender, RoutedEventArgs _)
4043
{
41-
var oldActionKeyword = _plugin.Metadata.ActionKeywords[0];
44+
var oldActionKeyword = plugin.Metadata.ActionKeywords[0];
4245
var newActionKeyword = tbAction.Text.Trim();
4346
newActionKeyword = newActionKeyword.Length > 0 ? newActionKeyword : "*";
44-
if (!PluginManager.ActionKeywordRegistered(newActionKeyword))
47+
if (!pluginViewModel.IsActionKeywordRegistered(newActionKeyword))
4548
{
46-
var id = _plugin.Metadata.ID;
47-
PluginManager.ReplaceActionKeyword(id, oldActionKeyword, newActionKeyword);
48-
MessageBox.Show(_translater.GetTranslation("success"));
49+
pluginViewModel.ChangeActionKeyword(newActionKeyword, oldActionKeyword);
4950
Close();
5051
}
5152
else
5253
{
53-
string msg = _translater.GetTranslation("newActionKeywordsHasBeenAssigned");
54+
string msg = translater.GetTranslation("newActionKeywordsHasBeenAssigned");
5455
MessageBox.Show(msg);
5556
}
5657
}

‎Flow.Launcher/CustomQueryHotkeySetting.xaml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
1-
<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
1+
<Window x:Class="Flow.Launcher.CustomQueryHotkeySetting"
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
44
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
55
Icon="Images\app.png"
66
ResizeMode="NoResize"
77
WindowStartupLocation="CenterScreen"
88
Title="Custom Plugin Hotkey" Height="200" Width="674.766">
9+
<Window.InputBindings>
10+
<KeyBinding Key="Escape" Command="Close"/>
11+
</Window.InputBindings>
12+
<Window.CommandBindings>
13+
<CommandBinding Command="Close" Executed="cmdEsc_OnPress"/>
14+
</Window.CommandBindings>
915
<Grid>
1016
<Grid.RowDefinitions>
1117
<RowDefinition />
@@ -18,7 +24,7 @@
1824
</Grid.ColumnDefinitions>
1925
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
2026
HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
21-
<flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10" Grid.Column="1" />
27+
<flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
2228

2329
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
2430
HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
@@ -29,9 +35,9 @@
2935
</StackPanel>
3036

3137
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
32-
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="25"
38+
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
3339
Content="{DynamicResource cancel}" />
34-
<Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="25" Click="btnAdd_OnClick">
40+
<Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">
3541
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
3642
</Button>
3743
</StackPanel>

‎Flow.Launcher/CustomQueryHotkeySetting.xaml.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using Flow.Launcher.Core.Resource;
2+
using Flow.Launcher.Infrastructure.Hotkey;
3+
using Flow.Launcher.Infrastructure.UserSettings;
4+
using NHotkey;
5+
using NHotkey.Wpf;
6+
using System;
37
using System.Collections.ObjectModel;
48
using System.Linq;
59
using System.Windows;
6-
using NHotkey;
7-
using NHotkey.Wpf;
8-
using Flow.Launcher.Core.Resource;
9-
using Flow.Launcher.Infrastructure.Hotkey;
10-
using Flow.Launcher.Infrastructure.UserSettings;
10+
using System.Windows.Input;
1111

1212
namespace Flow.Launcher
1313
{
@@ -125,5 +125,10 @@ private void SetHotkey(HotkeyModel hotkey, EventHandler<HotkeyEventArgs> action)
125125
MessageBox.Show(errorMsg);
126126
}
127127
}
128+
129+
private void cmdEsc_OnPress(object sender, ExecutedRoutedEventArgs e)
130+
{
131+
Close();
132+
}
128133
}
129134
}

‎Flow.Launcher/Languages/da.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636
<system:String x:Key="actionKeywords">Nøgleord</system:String>
3737
<system:String x:Key="pluginDirectory">Plugin bibliotek</system:String>
3838
<system:String x:Key="author">Forfatter</system:String>
39-
<system:String x:Key="plugin_init_time">Initaliseringstid: {0}ms</system:String>
40-
<system:String x:Key="plugin_query_time">Søgetid: {0}ms</system:String>
39+
<system:String x:Key="plugin_init_time">Initaliseringstid:</system:String>
40+
<system:String x:Key="plugin_query_time">Søgetid:</system:String>
4141

4242
<!--Setting Theme-->
4343
<system:String x:Key="theme">Tema</system:String>

‎Flow.Launcher/Languages/de.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:system="clr-namespace:System;assembly=mscorlib">
44
<!--MainWindow-->
@@ -36,8 +36,8 @@
3636
<system:String x:Key="actionKeywords">Aktionsschlüsselwörter</system:String>
3737
<system:String x:Key="pluginDirectory">Pluginordner</system:String>
3838
<system:String x:Key="author">Autor</system:String>
39-
<system:String x:Key="plugin_init_time">Initialisierungszeit: {0}ms</system:String>
40-
<system:String x:Key="plugin_query_time">Abfragezeit: {0}ms</system:String>
39+
<system:String x:Key="plugin_init_time">Initialisierungszeit:</system:String>
40+
<system:String x:Key="plugin_query_time">Abfragezeit:</system:String>
4141

4242
<!--Setting Theme-->
4343
<system:String x:Key="theme">Theme</system:String>

‎Flow.Launcher/Languages/en.xaml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:system="clr-namespace:System;assembly=mscorlib">
44
<!--MainWindow-->
@@ -40,11 +40,13 @@
4040
<system:String x:Key="plugin">Plugin</system:String>
4141
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
4242
<system:String x:Key="disable">Disable</system:String>
43-
<system:String x:Key="actionKeywords">Action keywords</system:String>
43+
<system:String x:Key="actionKeywords">Action keyword:</system:String>
44+
<system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
45+
<system:String x:Key="newActionKeyword">New action keyword:</system:String>
4446
<system:String x:Key="pluginDirectory">Plugin Directory</system:String>
4547
<system:String x:Key="author">Author</system:String>
46-
<system:String x:Key="plugin_init_time">Init time: {0}ms</system:String>
47-
<system:String x:Key="plugin_query_time">Query time: {0}ms</system:String>
48+
<system:String x:Key="plugin_init_time">Init time:</system:String>
49+
<system:String x:Key="plugin_query_time">Query time:</system:String>
4850

4951
<!--Setting Theme-->
5052
<system:String x:Key="theme">Theme</system:String>

‎Flow.Launcher/Languages/fr.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@
4040
<system:String x:Key="actionKeywords">Mot-clé d'action :</system:String>
4141
<system:String x:Key="pluginDirectory">Répertoire</system:String>
4242
<system:String x:Key="author">Auteur </system:String>
43-
<system:String x:Key="plugin_init_time">Chargement : {0}ms</system:String>
44-
<system:String x:Key="plugin_query_time">Utilisation : {0}ms</system:String>
43+
<system:String x:Key="plugin_init_time">Chargement :</system:String>
44+
<system:String x:Key="plugin_query_time">Utilisation :</system:String>
4545

4646
<!--Setting Theme-->
4747
<system:String x:Key="theme">Thèmes</system:String>

‎Flow.Launcher/Languages/it.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:system="clr-namespace:System;assembly=mscorlib">
44
<!--MainWindow-->
@@ -40,8 +40,8 @@
4040
<system:String x:Key="actionKeywords">Parole chiave</system:String>
4141
<system:String x:Key="pluginDirectory">Cartella Plugin</system:String>
4242
<system:String x:Key="author">Autore</system:String>
43-
<system:String x:Key="plugin_init_time">Tempo di avvio: {0}ms</system:String>
44-
<system:String x:Key="plugin_query_time">Tempo ricerca: {0}ms</system:String>
43+
<system:String x:Key="plugin_init_time">Tempo di avvio:</system:String>
44+
<system:String x:Key="plugin_query_time">Tempo ricerca:</system:String>
4545

4646
<!--Setting Theme-->
4747
<system:String x:Key="theme">Tema</system:String>

‎Flow.Launcher/Languages/ja.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1+
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:system="clr-namespace:System;assembly=mscorlib">
44
<!--MainWindow-->
@@ -41,8 +41,8 @@
4141
<system:String x:Key="actionKeywords">キーワード</system:String>
4242
<system:String x:Key="pluginDirectory">プラグイン・ディレクトリ</system:String>
4343
<system:String x:Key="author">作者</system:String>
44-
<system:String x:Key="plugin_init_time">初期化時間: {0}ms</system:String>
45-
<system:String x:Key="plugin_query_time">クエリ時間: {0}ms</system:String>
44+
<system:String x:Key="plugin_init_time">初期化時間:</system:String>
45+
<system:String x:Key="plugin_query_time">クエリ時間:</system:String>
4646

4747
<!--Setting Theme-->
4848
<system:String x:Key="theme">テーマ</system:String>

0 commit comments

Comments
 (0)