Skip to content

Commit cf54a67

Browse files
onesoundsonesounds
committed
Merge branch 'dev' into 240430PreviewSetting
2 parents e0ff7d2 + cffbd9a commit cf54a67

File tree

5 files changed

+95
-46
lines changed

5 files changed

+95
-46
lines changed

‎Flow.Launcher.sln

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
5454
Scripts\post_build.ps1 = Scripts\post_build.ps1
5555
README.md = README.md
5656
SolutionAssemblyInfo.cs = SolutionAssemblyInfo.cs
57+
Settings.XamlStyler = Settings.XamlStyler
5758
EndProjectSection
5859
EndProject
5960
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Shell", "Plugins\Flow.Launcher.Plugin.Shell\Flow.Launcher.Plugin.Shell.csproj", "{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0}"

‎Flow.Launcher/Resources/Controls/ExCard.xaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
x:Name="expanderHeader"
1515
Padding="0"
1616
BorderThickness="1"
17-
IsExpanded="{Binding Mode=TwoWay, Path=IsExpanded}"
1817
SnapsToDevicePixels="False">
1918
<Expander.Style>
2019
<Style TargetType="{x:Type Expander}">
@@ -54,7 +53,7 @@
5453
FontStyle="{TemplateBinding FontStyle}"
5554
FontWeight="{TemplateBinding FontWeight}"
5655
Foreground="{TemplateBinding Foreground}"
57-
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource TemplatedParent}}">
56+
IsChecked="{Binding IsExpanded, Mode=TwoWay, RelativeSource={RelativeSource AncestorType=Expander}}">
5857
<ToggleButton.Style>
5958
<Style TargetType="{x:Type ToggleButton}">
6059
<Setter Property="Template">

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

Lines changed: 48 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,20 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:sys="clr-namespace:System;assembly=mscorlib"
88
xmlns:ui="http://schemas.modernwpf.com/2019"
9-
xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
109
xmlns:viewModels="clr-namespace:Flow.Launcher.SettingPages.ViewModels"
10+
xmlns:wpftk="clr-namespace:WpfToolkit.Controls;assembly=VirtualizingWrapPanel"
1111
Title="PluginStore"
12-
FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
13-
KeyDown="SettingsPanePlugins_OnKeyDown"
1412
d:DataContext="{d:DesignInstance viewModels:SettingsPanePluginStoreViewModel}"
1513
d:DesignHeight="450"
1614
d:DesignWidth="800"
15+
FocusManager.FocusedElement="{Binding ElementName=PluginStoreFilterTextbox}"
16+
KeyDown="SettingsPanePlugins_OnKeyDown"
1717
mc:Ignorable="d">
1818
<ui:Page.Resources>
19-
<CollectionViewSource x:Key="PluginStoreCollectionView" Source="{Binding ExternalPlugins}" Filter="PluginStoreCollectionView_OnFilter">
19+
<CollectionViewSource
20+
x:Key="PluginStoreCollectionView"
21+
Filter="PluginStoreCollectionView_OnFilter"
22+
Source="{Binding ExternalPlugins}">
2023
<CollectionViewSource.GroupDescriptions>
2124
<PropertyGroupDescription PropertyName="Category" />
2225
</CollectionViewSource.GroupDescriptions>
@@ -34,9 +37,9 @@
3437
<Border
3538
Grid.Row="0"
3639
Grid.Column="0"
37-
Padding="5 18 0 0">
40+
Padding="5,18,0,0">
3841
<TextBlock
39-
Margin="0 5"
42+
Margin="0,5"
4043
FontSize="30"
4144
Style="{StaticResource PageTitle}"
4245
Text="{DynamicResource pluginStore}"
@@ -46,13 +49,13 @@
4649
<DockPanel
4750
Grid.Row="0"
4851
Grid.Column="1"
49-
Margin="5 24 0 0">
52+
Margin="5,24,0,0">
5053

