Skip to content

Commit 3338a41

Browse files
authored
Merge branch 'dev' into fix_shell_and_change_query
2 parents 56d9a37 + ef04819 commit 3338a41

File tree

18 files changed

+24
-24
lines changed

18 files changed

+24
-24
lines changed

Flow.Launcher/Flow.Launcher.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
@@ -92,7 +92,7 @@
9292
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
9393
<PackageReference Include="ModernWpfUI" Version="0.9.4" />
9494
<PackageReference Include="NHotkey.Wpf" Version="2.1.0" />
95-
<PackageReference Include="NuGet.CommandLine" Version="5.7.2">
95+
<PackageReference Include="NuGet.CommandLine" Version="6.3.1">
9696
<PrivateAssets>all</PrivateAssets>
9797
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
9898
</PackageReference>

Flow.Launcher/ViewModel/MainViewModel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@ private Result ContextMenuTopMost(Result result)
814814
Action = _ =>
815815
{
816816
_topMostRecord.AddOrUpdate(result);
817-
App.API.ShowMsg("Success");
817+
App.API.ShowMsg(InternationalizationManager.Instance.GetTranslation("success"));
818818
return false;
819819
}
820820
};

Flow.Launcher/WelcomeWindow.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
88
xmlns:ui="http://schemas.modernwpf.com/2019"
99
Name="FlowWelcomeWindow"
10-
Title="Welcome to Flow Launcher"
11-
Activated="OnActivated"
10+
Title="{DynamicResource Welcome_Page1_Title}"
1211
Width="550"
1312
Height="650"
14-
MouseDown="window_MouseDown"
13+
Activated="OnActivated"
1514
Background="{DynamicResource Color00B}"
1615
Foreground="{DynamicResource PopupTextColor}"
16+
MouseDown="window_MouseDown"
1717
WindowStartupLocation="CenterScreen"
1818
mc:Ignorable="d">
1919
<!--#region TitleBar-->
@@ -48,7 +48,7 @@
4848
VerticalAlignment="Center"
4949
FontSize="12"
5050
Foreground="{DynamicResource Color05B}"
51-
Text="Welcome to Flow Launcher" />
51+
Text="{DynamicResource Welcome_Page1_Title}" />
5252

5353
<Button
5454
Grid.Column="4"

Plugins/Flow.Launcher.Plugin.BrowserBookmark/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Browser Bookmarks",
55
"Description": "Search your browser bookmarks",
66
"Author": "qianlifeng, Ioannis G.",
7-
"Version": "1.7.0",
7+
"Version": "2.0.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.BrowserBookmark.dll",

Plugins/Flow.Launcher.Plugin.Calculator/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Calculator",
55
"Description": "Provide mathematical calculations.(Try 5*3-2 in Flow Launcher)",
66
"Author": "cxfksword",
7-
"Version": "1.1.12",
7+
"Version": "2.0.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.Caculator.dll",

Plugins/Flow.Launcher.Plugin.Explorer/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"Name": "Explorer",
1111
"Description": "Search and manage files and folders. Explorer utilises Windows Index Search",
1212
"Author": "Jeremy Wu",
13-
"Version": "1.11.2",
13+
"Version": "2.0.0",
1414
"Language": "csharp",
1515
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1616
"ExecuteFileName": "Flow.Launcher.Plugin.Explorer.dll",

Plugins/Flow.Launcher.Plugin.PluginIndicator/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name": "Plugin Indicator",
55
"Description": "Provide plugin actionword suggestion",
66
"Author": "qianlifeng",
7-
"Version": "1.1.5",
7+
"Version": "2.0.0",
88
"Language": "csharp",
99
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1010
"ExecuteFileName": "Flow.Launcher.Plugin.PluginIndicator.dll",

Plugins/Flow.Launcher.Plugin.PluginsManager/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"Name": "Plugins Manager",
77
"Description": "Management of installing, uninstalling or updating Flow Launcher plugins",
88
"Author": "Jeremy Wu",
9-
"Version": "1.12.2",
9+
"Version": "2.0.0",
1010
"Language": "csharp",
1111
"Website": "https://github.com/Flow-Launcher/Flow.Launcher",
1212
"ExecuteFileName": "Flow.Launcher.Plugin.PluginsManager.dll",

Plugins/Flow.Launcher.Plugin.ProcessKiller/plugin.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"Name":"Process Killer",
55
"Description":"Kill running processes from Flow",
66
"Author":"Flow-Launcher",
7-
"Version":"1.2.6",
7+
"Version":"2.0.0",
88
"Language":"csharp",
99
"Website":"https://github.com/Flow-Launcher/Flow.Launcher.Plugin.ProcessKiller",
1010
"IcoPath":"Images\\app.png",

Plugins/Flow.Launcher.Plugin.Program/Views/ProgramSetting.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<RowDefinition Height="Auto" />
1414
<RowDefinition Height="Auto" />
1515
<RowDefinition Height="*" />
16-
<RowDefinition Height="60" />
16+
<RowDefinition Height="Auto" />
1717
</Grid.RowDefinitions>
1818
<DockPanel
1919
Margin="70,10,0,8"

0 commit comments

Comments
 (0)