Skip to content

Commit 697ddbc

Browse files
YusyurivYusyuriv
authored
Merge branch 'dev' into jsonrpc-v2-close-order
2 parents 87871b1 + 224a6b1 commit 697ddbc

File tree

22 files changed

+188
-60
lines changed

22 files changed

+188
-60
lines changed

‎Flow.Launcher/Flow.Launcher.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<OutputType>WinExe</OutputType>
55
<TargetFramework>net7.0-windows10.0.19041.0</TargetFramework>
66
<UseWPF>true</UseWPF>
7-
<UseWindowsForms>true</UseWindowsForms>
7+
<UseWindowsForms>false</UseWindowsForms>
88
<StartupObject>Flow.Launcher.App</StartupObject>
99
<ApplicationIcon>Resources\app.ico</ApplicationIcon>
1010
<ApplicationManifest>app.manifest</ApplicationManifest>

‎Flow.Launcher/Images/app_error.png

-13.2 KB
Loading

‎Flow.Launcher/Languages/en.xaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
<system:String x:Key="LastQuerySelected">Select last Query</system:String>
5858
<system:String x:Key="LastQueryEmpty">Empty last Query</system:String>
5959
<system:String x:Key="KeepMaxResults">Fixed Window Height</system:String>
60-
<system:String x:Key="KeepMaxResultsToolTip">The window height will not be resizeable by dragging</system:String>
60+
<system:String x:Key="KeepMaxResultsToolTip">The window height is not adjustable by dragging.</system:String>
6161
<system:String x:Key="maxShowResults">Maximum results shown</system:String>
6262
<system:String x:Key="maxShowResultsToolTip">You can also quickly adjust this by using CTRL+Plus and CTRL+Minus.</system:String>
6363
<system:String x:Key="ignoreHotkeysOnFullscreen">Ignore hotkeys in fullscreen mode</system:String>
@@ -75,6 +75,7 @@
7575
<system:String x:Key="autoUpdates">Auto Update</system:String>
7676
<system:String x:Key="select">Select</system:String>
7777
<system:String x:Key="hideOnStartup">Hide Flow Launcher on startup</system:String>
78+
<system:String x:Key="hideOnStartupToolTip">Flow Launcher search window is hidden in the tray after starting up.</system:String>
7879
<system:String x:Key="hideNotifyIcon">Hide tray icon</system:String>
7980
<system:String x:Key="hideNotifyIconToolTip">When the icon is hidden from the tray, the Settings menu can be opened by right-clicking on the search window.</system:String>
8081
<system:String x:Key="querySearchPrecision">Query Search Precision</system:String>
@@ -279,6 +280,9 @@
279280
<system:String x:Key="clearlogfolder">Clear Logs</system:String>
280281
<system:String x:Key="clearlogfolderMessage">Are you sure you want to delete all logs?</system:String>
281282
<system:String x:Key="welcomewindow">Wizard</system:String>
283+
<system:String x:Key="userdatapath">User Data Location</system:String>
284+
<system:String x:Key="userdatapathToolTip">User settings and installed plugins are saved in the user data folder. This location may vary depending on whether it's in portable mode or not.</system:String>
285+
<system:String x:Key="userdatapathButton">Open Folder</system:String>
282286

283287
<!-- FileManager Setting Dialog -->
284288
<system:String x:Key="fileManagerWindow">Select File Manager</system:String>

‎Flow.Launcher/Resources/CustomControlTemplate.xaml

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@
7474
<Setter Property="BorderThickness" Value="1" />
7575
<Style.Triggers>
7676
<DataTrigger Binding="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Window}}, Path=WindowState}" Value="Maximized">
77-
<Setter Property="BorderThickness" Value="1" />
77+
<Setter Property="BorderThickness" Value="0" />
78+
<Setter Property="Padding" Value="6" />
7879
</DataTrigger>
7980
</Style.Triggers>
8081
</Style>
@@ -1642,6 +1643,80 @@
16421643

