Skip to content

Commit d2cb9c0

Browse files
onesoundsonesounds
committed
Adjust Setting Panel Layout
1 parent 55bc7cd commit d2cb9c0

File tree

2 files changed

+62
-28
lines changed

2 files changed

+62
-28
lines changed

‎Plugins/Flow.Launcher.Plugin.Program/Languages/en.xaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@
1616
<system:String x:Key="flowlauncher_plugin_program_suffixes">File Type</system:String>
1717
<system:String x:Key="flowlauncher_plugin_program_reindex">Reindex</system:String>
1818
<system:String x:Key="flowlauncher_plugin_program_indexing">Indexing</system:String>
19-
<system:String x:Key="flowlauncher_plugin_program_index_start">Index Start Menu</system:String>
19+
<system:String x:Key="flowlauncher_plugin_program_index_source">Index Source</system:String>
20+
<system:String x:Key="flowlauncher_plugin_program_index_option">Option</system:String>
21+
<system:String x:Key="flowlauncher_plugin_program_index_start">Start Menu</system:String>
2022
<system:String x:Key="flowlauncher_plugin_program_index_start_tooltip">When enabled, Flow will load programs from the start menu</system:String>
21-
<system:String x:Key="flowlauncher_plugin_program_index_registry">Index Registry</system:String>
23+
<system:String x:Key="flowlauncher_plugin_program_index_registry">Registry</system:String>
2224
<system:String x:Key="flowlauncher_plugin_program_index_registry_tooltip">When enabled, Flow will load programs from the registry</system:String>
23-
<system:String x:Key="flowlauncher_plugin_program_index_PATH">Index PATH</system:String>
25+
<system:String x:Key="flowlauncher_plugin_program_index_PATH">PATH</system:String>
2426
<system:String x:Key="flowlauncher_plugin_program_index_PATH_tooltip">When enabled, Flow will load programs from the PATH environment variable</system:String>
2527
<system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath">Hide app path</system:String>
2628
<system:String x:Key="flowlauncher_plugin_program_enable_hidelnkpath_tooltip">For executable files such as UWP or lnk, hide the file path from being visible</system:String>

‎Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml

Lines changed: 57 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,56 +10,88 @@
1010
mc:Ignorable="d">
1111
<Grid Margin="0">
1212
<Grid.RowDefinitions>
13+
<RowDefinition Height="Auto" />
1314
<RowDefinition Height="Auto" />
1415
<RowDefinition Height="*" />
1516
<RowDefinition Height="60" />
1617
</Grid.RowDefinitions>
17-
<StackPanel
18-
Grid.Row="0"
18+
<DockPanel
19+
Margin="70,10,0,8"
1920
HorizontalAlignment="Stretch"
20-
Orientation="Vertical">
21-
<WrapPanel Width="Auto" Margin="70,8,10,0">
22-
<CheckBox
23-
Name="HideLnkEnabled"
24-
Margin="0,0,30,8"
25-
Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
26-
IsChecked="{Binding HideAppsPath}"
27-
ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
28-
<CheckBox
29-
Name="DescriptionEnabled"
30-
Margin="0,0,30,8"
31-
Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
32-
IsChecked="{Binding EnableDescription}"
33-
ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
34-
21+
LastChildFill="True">
22+
<TextBlock
23+
MinWidth="120"
24+
Margin="0,5,10,0"
25+
Text="{DynamicResource flowlauncher_plugin_program_index_source}" />
26+
<WrapPanel
27+
Width="Auto"
28+
Margin="0,0,14,0"
29+
HorizontalAlignment="Right"
30+
DockPanel.Dock="Right">
3531
<CheckBox
3632
Name="StartMenuEnabled"
37-
Margin="0,0,30,8"
33+
Margin="12,0,12,0"
3834
Content="{DynamicResource flowlauncher_plugin_program_index_start}"
3935
IsChecked="{Binding EnableStartMenuSource}"
4036
ToolTip="{DynamicResource flowlauncher_plugin_program_index_start_tooltip}" />
4137
<CheckBox
4238
Name="RegistryEnabled"
43-
Margin="0,0,30,8"
39+
Margin="12,0,12,0"
4440
Content="{DynamicResource flowlauncher_plugin_program_index_registry}"
4541
IsChecked="{Binding EnableRegistrySource}"
4642
ToolTip="{DynamicResource flowlauncher_plugin_program_index_registry_tooltip}" />
4743

4844
<CheckBox
4945
Name="PATHEnabled"
50-
Margin="0,0,30,8"
46+
Margin="12,0,12,0"
5147
Content="{DynamicResource flowlauncher_plugin_program_index_PATH}"
5248
IsChecked="{Binding EnablePATHSource}"
5349
ToolTip="{DynamicResource flowlauncher_plugin_program_index_PATH_tooltip}" />
54-
5550
</WrapPanel>
51+
</DockPanel>
52+
53+
<StackPanel
54+
Grid.Row="1"
55+
HorizontalAlignment="Stretch"
56+
Orientation="Vertical">
57+
<Separator
58+
Height="1"
59+
BorderBrush="{DynamicResource Color03B}"
60+
BorderThickness="1" />
61+
<DockPanel
62+
Margin="70,10,0,8"
63+
HorizontalAlignment="Stretch"
64+
LastChildFill="True">
65+
<TextBlock
66+
MinWidth="120"
67+
Margin="0,5,10,0"
68+
Text="{DynamicResource flowlauncher_plugin_program_index_option}" />
69+
<WrapPanel
70+
Width="Auto"
71+
Margin="0,0,14,0"
72+
HorizontalAlignment="Right"
73+
DockPanel.Dock="Right">
74+
<CheckBox
75+
Name="HideLnkEnabled"
76+
Margin="12,0,12,0"
77+
Content="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath}"
78+
IsChecked="{Binding HideAppsPath}"
79+
ToolTip="{DynamicResource flowlauncher_plugin_program_enable_hidelnkpath_tooltip}" />
80+
<CheckBox
81+
Name="DescriptionEnabled"
82+
Margin="12,0,12,0"
83+
Content="{DynamicResource flowlauncher_plugin_program_enable_description}"
84+
IsChecked="{Binding EnableDescription}"
85+
ToolTip="{DynamicResource flowlauncher_plugin_program_enable_description_tooltip}" />
86+
</WrapPanel>
87+
</DockPanel>
5688
<Separator
5789
Height="1"
5890
BorderBrush="{DynamicResource Color03B}"
5991
BorderThickness="1" />
6092
<StackPanel
6193
Width="Auto"
62-
Margin="10,6,0,0"
94+
Margin="60,6,0,0"
6395
HorizontalAlignment="Left"
6496
Orientation="Horizontal">
6597
<Button
@@ -105,8 +137,8 @@
105137
</StackPanel>
106138
<ListView
107139
x:Name="programSourceView"
108-
Grid.Row="1"
109-
Margin="20,0,20,0"
140+
Grid.Row="2"
141+
Margin="70,0,20,0"
110142
AllowDrop="True"
111143
BorderBrush="DarkGray"
112144
BorderThickness="1"
@@ -145,7 +177,7 @@
145177
</ListView.View>
146178
</ListView>
147179
<DockPanel
148-
Grid.Row="2"
180+
Grid.Row="3"
149181
Grid.RowSpan="1"
150182
Margin="0,0,20,10">
151183
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">

0 commit comments

Comments
 (0)