Skip to content

Commit e940686

Browse files
Jack251970Jack251970
committed
Use SettingsCard & SettingsExpander & HyperLinkButton & InfoBar from UI.Modern.WPF
1 parent e67fe57 commit e940686

File tree

7 files changed

+1176
-1114
lines changed

7 files changed

+1176
-1114
lines changed

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

Lines changed: 75 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
66
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
7+
xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
78
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
89
xmlns:settingsVm="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
910
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
@@ -18,7 +19,6 @@
1819
</ResourceDictionary>
1920
</ui:Page.Resources>
2021
<ui:ScrollViewerEx
21-
Margin="0"
2222
FontSize="14"
2323
VirtualizingStackPanel.IsVirtualizing="True"
2424
VirtualizingStackPanel.ScrollUnit="Pixel">
@@ -30,80 +30,82 @@
3030
Text="{DynamicResource about}"
3131
TextAlignment="left" />
3232

33-
<cc:Card
34-
Title="{Binding Version}"
35-
Icon="&#xe946;"
36-
Sub="{DynamicResource version}">
37-
<StackPanel Orientation="Horizontal">
33+
<ui:SettingsCard Description="{DynamicResource version}" Header="{Binding Version}">
34+
<ui:SettingsCard.HeaderIcon>
35+
<ui:FontIcon Glyph="&#xe946;" />
36+
</ui:SettingsCard.HeaderIcon>
37+
38+
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
3839
<Button
39-
Margin="0 0 10 0"
40+
x:Name="UpdateAppButton"
4041
Command="{Binding UpdateAppCommand}"
4142
Content="{DynamicResource checkUpdates}" />
42-
<Button Padding="0" Style="{StaticResource AccentButtonStyle}">
43+
<Button Height="{Binding ElementName=UpdateAppButton, Path=ActualHeight}" Style="{StaticResource AccentButtonStyle}">
4344
<Hyperlink
4445
NavigateUri="{Binding SponsorPage}"
4546
RequestNavigate="OnRequestNavigate"
4647
TextDecorations="None">
47-
<TextBlock
48-
Padding="10 5"
49-
Foreground="{StaticResource SystemControlForegroundAltHighBrush}"
50-
Text="{DynamicResource BecomeASponsor}" />
48+
<TextBlock Foreground="{StaticResource SystemControlForegroundAltHighBrush}" Text="{DynamicResource BecomeASponsor}" />
5149
</Hyperlink>
5250
</Button>
53-
</StackPanel>
54-
</cc:Card>
51+
</ikw:SimpleStackPanel>
52+
</ui:SettingsCard>
5553

56-
<cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
57-
<Button Command="{Binding OpenReleaseNotesCommand}" Content="{DynamicResource releaseNotes}" />
58-
</cc:Card>
54+
<ui:SettingsCard Header="{DynamicResource releaseNotes}">
55+
<ui:SettingsCard.HeaderIcon>
56+
<ui:FontIcon Glyph="&#xe8fd;" />
57+
</ui:SettingsCard.HeaderIcon>
5958

59+
<Button Command="{Binding OpenReleaseNotesCommand}" Content="{DynamicResource releaseNotes}" />
60+
</ui:SettingsCard>
6061

61-
<cc:Card
62-
Title="{DynamicResource userdatapath}"
62+
<ui:SettingsCard
6363
Margin="0 14 0 0"
64-
Icon="&#xEC25;;"
65-
Sub="{DynamicResource userdatapathToolTip}">
66-
<StackPanel Orientation="Horizontal">
67-
<Button Command="{Binding OpenParentOfSettingsFolderCommand}" Content="{DynamicResource userdatapathButton}" />
68-
</StackPanel>
69-
</cc:Card>
64+
Description="{DynamicResource userdatapathToolTip}"
65+
Header="{DynamicResource userdatapath}">
66+
<ui:SettingsCard.HeaderIcon>
67+
<ui:FontIcon Glyph="&#xEC25;" />
68+
</ui:SettingsCard.HeaderIcon>
69+
70+
<Button Command="{Binding OpenParentOfSettingsFolderCommand}" Content="{DynamicResource userdatapathButton}" />
71+
</ui:SettingsCard>
72+
73+
<ui:SettingsCard Margin="0 14 0 0" Header="{DynamicResource website}">
74+
<ui:SettingsCard.HeaderIcon>
75+
<ui:FontIcon Glyph="&#xeb41;" />
76+
</ui:SettingsCard.HeaderIcon>
7077

71-
<cc:Card
72-
Title="{DynamicResource website}"
73-
Margin="0 14 0 0"
74-
Icon="&#xeb41;">
7578
<StackPanel Orientation="Horizontal">
76-
<cc:HyperLink
77-
Margin="0 0 12 0"
78-
Text="{DynamicResource website}"
79-
Uri="{Binding Website}" />
80-
<cc:HyperLink
81-
Margin="0 0 12 0"
82-
Text="{DynamicResource documentation}"
83-
Uri="{Binding Documentation}" />
84-
<cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
79+
<ui:HyperlinkButton Content="{DynamicResource website}" NavigateUri="{Binding Website}" />
80+
<ui:HyperlinkButton Content="{DynamicResource documentation}" NavigateUri="{Binding Documentation}" />
81+
<ui:HyperlinkButton Content="{DynamicResource github}" NavigateUri="{Binding Github}" />
8582
</StackPanel>
86-
</cc:Card>
83+
</ui:SettingsCard>
8784