16431644
<Style BasedOn="{StaticResource DefaultButtonStyle}" TargetType="Button" />
16441645

1646+
<Style
1647+
x:Key="AccentButtonStyle"
1648+
BasedOn="{StaticResource DefaultButtonStyle}"
1649+
TargetType="Button">
1650+
<Setter Property="Foreground" Value="{DynamicResource AccentButtonForeground}" />
1651+
<Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
1652+
<Setter Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrush}" />
1653+
<Setter Property="Template">
1654+
<Setter.Value>
1655+
<ControlTemplate TargetType="Button">
1656+
1657+
<Border
1658+
x:Name="Background"
1659+
Background="{TemplateBinding Background}"
1660+
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}"
1661+
SnapsToDevicePixels="True">
1662+
<Border x:Name="Overlay">
1663+
<Border
1664+
x:Name="Border"
1665+
Margin="1"
1666+
Padding="{TemplateBinding Padding}"
1667+
BorderBrush="{TemplateBinding BorderBrush}"
1668+
BorderThickness="0 0 0 1"
1669+
CornerRadius="{TemplateBinding ui:ControlHelper.CornerRadius}">
1670+
<ContentPresenter
1671+
x:Name="ContentPresenter"
1672+
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
1673+
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
1674+
Focusable="False"
1675+
RecognizesAccessKey="True"
1676+
SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}"
1677+
TextElement.Foreground="{TemplateBinding Foreground}" />
1678+
</Border>
1679+
</Border>
1680+
</Border>
1681+
<ControlTemplate.Triggers>
1682+
<Trigger Property="IsMouseOver" Value="True">
1683+
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPointerOver}" />
1684+
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPointerOver}" />
1685+
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPointerOver}" />
1686+
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPointerOver}" />
1687+
</Trigger>
1688+
<Trigger Property="IsPressed" Value="True">
1689+
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundPressed}" />
1690+
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushPressed}" />
1691+
<Setter TargetName="Overlay" Property="Background" Value="{DynamicResource AccentButtonBorderBGPressed}" />
1692+
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundPressed}" />
1693+
</Trigger>
1694+
<Trigger Property="IsEnabled" Value="False">
1695+
<Setter TargetName="Background" Property="Background" Value="{DynamicResource AccentButtonBackgroundDisabled}" />
1696+
<Setter TargetName="Border" Property="BorderBrush" Value="{DynamicResource AccentButtonBorderBrushDisabled}" />
1697+
<Setter TargetName="Overlay" Property="Background" Value="transparent" />
1698+
<Setter TargetName="ContentPresenter" Property="TextElement.Foreground" Value="{DynamicResource AccentButtonForegroundDisabled}" />
1699+
</Trigger>
1700+
</ControlTemplate.Triggers>
1701+
</ControlTemplate>
1702+
</Setter.Value>
1703+
</Setter>
1704+
</Style>
1705+
1706+
<Style x:Key="{x:Static SystemParameters.FocusVisualStyleKey}">
1707+
<Setter Property="Control.Template">
1708+
<Setter.Value>
1709+
<ControlTemplate>
1710+
<Border
1711+
Margin="0"
1712+
BorderBrush="{DynamicResource Color05B}"
1713+
BorderThickness="2"
1714+
CornerRadius="6"
1715+
SnapsToDevicePixels="true" />
1716+
</ControlTemplate>
1717+
</Setter.Value>
1718+
</Setter>
1719+
</Style>
16451720

16461721
<!-- - Custom Toggle Switch from modern wpf for left label -->
16471722
<system:TimeSpan x:Key="RepositionDelay">0:0:0.033</system:TimeSpan>
@@ -1657,7 +1732,7 @@
16571732
<Setter Property="FontFamily" Value="{DynamicResource ContentControlThemeFontFamily}" />
16581733
<Setter Property="FontSize" Value="{DynamicResource ControlContentThemeFontSize}" />
16591734
<Setter Property="FocusVisualStyle" Value="{DynamicResource {x:Static SystemParameters.FocusVisualStyleKey}}" />
1660-
<Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-7,-3,-7,-3" />
1735+
<Setter Property="ui:FocusVisualHelper.FocusVisualMargin" Value="-43,-3,-4,-3" />
16611736
<Setter Property="Template">
16621737
<Setter.Value>
16631738
<ControlTemplate TargetType="ui:ToggleSwitch">

