prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'SmallFix' into AdjustWebsearchPlugin

Browse source
This commit is contained in:
DB p 2021-10-30 02:31:51 +09:00
commit 6e850cd1da
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Flow.Launcher/Languages/en.xaml
View file

@ -68,7 +68,8 @@
<!--Setting Theme--> <!--Setting Theme-->
<system:String x:Key="theme">Theme</system:String> <system:String x:Key="theme">Theme</system:String>
<system:String x:Key="browserMoreThemes">Browse for more themes</system:String> <system:String x:Key="browserMoreThemes">Theme Gallery</system:String>
<system:String x:Key="howToCreateTheme">How to create a theme</system:String>
<system:String x:Key="hiThere">Hi There</system:String> <system:String x:Key="hiThere">Hi There</system:String>
<system:String x:Key="queryBoxFont">Query Box Font</system:String> <system:String x:Key="queryBoxFont">Query Box Font</system:String>
<system:String x:Key="resultItemFont">Result Item Font</system:String> <system:String x:Key="resultItemFont">Result Item Font</system:String>

5
Flow.Launcher/SettingWindow.xaml
View file

@ -645,6 +645,7 @@
</Border> </Border>
<Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0"> <Border Grid.Column="0" Grid.Row="1" Background="#f3f3f3" Padding="0 0 0 0">
<ListBox SelectedItem="{Binding SelectedPlugin}" <ListBox SelectedItem="{Binding SelectedPlugin}"
ScrollViewer.CanContentScroll="False"
ItemsSource="{Binding PluginViewModels}" ItemsSource="{Binding PluginViewModels}"
Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled" Margin="5, 0, 0, 0" ScrollViewer.HorizontalScrollBarVisibility="Disabled"
ItemContainerStyle="{StaticResource PluginList}" ItemContainerStyle="{StaticResource PluginList}"
@ -1176,7 +1177,7 @@
<TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right"> <TextBlock DockPanel.Dock="Top" Margin="10" HorizontalAlignment="Right">
<Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}" <Hyperlink NavigateUri="{Binding Theme, Mode=OneWay}"
RequestNavigate="OnRequestNavigate"> RequestNavigate="OnRequestNavigate">
<Run Text="{DynamicResource browserMoreThemes}" /> <Run Text="{DynamicResource howToCreateTheme}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
</Border> </Border>
@ -1582,4 +1583,4 @@
</Border> </Border>
</TabItem> </TabItem>
</TabControl> </TabControl>
</Window> </Window>

2
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -272,7 +272,7 @@ namespace Flow.Launcher.ViewModel
#region theme #region theme
public static string Theme => @"http://www.wox.one/theme/builder"; public static string Theme => @"https://flow-launcher.github.io/docs/#/how-to-create-a-theme";
public string SelectedTheme public string SelectedTheme
{ {