88-
<cc:Card Title="{DynamicResource icons}" Icon="&#xE8FE;">
89-
<cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
90-
</cc:Card>
85+
<ui:SettingsCard Header="{DynamicResource icons}">
86+
<ui:SettingsCard.HeaderIcon>
87+
<ui:FontIcon Glyph="&#xE8FE;" />
88+
</ui:SettingsCard.HeaderIcon>
9189

92-
<cc:Card
93-
Title="{DynamicResource devtool}"
94-
Margin="0 12 0 0"
95-
Icon="&#xf12b;">
96-
<StackPanel Orientation="Horizontal">
90+
<ui:HyperlinkButton Content="icons8.com" NavigateUri="https://icons8.com/" />
91+
</ui:SettingsCard>
92+
93+
<ui:SettingsCard Margin="0 14 0 0" Header="{DynamicResource devtool}">
94+
<ui:SettingsCard.HeaderIcon>
95+
<ui:FontIcon Glyph="&#xf12b;" />
96+
</ui:SettingsCard.HeaderIcon>
97+
98+
<ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12">
9799
<Button
98-
Margin="0 0 12 0"
100+
x:Name="AskClearCacheFolderConfirmationButton"
99101
Command="{Binding AskClearCacheFolderConfirmationCommand}"
100102
Content="{Binding CacheFolderSize, Mode=OneWay}" />
101103
<Button
102-
Margin="0 0 12 0"
104+
Height="{Binding ElementName=AskClearCacheFolderConfirmationButton, Path=ActualHeight}"
103105
Command="{Binding AskClearLogFolderConfirmationCommand}"
104106
Content="{Binding LogFolderSize, Mode=OneWay}" />
105-
<Button>
106-
<ui:FontIcon FontSize="20" Glyph="&#xec7a;" />
107+
<Button Height="{Binding ElementName=AskClearCacheFolderConfirmationButton, Path=ActualHeight}">
108+
<ui:FontIcon FontSize="16" Glyph="&#xec7a;" />
107109
<ui:FlyoutService.Flyout>
108110
<ui:MenuFlyout>
109111
<MenuItem Command="{Binding OpenWelcomeWindowCommand}" Header="{DynamicResource welcomewindow}">
@@ -132,28 +134,31 @@
132134
</ui:MenuFlyout>
133135
</ui:FlyoutService.Flyout>
134136
</Button>
135-
</StackPanel>
136-
</cc:Card>
137+
</ikw:SimpleStackPanel>
138+
</ui:SettingsCard>
139+
140+
<ui:SettingsExpander Margin="0 14 0 0" Header="{DynamicResource advanced}">
141+
<ui:SettingsExpander.HeaderIcon>
142+
<ui:FontIcon Glyph="&#xE8B7;" />
143+
</ui:SettingsExpander.HeaderIcon>
144+
145+
<ui:SettingsExpander.Items>
146+
<ui:SettingsCard Header="{DynamicResource logLevel}">
147+
<ui:SettingsCard.HeaderIcon>
148+
<ui:FontIcon Glyph="&#xE749;" />
149+
</ui:SettingsCard.HeaderIcon>
137150

138-
<cc:ExCard
139-
Title="{DynamicResource advanced}"
140-
Margin="0 14 0 0"
141-
Icon="&#xE8B7;">
142-
<StackPanel>
143-
<cc:Card
144-
Title="{DynamicResource logLevel}"
145-
Icon="&#xE749;"
146-
Type="Inside">
147151
<ComboBox
148152
DisplayMemberPath="Display"
149153
ItemsSource="{Binding LogLevels}"
150154
SelectedValue="{Binding LogLevel}"
151155
SelectedValuePath="Value" />
152-
</cc:Card>
153-
<cc:Card
154-
Title="{DynamicResource settingWindowFontTitle}"
155-
Icon="&#xf259;"
156-
Type="Inside">
156+
</ui:SettingsCard>
157+
<ui:SettingsCard Header="{DynamicResource settingWindowFontTitle}">
158+
<ui:SettingsCard.HeaderIcon>
159+
<ui:FontIcon Glyph="&#xf259;" />
160+
</ui:SettingsCard.HeaderIcon>
161+
157162
<StackPanel Orientation="Horizontal">
158163
<Button Command="{Binding ResetSettingWindowFontCommand}" Content="{DynamicResource commonReset}" />
159164
<ComboBox
@@ -165,9 +170,9 @@
165170
SelectedValue="{Binding SettingWindowFont, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
166171
SelectedValuePath="Source" />
167172
</StackPanel>
168-
</cc:Card>
169-
</StackPanel>
170-
</cc:ExCard>
173+
</ui:SettingsCard>
174+
</ui:SettingsExpander.Items>
175+
</ui:SettingsExpander>
171176

172177
<TextBlock
173178
Margin="14 20 0 0"

0 commit comments

Comments
 (0)