Skip to content

Commit df97be7

Browse files
jjw24jjw24
authored
Merge pull request #888 from onesounds/pluginmanagercheckbox
Small Design Fix in Setting Window
2 parents 1f64dc8 + 72aaf06 commit df97be7

File tree

6 files changed

+113
-73
lines changed

6 files changed

+113
-73
lines changed

‎Flow.Launcher/CustomQueryHotkeySetting.xaml

Lines changed: 71 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:flowlauncher="clr-namespace:Flow.Launcher"
66
Title="{DynamicResource customeQueryHotkeyTitle}"
7-
Width="500"
7+
Width="530"
88
Background="{DynamicResource PopuBGColor}"
99
Foreground="{DynamicResource PopupTextColor}"
1010
Icon="Images\app.png"
@@ -79,56 +79,74 @@
7979
</StackPanel>
8080

8181
<StackPanel Margin="0,20,0,0" Orientation="Horizontal">
82-
<TextBlock
83-
Grid.Row="0"
84-
Grid.Column="0"
85-
Width="60"
86-
Margin="10"
87-
HorizontalAlignment="Left"
88-
VerticalAlignment="Center"
89-
FontSize="14"
90-
Text="{DynamicResource hotkey}" />
91-
<flowlauncher:HotkeyControl
92-
x:Name="ctlHotkey"
93-
Grid.Column="1"
94-
Width="200"
95-
Height="34"
96-
Margin="10,0,10,0"
97-
HorizontalAlignment="Left"
98-
VerticalAlignment="Center"
99-
HorizontalContentAlignment="Left" />
100-
<TextBlock
101-
Grid.Row="1"
102-
Grid.Column="0"
103-
Margin="10"
104-
HorizontalAlignment="Left"
105-
VerticalAlignment="Center"
106-
FontSize="14"
107-
Text="{DynamicResource actionKeyword}" />
108-
</StackPanel>
109-
110-
<StackPanel Margin="0,0,0,0" Orientation="Horizontal">
111-
<TextBlock
112-
Grid.Row="0"
113-
Grid.Column="0"
114-
Width="60"
115-
Margin="10"
116-
HorizontalAlignment="Left"
117-
VerticalAlignment="Center"
118-
FontSize="14"
119-
Text="{DynamicResource customQuery}" />
120-
<TextBox
121-
x:Name="tbAction"
122-
Width="250"
123-
Margin="10"
124-
HorizontalAlignment="Left"
125-
VerticalAlignment="Center" />
126-
<Button
127-
x:Name="btnTestActionKeyword"
128-
Height="30"
129-
Padding="10,5,10,5"
130-
Click="BtnTestActionKeyword_OnClick"
131-
Content="{DynamicResource preview}" />
82+
<Grid>
83+
<Grid.RowDefinitions>
84+
<RowDefinition />
85+
<RowDefinition />
86+
</Grid.RowDefinitions>
87+
<Grid.ColumnDefinitions>
88+
<ColumnDefinition />
89+
<ColumnDefinition />
90+
</Grid.ColumnDefinitions>
91+
<TextBlock
92+
Grid.Row="0"
93+
Grid.Column="0"
94+
Width="Auto"
95+
MinWidth="110"
96+
Margin="10"
97+
HorizontalAlignment="Left"
98+
VerticalAlignment="Center"
99+
FontSize="14"
100+
Text="{DynamicResource hotkey}" />
101+
<StackPanel
102+
Grid.Row="0"
103+
Grid.Column="1"
104+
Orientation="Horizontal">
105+
<flowlauncher:HotkeyControl
106+
x:Name="ctlHotkey"
107+
Grid.Column="1"
108+
Width="200"
109+
Height="34"
110+
Margin="10,0,10,0"
111+
HorizontalAlignment="Left"
112+
VerticalAlignment="Center"
113+
HorizontalContentAlignment="Left" />
114+
<TextBlock
115+
Grid.Row="1"
116+
Grid.Column="0"
117+
Margin="10"
118+
HorizontalAlignment="Left"
119+
VerticalAlignment="Center"
120+
FontSize="14"
121+
Text="{DynamicResource actionKeyword}" />
122+
</StackPanel>
123+
<TextBlock
124+
Grid.Row="1"
125+
Grid.Column="0"
126+
Width="Auto"
127+
MinWidth="110"
128+
Margin="10"
129+
HorizontalAlignment="Left"
130+
VerticalAlignment="Center"
131+
FontSize="14"
132+
Text="{DynamicResource customQuery}" />
133+
<StackPanel
134+
Grid.Row="1"
135+
Grid.Column="1"
136+
Orientation="Horizontal">
137+
<TextBox
138+
x:Name="tbAction"
139+
MinWidth="220"
140+
Margin="10"
141+
HorizontalAlignment="Left"
142+
VerticalAlignment="Center" />
143+
<Button
144+
x:Name="btnTestActionKeyword"
145+
Padding="10,5,10,5"
146+
Click="BtnTestActionKeyword_OnClick"
147+
Content="{DynamicResource preview}" />
148+
</StackPanel>
149+
</Grid>
132150
</StackPanel>
133151
</StackPanel>
134152
</StackPanel>
@@ -151,7 +169,8 @@
151169
Width="100"
152170
Height="32"
153171
Margin="5,0,10,0"
154-
Click="btnAdd_OnClick">
172+
Click="btnAdd_OnClick"
173+
Style="{StaticResource AccentButtonStyle}">
155174
<TextBlock x:Name="lblAdd" Text="{DynamicResource done}" />
156175
</Button>
157176
</StackPanel>

