Skip to content

Commit 41b9068

Browse files
onesoundsonesounds
committed
- Adjust item margins
- Add subtext for "hideOnStartup"
1 parent a02a958 commit 41b9068

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

‎Flow.Launcher/Languages/en.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@
7575
<system:String x:Key="autoUpdates">Auto Update</system:String>
7676
<system:String x:Key="select">Select</system:String>
7777
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
78+
<system:String x:Key="hideOnStartupToolTip">Flow Launcher starts out hidden in the tray.</system:String>
7879
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
7980
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
8081
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>

‎Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,17 @@
3636
OnContent="{DynamicResource enable}" />
3737
</cc:Card>
3838

39-
<cc:Card Title="{DynamicResource hideOnStartup}" Icon="&#xed1a;">
39+
<cc:Card
40+
Title="{DynamicResource hideOnStartup}"
41+
Icon="&#xed1a;"
42+
Sub="{DynamicResource hideOnStartupToolTip}">
4043
<ui:ToggleSwitch
4144
IsOn="{Binding Settings.HideOnStartup}"
4245
OffContent="{DynamicResource disable}"
4346
OnContent="{DynamicResource enable}" />
4447
</cc:Card>
4548

46-
<cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 30 0 0">
49+
<cc:Card Title="{DynamicResource hideFlowLauncherWhenLoseFocus}" Margin="0 14 0 0">
4750
<ui:ToggleSwitch
4851
IsOn="{Binding Settings.HideWhenDeactivated}"
4952
OffContent="{DynamicResource disable}"
@@ -57,7 +60,7 @@
5760
OnContent="{DynamicResource enable}" />
5861
</cc:Card>
5962

60-
<cc:CardGroup Margin="0 30 0 0">
63+
<cc:CardGroup Margin="0 14 0 0">
6164
<cc:Card Title="{DynamicResource SearchWindowPosition}" Icon="&#xe7f4;">
6265
<StackPanel Orientation="Horizontal">
6366
<ComboBox
@@ -121,6 +124,7 @@
121124

122125
<cc:Card
123126
Title="{DynamicResource ignoreHotkeysOnFullscreen}"
127+
Margin="0 14 0 0"
124128
Icon="&#xe7fc;"
125129
Sub="{DynamicResource ignoreHotkeysOnFullscreenToolTip}">
126130
<ui:ToggleSwitch
@@ -131,7 +135,7 @@
131135

132136
<cc:Card
133137
Title="{DynamicResource AlwaysPreview}"
134-
Margin="0 30 0 0"
138+
Margin="0 14 0 0"
135139
Icon="&#xe8a1;"
136140
Sub="{DynamicResource AlwaysPreviewToolTip}">
137141
<ui:ToggleSwitch
@@ -143,7 +147,7 @@
143147

144148
<cc:Card
145149
Title="{DynamicResource autoUpdates}"
146-
Margin="0 30 0 0"
150+
Margin="0 14 0 0"
147151
Icon="&#xecc5;">
148152
<ui:ToggleSwitch
149153
IsOn="{Binding AutoUpdates}"
@@ -161,7 +165,7 @@
161165
OnContent="{DynamicResource enable}" />
162166
</cc:Card>
163167

164-
<cc:CardGroup Margin="0 30 0 0">
168+
<cc:CardGroup Margin="0 14 0 0">
165169
<cc:Card Title="{DynamicResource querySearchPrecision}" Sub="{DynamicResource querySearchPrecisionToolTip}">
166170
<ComboBox
167171
MaxWidth="200"
@@ -182,7 +186,7 @@
182186

183187
<cc:Card
184188
Title="{DynamicResource defaultFileManager}"
185-
Margin="0 30 0 0"
189+
Margin="0 14 0 0"
186190
Icon="&#xe838;"
187191
Sub="{DynamicResource defaultFileManagerToolTip}">
188192
<Button
@@ -205,7 +209,7 @@
205209
Content="{Binding Settings.CustomBrowser.Name}" />
206210
</cc:Card>
207211

208-
<cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 30 0 0">
212+
<cc:Card Title="{DynamicResource pythonFilePath}" Margin="0 14 0 0">
209213
<StackPanel Orientation="Horizontal">
210214
<TextBox
211215
Width="300"
@@ -235,7 +239,7 @@
235239

236240
<cc:Card
237241
Title="{DynamicResource typingStartEn}"
238-
Margin="0 30 0 0"
242+
Margin="0 14 0 0"
239243
Icon="&#xe8d3;"
240244
Sub="{DynamicResource typingStartEnTooltip}">
241245
<ui:ToggleSwitch
@@ -257,7 +261,7 @@
257261

258262
<cc:Card
259263
Title="{DynamicResource language}"
260-
Margin="0 30 0 0"
264+
Margin="0 14 0 0"
261265
Icon="&#xf2b7;">
262266
<ComboBox
263267
MaxWidth="200"

‎Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@
368368
<!-- Drop shadow effect -->
369369
<cc:Card
370370
Title="{DynamicResource queryWindowShadowEffect}"
371-
Margin="0 4 0 0"
371+
Margin="0 8 0 0"
372372
Icon="&#xeb91;"
373373
Sub="{DynamicResource shadowEffectCPUUsage}">
374374
<ui:ToggleSwitch
@@ -515,7 +515,7 @@
515515
<!-- Fonts and icons -->
516516
<cc:Card
517517
Title="{DynamicResource useGlyphUI}"
518-
Margin="0 6 0 0"
518+
Margin="0 14 0 0"
519519
Icon="&#xf6b8;"
520520
Sub="{DynamicResource useGlyphUIEffect}">
521521
<ui:ToggleSwitch
@@ -525,7 +525,7 @@
525525
</cc:Card>
526526

527527
<!-- Time and date -->
528-
<cc:CardGroup Margin="0 11 0 0">
528+
<cc:CardGroup Margin="0 14 0 0">
529529
<cc:Card Title="{DynamicResource Clock}" Icon="&#xec92;">
530530
<StackPanel Orientation="Horizontal">
531531
<TextBlock
@@ -570,7 +570,7 @@
570570
</cc:CardGroup>
571571

572572
<!-- Animation -->
573-
<cc:CardGroup Margin="0 11 0 0">
573+
<cc:CardGroup Margin="0 14 0 0">
574574
<cc:Card
575575
Title="{DynamicResource Animation}"
576576
Icon="&#xedb5;"
@@ -607,7 +607,7 @@
607607
</cc:CardGroup>
608608

609609
<!-- SFX -->
610-
<cc:CardGroup Margin="0 11 0 0">
610+
<cc:CardGroup Margin="0 14 0 0">
611611
<cc:Card
612612
Title="{DynamicResource SoundEffect}"
613613
Icon="&#xe7f5;"
@@ -678,7 +678,7 @@
678678
<!-- Settings color scheme -->
679679
<cc:Card
680680
Title="{DynamicResource ColorScheme}"
681-
Margin="0 11 0 0"
681+
Margin="0 14 0 0"
682682
Icon="&#xe793;">
683683
<ComboBox
684684
MinWidth="180"
@@ -691,7 +691,10 @@
691691
</cc:Card>
692692

693693
<!-- Theme folder -->
694-
<cc:Card Title="{DynamicResource ThemeFolder}" Icon="&#xe838;">
694+
<cc:Card
695+
Title="{DynamicResource ThemeFolder}"
696+
Margin="0 14 0 0"
697+
Icon="&#xe838;">
695698
<Button
696699
MinWidth="180"
697700
Command="{Binding OpenThemesFolderCommand}"

0 commit comments

Comments
 (0)