‎Flow.Launcher/Resources/Dark.xaml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,18 +1605,23 @@
16051605

16061606
<!-- Resources for AccentButtonStyle -->
16071607
<m:StaticResource x:Key="AccentButtonBackground" ResourceKey="SystemAccentColorLight2Brush" />
1608-
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight1Brush" />
1609-
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorDark1Brush" />
1608+
<m:StaticResource x:Key="AccentButtonBackgroundPointerOver" ResourceKey="SystemAccentColorLight2Brush" />
1609+
<m:StaticResource x:Key="AccentButtonBackgroundPressed" ResourceKey="SystemAccentColorLight2Brush" />
16101610
<m:StaticResource x:Key="AccentButtonBackgroundDisabled" ResourceKey="SystemControlBackgroundBaseLowBrush" />
1611-
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="Color01B" />
1612-
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="Color01B" />
1613-
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="Color23B" />
1611+
<m:StaticResource x:Key="AccentButtonForeground" ResourceKey="SystemControlForegroundAltHighBrush" />
1612+
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundAltMediumHighBrush" />
1613+
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundListLowBrush" />
16141614
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
16151615
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
16161616
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
16171617
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
1618+
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="AccentButtonOverlayPointerOver" />
1619+
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="AccentButtonOverlayPressed" />
16181620
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
16191621

1622+
<SolidColorBrush x:Key="AccentButtonOverlayPointerOver" Color="#32555555" />
1623+
<SolidColorBrush x:Key="AccentButtonOverlayPressed" Color="#52555555" />
1624+
16201625
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>
16211626
<sys:Boolean x:Key="IsApplicationFocusVisualKindReveal">False</sys:Boolean>
16221627

‎Flow.Launcher/Resources/Light.xaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,9 +1608,11 @@
16081608
<m:StaticResource x:Key="AccentButtonForegroundPointerOver" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
16091609
<m:StaticResource x:Key="AccentButtonForegroundPressed" ResourceKey="SystemControlForegroundChromeWhiteBrush" />
16101610
<m:StaticResource x:Key="AccentButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
1611-
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemControlForegroundTransparentBrush" />
1612-
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
1611+
<m:StaticResource x:Key="AccentButtonBorderBrush" ResourceKey="SystemAccentColorDark2Brush" />
1612+
<m:StaticResource x:Key="AccentButtonBorderBrushPointerOver" ResourceKey="SystemAccentColorDark2Brush" />
16131613
<m:StaticResource x:Key="AccentButtonBorderBrushPressed" ResourceKey="SystemControlHighlightTransparentBrush" />
1614+
<m:StaticResource x:Key="AccentButtonBorderBGPointerOver" ResourceKey="SystemControlForegroundTransparentBrush" />
1615+
<m:StaticResource x:Key="AccentButtonBorderBGPressed" ResourceKey="SystemControlForegroundTransparentBrush" />
16141616
<m:StaticResource x:Key="AccentButtonBorderBrushDisabled" ResourceKey="SystemControlDisabledTransparentBrush" />
16151617

16161618
<sys:Boolean x:Key="UseSystemFocusVisuals">True</sys:Boolean>

‎Flow.Launcher/SettingPages/ViewModels/SettingsPaneAboutViewModel.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,15 @@ private void OpenSettingsFolder()
8080
PluginManager.API.OpenDirectory(Path.Combine(DataLocation.DataDirectory(), Constant.Settings));
8181
}
8282

