Skip to content

Commit 6e850cd

Browse files
committed
Merge branch 'SmallFix' into AdjustWebsearchPlugin
2 parents 0edbcfd + 37281a1 commit 6e850cd

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

Flow.Launcher/Languages/en.xaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@
6868

6969
<!--Setting Theme-->
7070
<system:String x:Key="theme">Theme</system:String>
71-
<system:String x:Key="browserMoreThemes">Browse for more themes</system:String>
71+
<system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
72+
<system:String x:Key="howToCreateTheme">How to create a theme</system:String>
7273
<system:String x:Key="hiThere">Hi There</system:String>
7374
<system:String x:Key="queryBoxFont">Query Box Font</system:String>
7475
<system:String x:Key="resultItemFont">Result Item Font</system:String>

Flow.Launcher/SettingWindow.xaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -645,6 +645,7 @@
645645
</Border>
646646
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
647647
<ListBox SelectedItem="{Binding SelectedPlugin}"
648+
ScrollViewer.CanContentScroll="False"
648649
ItemsSource="{Binding PluginViewModels}"
649650
Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
650651
ItemContainerStyle="{StaticResource PluginList}"
@@ -1176,7 +1177,7 @@
11761177
<TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right">
11771178
<Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}"
11781179
RequestNavigate="OnRequestNavigate">
1179-
<Run Text="{DynamicResource browserMoreThemes}" />
1180+
<Run Text="{DynamicResource howToCreateTheme}" />
11801181
</Hyperlink>
11811182
</TextBlock>
11821183
</Border>
@@ -1582,4 +1583,4 @@
15821583
</Border>
15831584
</TabItem>
15841585
</TabControl>
1585-
</Window>
1586+
</Window>

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ public async Task RefreshExternalPluginsAsync()
272272

273273
#region theme
274274

275-
public static string Theme => @"http://www.wox.one/theme/builder";
275+
public static string Theme => @"https://flow-launcher.github.io/docs/#/how-to-create-a-theme";
276276

277277
public string SelectedTheme
278278
{

0 commit comments

Comments
 (0)