5154
<TextBox
5255
Name="PluginStoreFilterTextbox"
5356
Width="150"
5457
Height="34"
55-
Margin="0 0 26 0"
58+
Margin="0,0,26,0"
5659
HorizontalAlignment="Right"
5760
ContextMenu="{StaticResource TextBoxContextMenu}"
5861
DockPanel.Dock="Right"
@@ -72,7 +75,7 @@
7275
Stretch="None">
7376
<VisualBrush.Visual>
7477
<Label
75-
Padding="10 0 0 0"
78+
Padding="10,0,0,0"
7679
Content="{DynamicResource searchplugin}"
7780
Foreground="{DynamicResource CustomContextDisabled}" />
7881
</VisualBrush.Visual>
@@ -94,8 +97,8 @@
9497
</TextBox>
9598
<Button
9699
Height="34"
97-
Margin="0 5 10 5"
98-
Padding="12 4"
100+
Margin="0,5,10,5"
101+
Padding="12,4"
99102
HorizontalAlignment="Right"
100103
VerticalAlignment="Center"
101104
Command="{Binding RefreshExternalPluginsCommand}"
@@ -108,8 +111,8 @@
108111
Grid.Row="1"
109112
Grid.Column="0"
110113
Grid.ColumnSpan="2"
111-
Margin="4 0 0 0"
112-
Padding="0 0 18 0"
114+
Margin="4,0,0,0"
115+
Padding="0,0,18,0"
113116
FontSize="14"
114117
ItemContainerStyle="{StaticResource StoreList}"
115118
ItemsSource="{Binding Source={StaticResource PluginStoreCollectionView}}"
@@ -124,7 +127,7 @@
124127
<ItemsPanelTemplate>
125128
<wpftk:VirtualizingWrapPanel
126129
x:Name="ItemWrapPanel"
127-
Margin="0 0 0 10"
130+
Margin="0,0,0,10"
128131
ItemSize="216,184"
129132
MouseWheelDelta="48"
130133
Orientation="Vertical"
@@ -143,7 +146,7 @@
143146
<Grid>
144147
<StackPanel Orientation="Vertical">
145148
<TextBlock
146-
Margin="2 0 0 10"
149+
Margin="2,0,0,10"
147150
VerticalAlignment="Top"
148151
FontSize="16"
149152
FontWeight="Bold"
@@ -159,7 +162,7 @@
159162
</GroupStyle.ContainerStyle>
160163
<GroupStyle.Panel>
161164
<ItemsPanelTemplate>
162-
<VirtualizingStackPanel Orientation="{Binding Orientation, Mode=OneWay}" />
165+
<VirtualizingStackPanel />
163166
</ItemsPanelTemplate>
164167
</GroupStyle.Panel>
165168
</GroupStyle>
@@ -231,10 +234,10 @@
231234
<VirtualizingStackPanel
232235
Grid.Row="0"
233236
Grid.Column="0"
234-
Margin="5 0 0 0"
237+
Margin="5,0,0,0"
235238
Orientation="Horizontal">
236239
<TextBlock
237-
Margin="0 0 5 0"
240+
Margin="0,0,5,0"
238241
VerticalAlignment="Center"
239242
FontSize="14"
240243
FontWeight="Bold"
@@ -253,9 +256,12 @@
253256
<TextBlock
254257
Grid.Row="1"
255258
Grid.Column="0"
256-
Margin="5 4 0 0"
259+
Margin="5,4,0,0"
257260
TextWrapping="Wrap">
258-
<Hyperlink Foreground="{DynamicResource Color04B}" NavigateUri="{Binding Website}" RequestNavigate="Hyperlink_OnRequestNavigate">
261+
<Hyperlink
262+
Foreground="{DynamicResource Color04B}"
263+
NavigateUri="{Binding Website}"
264+
RequestNavigate="Hyperlink_OnRequestNavigate">
259265
<Run FontSize="12" Text="{Binding Author, Mode=OneWay}" />
260266
</Hyperlink>
261267
</TextBlock>
@@ -264,40 +270,40 @@
264270
Grid.Row="0"
265271
Grid.RowSpan="2"
266272
Grid.Column="1"
267-
Margin="20 0 0 0"
273+
Margin="20,0,0,0"
268274
HorizontalAlignment="Right"
269275
Orientation="Horizontal">
270276
<Button
271277
MinHeight="42"
272-
Margin="5 0"
273-
Padding="15 5"
278+
Margin="5,0"
279+
Padding="15,5"
274280
HorizontalAlignment="Stretch"
275281
VerticalAlignment="Center"
276-
Content="{DynamicResource installbtn}"
277-
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}"
278282
Command="{Binding ShowCommandQueryCommand}"
279-
CommandParameter="install" />
283+
CommandParameter="install"
284+
Content="{DynamicResource installbtn}"
285+
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}, ConverterParameter='!'}" />
280286
<Button
281287
MinHeight="42"
282-
Margin="5 0"
283-
Padding="15 5"
288+
Margin="5,0"
289+
Padding="15,5"
284290
HorizontalAlignment="Right"
285291
VerticalAlignment="Center"
286-
Content="{DynamicResource uninstallbtn}"
287-
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}"
288292
Command="{Binding ShowCommandQueryCommand}"
289-
CommandParameter="uninstall" />
293+
CommandParameter="uninstall"
294+
Content="{DynamicResource uninstallbtn}"
295+
Visibility="{Binding LabelInstalled, Converter={StaticResource BoolToVisibilityConverter}}" />
290296
<Button
291297
MinHeight="42"
292-
Margin="5 0"
293-
Padding="15 5"
298+
Margin="5,0"
299+
Padding="15,5"
294300
HorizontalAlignment="Right"
295301
VerticalAlignment="Center"
302+
Command="{Binding ShowCommandQueryCommand}"
303+
CommandParameter="update"
296304
Content="{DynamicResource updatebtn}"
297305
Style="{DynamicResource AccentButtonStyle}"
298-
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}"
299-
Command="{Binding ShowCommandQueryCommand}"
300-
CommandParameter="update" />
306+
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
301307
</VirtualizingStackPanel>
302308
</Grid>
303309
</ui:Flyout>
@@ -308,15 +314,15 @@
308314
<Image
309315
Width="32"
310316
Height="32"
311-
Margin="18 24 0 0"
317+
Margin="18,24,0,0"
312318
HorizontalAlignment="Left"
313319
RenderOptions.BitmapScalingMode="Fant"
314320
Source="{Binding IcoPath, IsAsync=True}" />
315321
<Border
316322
x:Name="LabelUpdate"
317323
Height="12"
318-
Margin="10 24 0 0"
319-
Padding="6 2"
324+
Margin="10,24,0,0"
325+
Padding="6,2"
320326
HorizontalAlignment="Left"
321327
VerticalAlignment="Top"
322328
Background="#45BD59"
@@ -325,16 +331,16 @@
325331
Visibility="{Binding LabelUpdate, Converter={StaticResource BoolToVisibilityConverter}}" />
326332
</StackPanel>
327333
<TextBlock
328-
Margin="18 10 18 0"
334+
Margin="18,10,18,0"
329335
FontWeight="SemiBold"
330336
Foreground="{DynamicResource Color05B}"
331337
Text="{Binding Name}"
332338
TextWrapping="Wrap"
333339
ToolTip="{Binding Version}" />
334340
<TextBlock
335341
Height="60"
336-
Margin="18 6 18 0"
337-
Padding="0 0 0 10"
342+
Margin="18,6,18,0"
343+
Padding="0,0,0,10"
338344
FontSize="12"
339345
Foreground="{DynamicResource Color04B}"
340346
Text="{Binding Description, Mode=OneWay}"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
d:DataContext="{d:DesignInstance viewModels:SettingsPaneThemeViewModel}"
1515
d:DesignHeight="450"
1616
d:DesignWidth="800"
17-
Style="{DynamicResource SettingPageBasic}"
1817
mc:Ignorable="d">
1918
<ui:Page.Resources>
2019
<ResourceDictionary>
@@ -112,10 +111,12 @@
112111
Visibility="Visible" />
113112