83+
[RelayCommand]
84+
private void OpenParentOfSettingsFolder(object parameter)
85+
{
86+
string settingsFolderPath = Path.Combine(DataLocation.DataDirectory(), Constant.Settings);
87+
string parentFolderPath = Path.GetDirectoryName(settingsFolderPath);
88+
PluginManager.API.OpenDirectory(parentFolderPath);
89+
}
90+
91+
8392
[RelayCommand]
8493
private void OpenLogsFolder()
8594
{

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
Text="{DynamicResource about}"
2727
TextAlignment="left" />
2828

29-
3029
<cc:Card
3130
Title="{Binding Version}"
3231
Icon="&#xe946;"
@@ -43,42 +42,53 @@
4342
TextDecorations="None">
4443
<TextBlock
4544
Padding="10 5"
46-
Foreground="White"
45+
Foreground="{StaticResource SystemControlForegroundAltHighBrush}"
4746
Text="{DynamicResource BecomeASponsor}" />
4847
</Hyperlink>
4948
</Button>
5049
</StackPanel>
5150
</cc:Card>
5251

5352
<cc:Card Title="{DynamicResource releaseNotes}" Icon="&#xe8fd;">
54-
<cc:HyperLink Uri="{Binding ReleaseNotes}" Text="{DynamicResource releaseNotes}" />
53+
<cc:HyperLink Text="{DynamicResource releaseNotes}" Uri="{Binding ReleaseNotes}" />
5554
</cc:Card>
5655

56+
5757
<cc:Card
58-
Title="{DynamicResource website}"
58+
Title="{DynamicResource userdatapath}"
5959
Margin="0 14 0 0"
60-
Icon="&#xeb41;">
60+
Icon="&#xEC25;;"
61+
Sub="{DynamicResource userdatapathToolTip}">
6162
<StackPanel Orientation="Horizontal">
62-
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Website}" Text="{DynamicResource website}" />
63-
<cc:HyperLink Uri="{Binding Github}" Text="{DynamicResource github}" />
63+
<Button Command="{Binding OpenParentOfSettingsFolderCommand}" Content="{DynamicResource userdatapathButton}" />
6464
</StackPanel>
6565
</cc:Card>
6666

67-
<cc:Card Title="{DynamicResource documentation}" Icon="&#xe82f;">
67+
<cc:Card
68+
Title="{DynamicResource website}"
69+
Margin="0 14 0 0"
70+
Icon="&#xeb41;">
6871
<StackPanel Orientation="Horizontal">
69-
<cc:HyperLink Margin="0 0 12 0" Uri="{Binding Documentation}" Text="{DynamicResource documentation}" />
70-
<cc:HyperLink Uri="{Binding Website}" Text="{DynamicResource website}" />
72+
<cc:HyperLink
73+
Margin="0 0 12 0"
74+
Text="{DynamicResource website}"
75+
Uri="{Binding Website}" />
76+
<cc:HyperLink
77+
Margin="0 0 12 0"
78+
Text="{DynamicResource documentation}"
79+
Uri="{Binding Documentation}" />
80+
<cc:HyperLink Text="{DynamicResource github}" Uri="{Binding Github}" />
7181
</StackPanel>
7282
</cc:Card>
7383

74-
<cc:Card
75-
Title="{DynamicResource icons}"
76-
Margin="0 14 0 0"
77-
Icon="&#xE8FE;">
78-
<cc:HyperLink Uri="https://icons8.com/" Text="icons8.com" />
84+
<cc:Card Title="{DynamicResource icons}" Icon="&#xE8FE;">
85+
<cc:HyperLink Text="icons8.com" Uri="https://icons8.com/" />
7986
</cc:Card>
8087

81-
<cc:Card Title="{DynamicResource devtool}" Icon="&#xf12b;">
88+
<cc:Card
89+
Title="{DynamicResource devtool}"
90+
Margin="0 12 0 0"
91+
Icon="&#xf12b;">
8292
<StackPanel Orientation="Horizontal">
8393
<Button
8494
Margin="0 0 12 0"

0 commit comments

Comments
 (0)