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

Change Glyph property to style

Browse source
This commit is contained in:
DB p 2021-11-17 07:56:32 +09:00
parent adb00d82f1
commit fca65603ea
2 changed files with 36 additions and 143 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Flow.Launcher/Resources/CustomControlTemplate.xaml
View file

@ -10,6 +10,11 @@
<Setter Property="Foreground" Value="{StaticResource Color05B}" /> <Setter Property="Foreground" Value="{StaticResource Color05B}" />
</Style> </Style>
<Style x:Key="Glyph" TargetType="{x:Type TextBlock}"> <Style x:Key="Glyph" TargetType="{x:Type TextBlock}">
<Setter Property="Grid.Column" Value="0" />
<Setter Property="Margin" Value="24 0 16 0" />
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontSize" Value="20" />
<Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
<Setter Property="Foreground" Value="{StaticResource Color05B}" /> <Setter Property="Foreground" Value="{StaticResource Color05B}" />
</Style> </Style>
<Style x:Key="TabMenu" TargetType="{x:Type TextBlock}"> <Style x:Key="TabMenu" TargetType="{x:Type TextBlock}">

174
Flow.Launcher/SettingWindow.xaml
View file

@ -118,6 +118,12 @@
<Setter Property="Margin" Value="0,4,0,4" /> <Setter Property="Margin" Value="0,4,0,4" />
</Style> </Style>
<Style x:Key="SideTextAbout" TargetType="{x:Type TextBlock}">
<Setter Property="HorizontalAlignment" Value="Right" />
<Setter Property="Grid.Column" Value="1" />
<Setter Property="Margin" Value="0,0,-18,0" />
</Style>
<Style x:Key="logo" TargetType="{x:Type TabItem}"> <Style x:Key="logo" TargetType="{x:Type TabItem}">
<!--#region Logo Style--> <!--#region Logo Style-->
<Setter Property="Margin" Value="0" /> <Setter Property="Margin" Value="0" />
@ -565,13 +571,7 @@
IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}" IsChecked="{Binding Settings.StartFlowLauncherOnSystemStartup}"
Style="{DynamicResource SideControlCheckBox}" Style="{DynamicResource SideControlCheckBox}"
Unchecked="OnAutoStartupUncheck" /> Unchecked="OnAutoStartupUncheck" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe8fc; &#xe8fc;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -583,13 +583,7 @@
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource hideOnStartup}" />
</StackPanel> </StackPanel>
<CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" /> <CheckBox IsChecked="{Binding Settings.HideOnStartup}" Style="{DynamicResource SideControlCheckBox}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xed1a; &#xed1a;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -630,13 +624,7 @@
<TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" /> <TextBlock Style="{DynamicResource SettingSubTitleLabel}" Text="{DynamicResource ignoreHotkeysOnFullscreenToolTip}" />
</StackPanel> </StackPanel>
<CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" /> <CheckBox IsChecked="{Binding Settings.IgnoreHotkeysOnFullscreen}" Style="{DynamicResource SideControlCheckBox}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe7fc; &#xe7fc;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -652,13 +640,7 @@
IsChecked="{Binding Settings.ShouldUsePinyin}" IsChecked="{Binding Settings.ShouldUsePinyin}"
Style="{DynamicResource SideControlCheckBox}" Style="{DynamicResource SideControlCheckBox}"
ToolTip="{DynamicResource ShouldUsePinyinToolTip}" /> ToolTip="{DynamicResource ShouldUsePinyinToolTip}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe98a; &#xe98a;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -675,13 +657,7 @@
FocusVisualMargin="5" FocusVisualMargin="5"
IsOn="{Binding AutoUpdates}" IsOn="{Binding AutoUpdates}"
Style="{DynamicResource SideToggleSwitch}" /> Style="{DynamicResource SideToggleSwitch}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xecc5; &#xecc5;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -699,13 +675,7 @@
FocusVisualMargin="5" FocusVisualMargin="5"
IsOn="{Binding PortableMode}" IsOn="{Binding PortableMode}"
Style="{DynamicResource SideToggleSwitch}" /> Style="{DynamicResource SideToggleSwitch}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe88e; &#xe88e;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -786,13 +756,7 @@
HorizontalContentAlignment="Center" HorizontalContentAlignment="Center"
ItemsSource="{Binding MaxResultsRange}" ItemsSource="{Binding MaxResultsRange}"
SelectedItem="{Binding Settings.MaxResultsToShow}" /> SelectedItem="{Binding Settings.MaxResultsToShow}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe8fd; &#xe8fd;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -819,13 +783,7 @@
Content="{Binding Settings.CustomExplorer.Name}" /> Content="{Binding Settings.CustomExplorer.Name}" />
</StackPanel> </StackPanel>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe838; &#xe838;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1597,13 +1555,7 @@
Width="100" Width="100"
Margin="0,0,2,0" Margin="0,0,2,0"
IsOn="{Binding DropShadowEffect, Mode=TwoWay}" /> IsOn="{Binding DropShadowEffect, Mode=TwoWay}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xeb91; &#xeb91;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1632,13 +1584,7 @@
TickFrequency="10" TickFrequency="10"
Value="{Binding WindowWidthSize, Mode=TwoWay}" /> Value="{Binding WindowWidthSize, Mode=TwoWay}" />
</StackPanel> </StackPanel>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe740; &#xe740;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1776,13 +1722,7 @@
Width="100" Width="100"
Margin="0,0,2,0" Margin="0,0,2,0"
IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" /> IsOn="{Binding UseGlyphIcons, Mode=TwoWay}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xf6b8; &#xf6b8;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1832,13 +1772,7 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe990; &#xe990;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1888,13 +1822,7 @@
</ComboBox.ItemTemplate> </ComboBox.ItemTemplate>
</ComboBox> </ComboBox>
</StackPanel> </StackPanel>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe8fd; &#xe8fd;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1916,13 +1844,7 @@
Click="OpenPluginFolder" Click="OpenPluginFolder"
Content="{DynamicResource OpenThemeFolder}" Content="{DynamicResource OpenThemeFolder}"
DockPanel.Dock="Top" /> DockPanel.Dock="Top" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe838; &#xe838;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -1992,13 +1914,7 @@
HotkeyChanged="OnHotkeyChanged" HotkeyChanged="OnHotkeyChanged"
Loaded="OnHotkeyControlLoaded" /> Loaded="OnHotkeyControlLoaded" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xeda7; &#xeda7;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -2361,17 +2277,12 @@
</StackPanel> </StackPanel>
<Button <Button
Grid.Column="1" Grid.Column="1"
Margin="0,0,-20,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Click="OnCheckUpdates" Click="OnCheckUpdates"
Content="{DynamicResource checkUpdates}" Content="{DynamicResource checkUpdates}"
Style="{StaticResource AccentButtonStyle}" /> Style="{StaticResource AccentButtonStyle}" />
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe895; &#xe895;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -2383,18 +2294,12 @@
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource website}" />
</StackPanel> </StackPanel>
<TextBlock Grid.Column="1" HorizontalAlignment="Right"> <TextBlock Style="{StaticResource SideTextAbout}">
<Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate"> <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
<Run Text="{Binding Website, Mode=OneWay}" /> <Run Text="{Binding Website, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xeb41; &#xeb41;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -2405,18 +2310,12 @@
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource releaseNotes}" />
</StackPanel> </StackPanel>
<TextBlock Grid.Column="1" HorizontalAlignment="Right"> <TextBlock Style="{StaticResource SideTextAbout}">
<Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate"> <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
<Run Text="{Binding ReleaseNotes, Mode=OneWay}" /> <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe8fd; &#xe8fd;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -2427,18 +2326,12 @@
<StackPanel Style="{StaticResource TextPanel}"> <StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" /> <TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource documentation}" />
</StackPanel> </StackPanel>
<TextBlock Grid.Column="1" HorizontalAlignment="Right"> <TextBlock Style="{StaticResource SideTextAbout}">
<Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate"> <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
<Run Text="{Binding Documentation, Mode=OneWay}" /> <Run Text="{Binding Documentation, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xe82f; &#xe82f;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>
@ -2451,6 +2344,7 @@
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Margin="0,0,-20,0"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Orientation="Horizontal"> Orientation="Horizontal">
<Button <Button
@ -2459,13 +2353,7 @@
Content="Setting Folder" /> Content="Setting Folder" />
<Button Click="OpenLogFolder" Content="Log Folder" /> <Button Click="OpenLogFolder" Content="Log Folder" />
</StackPanel> </StackPanel>
<TextBlock <TextBlock Style="{StaticResource Glyph}">
Grid.Column="0"
Margin="24,0,16,0"
VerticalAlignment="Center"
FontFamily="/Resources/#Segoe Fluent Icons"
FontSize="20"
Style="{StaticResource Glyph}">
&#xec7a; &#xec7a;
</TextBlock> </TextBlock>
</ItemsControl> </ItemsControl>