Skip to content

Commit aac717c

Browse files
authored
Merge branch 'dev' into administrator_mode
2 parents 2f25855 + b0694e9 commit aac717c

File tree

68 files changed

+726
-688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+726
-688
lines changed

.github/actions/spelling/allow.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,8 @@ ssh
44
ubuntu
55
runcount
66
Firefox
7+
Português
8+
Português (Brasil)
9+
favicons
10+
moz
711
workaround

.github/actions/spelling/expect.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,3 +104,7 @@ metadatas
104104
WMP
105105
VSTHRD
106106
CJK
107+
Msix
108+
dummyprofile
109+
browserbookmark
110+
copyurl

.github/actions/spelling/patterns.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
# version suffix <word>v#
125125
(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
126126

127+
# Non-English
128+
[a-zA-Z]*[ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź][a-zA-Z]{3}[a-zA-ZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿĀāŁłŃńŅņŒœŚśŠšŜŝŸŽžź]*
129+
130+
127131
\bjjw24\b
128132
\bappref-ms\b
129133
\bTobiasSekan\b
@@ -143,3 +147,4 @@
143147
\bXing\s*Kong\s*Jian\s*Dao\b
144148
\bDa\s*Niu\b
145149
\bXiao\s*Lang\b
150+
\b[Ss]ettings [Ss]ettings\b

Directory.Build.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<Project>
22
<PropertyGroup>
33
<AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
4+
<!-- Work around https://github.com/dotnet/runtime/issues/109682 -->
5+
<CETCompat>false</CETCompat>
46
</PropertyGroup>
57
</Project>

Flow.Launcher.Core/Resource/LocalizationConverter.cs

Lines changed: 0 additions & 38 deletions
This file was deleted.

Flow.Launcher.Infrastructure/UI/EnumBindingSource.cs

Lines changed: 0 additions & 58 deletions
This file was deleted.

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,6 @@
136136

137137
<Target Name="RemoveDuplicateAnalyzers" BeforeTargets="CoreCompile">
138138
<!-- Work around https://github.com/dotnet/wpf/issues/6792 -->
139-
140139
<ItemGroup>
141140
<FilteredAnalyzer Include="@(Analyzer-&gt;Distinct())" />
142141
<Analyzer Remove="@(Analyzer)" />

Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
FontSize="14"
123123
ItemContainerStyle="{StaticResource PluginList}"
124124
ItemsSource="{Binding Source={StaticResource PluginCollectionView}}"
125+
Loaded="PluginListBox_Loaded"
125126
ScrollViewer.CanContentScroll="False"
126127
ScrollViewer.HorizontalScrollBarVisibility="Disabled"
127128
SnapsToDevicePixels="True"

Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
using System.ComponentModel;
2+
using System.Windows;
3+
using System.Windows.Controls;
24
using System.Windows.Data;
35
using System.Windows.Input;
46
using System.Windows.Navigation;
@@ -33,6 +35,14 @@ protected override void OnNavigatedTo(NavigationEventArgs e)
3335
base.OnNavigatedTo(e);
3436
}
3537

38+
private void PluginListBox_Loaded(object sender, RoutedEventArgs e)
39+
{
40+
// After list is loaded, we need to clear selection to make sure all items can be mouse hovered
41+
// because the selected item cannot be hovered.
42+
if (sender is not ListBox listBox) return;
43+
listBox.SelectedIndex = -1;
44+
}
45+
3646
private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
3747
{
3848
if (e.PropertyName == nameof(SettingsPanePluginsViewModel.FilterText))

Plugins/Flow.Launcher.Plugin.BrowserBookmark/ChromiumBookmarkLoader.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
4545
}
4646
catch (Exception ex)
4747
{
48-
Main._context.API.LogException(ClassName, $"Failed to register bookmark file monitoring: {bookmarkPath}", ex);
48+
Main.Context.API.LogException(ClassName, $"Failed to register bookmark file monitoring: {bookmarkPath}", ex);
4949
continue;
5050
}
5151

@@ -58,7 +58,7 @@ protected List<Bookmark> LoadBookmarks(string browserDataPath, string name)
5858
var faviconDbPath = Path.Combine(profile, "Favicons");
5959
if (File.Exists(faviconDbPath))
6060
{
61-
Main._context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favicons cost", () =>
61+
Main.Context.API.StopwatchLogInfo(ClassName, $"Load {profileBookmarks.Count} favicons cost", () =>
6262
{
6363
LoadFaviconsFromDb(faviconDbPath, profileBookmarks);
6464
});
@@ -125,7 +125,7 @@ private static void EnumerateFolderBookmark(JsonElement folderElement, ICollecti
125125
}
126126
else
127127
{
128-
Main._context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
128+
Main.Context.API.LogError(ClassName, $"type property not found for {subElement.GetString()}");
129129
}
130130
}
131131
}
@@ -190,7 +190,7 @@ ORDER BY b.width DESC
190190
}
191191
catch (Exception ex)
192192
{
193-
Main._context.API.LogException(ClassName, $"Failed to extract bookmark favicon: {bookmark.Url}", ex);
193+
Main.Context.API.LogException(ClassName, $"Failed to extract bookmark favicon: {bookmark.Url}", ex);
194194
}
195195
finally
196196
{

0 commit comments

Comments
 (0)