Skip to content

Commit a244570

Browse files
onesoundsonesounds
committed
- add action keyweword title string
- add some additional tip string - adjust action keyword setting popup layout
1 parent 0e5d5ec commit a244570

File tree

3 files changed

+46
-33
lines changed

3 files changed

+46
-33
lines changed

‎Flow.Launcher/ActionKeywords.xaml

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,54 @@
11
<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"
4-
Title="ActionKeywords"
4+
Title="{DynamicResource actionKeywordsTitle}"
55
Icon="Images\app.png"
66
ResizeMode="NoResize"
77
Loaded="ActionKeyword_OnLoaded"
88
WindowStartupLocation="CenterScreen"
9-
Height="250" Width="500">
9+
Height="365" Width="450" Background="#F3F3F3" BorderBrush="#cecece">
1010
<Grid>
11+
<Grid.RowDefinitions>
12+
<RowDefinition />
13+
<RowDefinition Height="80"/>
14+
</Grid.RowDefinitions>
15+
<Border BorderThickness="0 0 0 1" BorderBrush="#e5e5e5" Background="#ffffff" Padding="26 26 26 0">
16+
<Grid>
17+
<StackPanel>
18+
<StackPanel Grid.Row="0" Margin="0 0 0 12">
19+
<TextBlock Grid.Column="0" Text="{DynamicResource actionKeywordsTitle}" FontSize="20" FontWeight="SemiBold" FontFamily="Segoe UI" TextAlignment="Left"
20+
Margin="0 0 0 0" />
21+
</StackPanel>
22+
<StackPanel>
23+
<TextBlock
24+
Text="{DynamicResource actionkeyword_tips}" Foreground="#1b1b1b" FontSize="14" TextWrapping="WrapWithOverflow" TextAlignment="Left"/>
25+
</StackPanel>
26+
27+
<StackPanel Orientation="Horizontal" Margin="0 18 0 0">
28+
<TextBlock FontSize="14" Grid.Row="0" Grid.Column="1" VerticalAlignment="Center"
29+
HorizontalAlignment="Left" Text="{DynamicResource currentActionKeywords}" />
30+
<TextBlock x:Name="tbOldActionKeyword" Grid.Row="0" Grid.Column="1" Margin="14 10 10 10" FontSize="14"
31+
VerticalAlignment="Center" HorizontalAlignment="Left" FontWeight="SemiBold"/>
32+
</StackPanel>
33+
<StackPanel Orientation="Horizontal">
34+
<TextBlock FontSize="14" Grid.Row="1" Grid.Column="1" VerticalAlignment="Center"
35+
HorizontalAlignment="Left" Text="{DynamicResource newActionKeyword}" />
36+
37+
<TextBox x:Name="tbAction" Margin="10 10 15 10" Width="105" VerticalAlignment="Center" HorizontalAlignment="Left" />
38+
39+
</StackPanel>
40+
</StackPanel>
41+
</Grid>
42+
</Border>
43+
<StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Grid.Row="1">
44+
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 5 0" Width="100" Height="30"
45+
Content="{DynamicResource cancel}" />
46+
<Button x:Name="btnDone" Margin="5 0 10 0" Width="100" Height="30" Click="btnDone_OnClick">
47+
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
48+
</Button>
49+
</StackPanel>
50+
</Grid>
51+
<!--
1152
<Grid.RowDefinitions>
1253
<RowDefinition />
1354
<RowDefinition Height="60"/>
@@ -40,4 +81,5 @@
4081
</Button>
4182
</StackPanel>
4283
</Grid>
84+
-->
4385
</Window>

‎Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -55,35 +55,5 @@
5555
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
5656
</Button>
5757
</StackPanel>
58-
<!--
59-
<Grid.RowDefinitions>
60-
<RowDefinition />
61-
<RowDefinition />
62-
<RowDefinition />
63-
</Grid.RowDefinitions>
64-
<Grid.ColumnDefinitions>
65-
<ColumnDefinition Width="150" />
66-
<ColumnDefinition />
67-
</Grid.ColumnDefinitions>
68-
<TextBlock Margin="10" FontSize="14" Grid.Row="0" Grid.Column="0" VerticalAlignment="Center"
69-
HorizontalAlignment="Right" Text="{DynamicResource hotkey}" />
70-
<flowlauncher:HotkeyControl x:Name="ctlHotkey" Margin="10,0,10,0" Grid.Column="1" VerticalAlignment="Center" Height="32" />
71-
72-
<TextBlock Margin="10" FontSize="14" Grid.Row="1" Grid.Column="0" VerticalAlignment="Center"
73-
HorizontalAlignment="Right" Text="{DynamicResource actionKeyword}" />
74-
<StackPanel Grid.Row="1" Orientation="Horizontal" Grid.Column="1">
75-
<TextBox x:Name="tbAction" Margin="10" Width="400" VerticalAlignment="Center" HorizontalAlignment="Left" />
76-
<Button x:Name="btnTestActionKeyword" Padding="10 5 10 5" Height="30" Click="BtnTestActionKeyword_OnClick"
77-
Content="{DynamicResource preview}" />
78-
</StackPanel>
79-
80-
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Grid.Row="2" Grid.Column="1">
81-
<Button x:Name="btnCancel" Click="BtnCancel_OnClick" Margin="10 0 10 0" Width="80" Height="32"
82-
Content="{DynamicResource cancel}" />
83-
<Button x:Name="btnAdd" Margin="10 0 10 0" Width="80" Height="32" Click="btnAdd_OnClick">
84-
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
85-
</Button>
86-
</StackPanel>
87-
-->
8858
</Grid>
8959
</Window>

‎Flow.Launcher/Languages/en.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
<system:String x:Key="browserMorePlugins">Find more plugins</system:String>
5050
<system:String x:Key="enable">On</system:String>
5151
<system:String x:Key="disable">Off</system:String>
52+
<system:String x:Key="actionKeywordsTitle">Action keyword Setting</system:String>
5253
<system:String x:Key="actionKeywords">Action keyword</system:String>
5354
<system:String x:Key="currentActionKeywords">Current action keyword:</system:String>
5455
<system:String x:Key="newActionKeyword">New action keyword:</system:String>
@@ -146,7 +147,7 @@
146147
<system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
147148
<system:String x:Key="success">Success</system:String>
148149
<system:String x:Key="completedSuccessfully">Completed successfully</system:String>
149-
<system:String x:Key="actionkeyword_tips">Use * if you don't want to specify an action keyword</system:String>
150+
<system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords. </system:String>
150151

151152
<!--Custom Query Hotkey Dialog-->
152153
<system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>

0 commit comments

Comments
 (0)