‎Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -267,6 +267,7 @@
267267
<system:String x:Key="HotkeyCtrlShiftEnterDesc">Run as Admin</system:String>
268268
<system:String x:Key="HotkeyCtrlHDesc">Query History</system:String>
269269
<system:String x:Key="HotkeyESCDesc">Back to Result in Context Menu</system:String>
270+
<system:String x:Key="HotkeyTabDesc">Autocomplete</system:String>
270271
<system:String x:Key="HotkeyRunDesc">Open / Run Selected Item</system:String>
271272
<system:String x:Key="HotkeyCtrlIDesc">Open Setting Window</system:String>
272273
<system:String x:Key="HotkeyF5Desc">Reload Plugin Data</system:String>

‎Flow.Launcher/PriorityChangeWindow.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@
9090
HorizontalAlignment="Left"
9191
VerticalAlignment="Center"
9292
CornerRadius="4"
93-
Minimum="0"
9493
SmallChange="1"
9594
SpinButtonPlacementMode="Inline" />
9695
</StackPanel>

‎Flow.Launcher/Resources/Pages/WelcomePage3.xaml

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
7-
xmlns:ui="http://schemas.modernwpf.com/2019"
87
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
8+
xmlns:ui="http://schemas.modernwpf.com/2019"
99
Title="WelcomePage3"
1010
mc:Ignorable="d">
1111
<Page.Resources>
1212
<Style x:Key="KbdLine" TargetType="Border">
1313
<Setter Property="CornerRadius" Value="8" />
14-
<Setter Property="Margin" Value="0,4,0,4" />
14+
<Setter Property="Margin" Value="0,3,0,3" />
1515
<Setter Property="Background" Value="{DynamicResource Color01B}" />
1616
</Style>
1717
<Style x:Key="Kbd" TargetType="Border">
@@ -60,7 +60,7 @@
6060
VerticalScrollBarVisibility="Auto">
6161
<Grid>
6262
<StackPanel Margin="24,20,24,20">
63-
<StackPanel Margin="0,0,0,20">
63+
<StackPanel Margin="0,0,0,10">
6464
<TextBlock
6565
FontSize="20"
6666
FontWeight="SemiBold"
@@ -155,6 +155,26 @@
155155
</StackPanel>
156156
</Border>
157157

158+
<Border Style="{DynamicResource KbdLine}">
159+
<StackPanel Orientation="Horizontal">
160+
<StackPanel
161+
Width="210"
162+
Margin="20,5,4,5"
163+
VerticalAlignment="Center"
164+
Orientation="Horizontal">
165+
<Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
166+
<TextBlock Style="{DynamicResource KbdText}" Text="Tab" />
167+
</Border>
168+
</StackPanel>
169+
<StackPanel VerticalAlignment="Center">
170+
<TextBlock
171+
VerticalAlignment="Center"
172+
FontSize="13"
173+
Text="{DynamicResource HotkeyTabDesc}" />
174+
</StackPanel>
175+
</StackPanel>
176+
</Border>
177+
158178
<Border Style="{DynamicResource KbdLine}">
159179
<StackPanel Orientation="Horizontal">
160180
<StackPanel

‎Flow.Launcher/SettingWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ private void OpenSettingFolder(object sender, RoutedEventArgs e)
293293
private void OpenWelcomeWindow(object sender, RoutedEventArgs e)
294294
{
295295
var WelcomeWindow = new WelcomeWindow(settings);
296-
WelcomeWindow.Show();
296+
WelcomeWindow.ShowDialog();
297297
}
298298
private void OpenLogFolder(object sender, RoutedEventArgs e)
299299
{

‎Plugins/Flow.Launcher.Plugin.PluginsManager/Views/PluginsManagerSettings.xaml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
1-
<UserControl x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
2-
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
3-
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4-
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
5-
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
6-
mc:Ignorable="d"
7-
d:DesignHeight="450" d:DesignWidth="800">
8-
<Grid Margin="70 15 0 15">
1+
<UserControl
2+
x:Class="Flow.Launcher.Plugin.PluginsManager.Views.PluginsManagerSettings"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
d:DesignHeight="450"
8+
d:DesignWidth="800"
9+
mc:Ignorable="d">
10+
<Grid Margin="70,15,0,15">
911
<Grid.ColumnDefinitions>
10-
<ColumnDefinition Width="250"/>
11-
<ColumnDefinition Width="*"/>
12+
<ColumnDefinition Width="400" />
13+
<ColumnDefinition Width="*" />
1214
</Grid.ColumnDefinitions>
13-
14-
<TextBlock Grid.Column="0"
15-
Text="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
16-
VerticalAlignment="Center"
17-
FontSize="14"/>
18-
<CheckBox Grid.Column="1" IsChecked="{Binding WarnFromUnknownSource}" />
15+
<CheckBox
16+
Grid.Column="0"
17+
Padding="8,0,0,0"
18+
Content="{DynamicResource plugin_pluginsmanager_plugin_settings_unknown_source}"
19+
IsChecked="{Binding WarnFromUnknownSource}" />
1920
</Grid>
2021
</UserControl>

0 commit comments

Comments
 (0)