114113
<flowlauncher:ResultListBox
114+
x:Name="ResultListBox"
115115
Grid.Row="2"
116116
DataContext="{Binding PreviewResults, Mode=OneTime}"
117117
Visibility="Visible" />
118-
118+
<Border x:Name="ContextMenu" Visibility="Collapsed" />
119+
<Border x:Name="History" Visibility="Collapsed" />
119120
</Grid>
120121
</Border>
121122
</Border>

‎Settings.XamlStyler

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
{
2+
"AttributesTolerance": 2,
3+
"KeepFirstAttributeOnSameLine": false,
4+
"MaxAttributeCharactersPerLine": 0,
5+
"MaxAttributesPerLine": 1,
6+
"NewlineExemptionElements": "RadialGradientBrush, GradientStop, LinearGradientBrush, ScaleTransform, SkewTransform, RotateTransform, TranslateTransform, Trigger, Condition, Setter",
7+
"SeparateByGroups": false,
8+
"AttributeIndentation": 0,
9+
"AttributeIndentationStyle": 1,
10+
"RemoveDesignTimeReferences": false,
11+
"IgnoreDesignTimeReferencePrefix": false,
12+
"EnableAttributeReordering": true,
13+
"AttributeOrderingRuleGroups": [
14+
"x:Class",
15+
"xmlns, xmlns:x",
16+
"xmlns:*",
17+
"x:Key, Key, x:Name, Name, x:Uid, Uid, Title",
18+
"Grid.Row, Grid.RowSpan, Grid.Column, Grid.ColumnSpan, Canvas.Left, Canvas.Top, Canvas.Right, Canvas.Bottom",
19+
"Width, Height, MinWidth, MinHeight, MaxWidth, MaxHeight",
20+
"Margin, Padding, HorizontalAlignment, VerticalAlignment, HorizontalContentAlignment, VerticalContentAlignment, Panel.ZIndex",
21+
"*:*, *",
22+
"PageSource, PageIndex, Offset, Color, TargetName, Property, Value, StartPoint, EndPoint",
23+
"mc:Ignorable, d:IsDataSource, d:LayoutOverrides, d:IsStaticText",
24+
"Storyboard.*, From, To, Duration"
25+
],
26+
"FirstLineAttributes": "",
27+
"OrderAttributesByName": true,
28+
"PutEndingBracketOnNewLine": false,
29+
"RemoveEndingTagOfEmptyElement": true,
30+
"SpaceBeforeClosingSlash": true,
31+
"RootElementLineBreakRule": 0,
32+
"ReorderVSM": 2,
33+
"ReorderGridChildren": false,
34+
"ReorderCanvasChildren": false,
35+
"ReorderSetters": 0,
36+
"FormatMarkupExtension": true,
37+
"NoNewLineMarkupExtensions": "x:Bind, Binding",
38+
"ThicknessSeparator": 1,
39+
"ThicknessAttributes": "Margin, Padding, BorderThickness, ThumbnailClipMargin, CornerRadius",
40+
"FormatOnSave": true,
41+
"CommentPadding": 2,
42+
}

0 commit comments

Comments
 (0)