Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
6c61f5d
[Run-Plugin] Settings plugin (#11663)
mykhailopylyp Jun 9, 2021
9836c19
[Run-Plugin][Program] Fix null reference exception on Dispose (#11785)
mykhailopylyp Jun 18, 2021
e223d13
Initial Refactor
taooceros Jul 18, 2021
89ef3a9
Porting to Flow
taooceros Jul 19, 2021
9e9820b
fix JsonFormat
taooceros Jul 19, 2021
2c45ec6
Use Flow API to search
taooceros Jul 19, 2021
4f0e679
fix json
taooceros Jul 19, 2021
bac446d
subtitle highlight
taooceros Jul 19, 2021
dd31f1a
Create README.md
taooceros Jul 19, 2021
228bbe2
Change NameSpace Name
taooceros Jul 20, 2021
1e673d9
Adjust Scoring
taooceros Jul 20, 2021
9b1ee61
Make SubTitleToolTip the same as TitleToolTip
taooceros Jul 20, 2021
75346f1
Change ExecuteFileName
taooceros Jul 21, 2021
6308a67
Add some icons glyph
pc223 Jul 21, 2021
7f5b9b7
Add task links
pc223 Jul 24, 2021
ccb01d8
Add some more glyphs
pc223 Jul 26, 2021
b7df393
Add FontFamily
pc223 Jul 31, 2021
3ae9e16
Allow keyword search
taooceros Sep 26, 2021
a692216
Merge branch 'main' into pr/pc223/3
taooceros Sep 26, 2021
cfbb884
Merge pull request #3 from pc223/add-task-link
taooceros Sep 26, 2021
5731719
add other localization resources
taooceros Sep 29, 2021
83a8c6c
Merge pull request #6 from Flow-Launcher/AddLocalizationResx
taooceros Oct 4, 2021
e981139
Merge pull request #2 from Flow-Launcher/add-some-icons-glyph
taooceros Oct 4, 2021
0a7ca4f
Let WindowsSettings Plugin become built-in plugin.
taooceros Oct 4, 2021
b0cf100
change output link to flow output directory
taooceros Oct 5, 2021
75d3163
Add plugin folder
jjw24 Oct 9, 2021
b59bc39
migrate WindowsSettings plugin into main repo
jjw24 Oct 9, 2021
0b60d3d
move to plugins folder
jjw24 Oct 9, 2021
6e11f68
Merge branch 'CulturalInfoChange' into add_windows_settings_plugin
taooceros Oct 29, 2021
47e074c
Merge branch 'dev' of github.com:Flow-Launcher/Flow.Launcher into add…
taooceros Oct 29, 2021
02bb75f
Include WindowsSettings in Flow Project
taooceros Oct 30, 2021
582e296
Update Translation Mechamism in Flow
taooceros Oct 30, 2021
255f809
Add OnCultureInfoChanged to IPluginI18n to allow plugin do action whe…
taooceros Oct 30, 2021
ae2e72b
add comment
taooceros Oct 30, 2021
7cfb71d
Change WindowsSettings class to record and use with to create transla…
taooceros Oct 30, 2021
304fb90
Expand EnvironmentVariable in Command
taooceros Oct 30, 2021
d0ceea0
Merge pull request #781 from Flow-Launcher/translation_new_api
jjw24 Nov 2, 2021
9fac7cc
Update WindowsSettings.light.png
taooceros Nov 29, 2021
1990a7e
Merge remote-tracking branch 'upstream/dev' into add_windows_settings…
taooceros Nov 29, 2021
a701b48
Merge remote-tracking branch 'origin/dev' into add_windows_settings_p…
jjw24 Nov 30, 2021
832cbe4
update action keyword tips typo
jjw24 Nov 30, 2021
0a5e636
remove git ignore from WindowsSettings
jjw24 Nov 30, 2021
bf1e939
rename WindowsSettings project
jjw24 Nov 30, 2021
c88af8a
include WindowsSettings project in build
jjw24 Nov 30, 2021
e66af0f
Add ControlPanelIcon
taooceros Nov 30, 2021
9d26eb9
Merge branch 'add_windows_settings_plugin' of github.com:Flow-Launche…
taooceros Nov 30, 2021
0d152f5
change default action keyword to global
jjw24 Dec 1, 2021
e7d3dec
fix typo
jjw24 Dec 1, 2021
acb697c
update project file, plugin.json and comments
jjw24 Dec 1, 2021
8fc5776
update plugin description
jjw24 Dec 1, 2021
0b725eb
change project to .Net SDK, Any CPU build, remove Platform targeted,
jjw24 Dec 1, 2021
aad4fc1
update subtitle's setting type display to System settings/Control Panel
jjw24 Dec 2, 2021
b497f7b
remove WindowsSettings.json duplicate taskbar entry, update description
jjw24 Dec 2, 2021
0250a28
update typo
jjw24 Dec 2, 2021
7297c1b
remove ControlPanel plugin
jjw24 Dec 2, 2021
a4fd337
remove unused icon image WindowsSettings.dark.png
jjw24 Dec 2, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Flow.Launcher.Core/Resource/Internationalization.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
using Flow.Launcher.Infrastructure.UserSettings;
using Flow.Launcher.Plugin;
using System.Globalization;
using System.Threading.Tasks;

namespace Flow.Launcher.Core.Resource
{
Expand Down Expand Up @@ -95,10 +96,13 @@ public void ChangeLanguage(Language language)
{
LoadLanguage(language);
}
UpdatePluginMetadataTranslations();
Settings.Language = language.LanguageCode;
CultureInfo.CurrentCulture = new CultureInfo(language.LanguageCode);
CultureInfo.CurrentUICulture = CultureInfo.CurrentCulture;
Task.Run(() =>
{
UpdatePluginMetadataTranslations();
});
}

public bool PromptShouldUsePinyin(string languageCodeToSet)
Expand Down
12 changes: 11 additions & 1 deletion Flow.Launcher.Plugin/Interfaces/IPluginI18n.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
namespace Flow.Launcher.Plugin
using System.Globalization;

namespace Flow.Launcher.Plugin
{
/// <summary>
/// Represent plugins that support internationalization
Expand All @@ -8,5 +10,13 @@ public interface IPluginI18n : IFeatures
string GetTranslatedPluginTitle();

string GetTranslatedPluginDescription();

/// <summary>
/// The method will be invoked when language of flow changed
/// </summary>
void OnCultureInfoChanged(CultureInfo newCulture)
{

}
}
}
32 changes: 16 additions & 16 deletions Flow.Launcher.sln
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Plugins", "Plugins", "{3A73
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launcher\Flow.Launcher.csproj", "{DB90F671-D861-46BB-93A3-F1304F5BA1C5}"
ProjectSection(ProjectDependencies) = postProject
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0} = {1EE20B48-82FB-48A2-8086-675D6DDAB4F0}
{0B9DE348-9361-4940-ADB6-F5953BFFCCEC} = {0B9DE348-9361-4940-ADB6-F5953BFFCCEC}
{4792A74A-0CEA-4173-A8B2-30E6764C6217} = {4792A74A-0CEA-4173-A8B2-30E6764C6217}
{FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {FDB3555B-58EF-4AE6-B5F1-904719637AB4}
Expand All @@ -23,6 +22,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher", "Flow.Launc
{9B130CC5-14FB-41FF-B310-0A95B6894C37} = {9B130CC5-14FB-41FF-B310-0A95B6894C37}
{FDED22C8-B637-42E8-824A-63B5B6E05A3A} = {FDED22C8-B637-42E8-824A-63B5B6E05A3A}
{A3DCCBCA-ACC1-421D-B16E-210896234C26} = {A3DCCBCA-ACC1-421D-B16E-210896234C26}
{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {5043CECE-E6A7-4867-9CBE-02D27D83747A}
{403B57F2-1856-4FC7-8A24-36AB346B763E} = {403B57F2-1856-4FC7-8A24-36AB346B763E}
{588088F4-3262-4F9F-9663-A05DE12534C3} = {588088F4-3262-4F9F-9663-A05DE12534C3}
EndProjectSection
Expand All @@ -35,8 +35,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Progra
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.WebSearch", "Plugins\Flow.Launcher.Plugin.WebSearch\Flow.Launcher.Plugin.WebSearch.csproj", "{403B57F2-1856-4FC7-8A24-36AB346B763E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.ControlPanel", "Plugins\Flow.Launcher.Plugin.ControlPanel\Flow.Launcher.Plugin.ControlPanel.csproj", "{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.PluginIndicator", "Plugins\Flow.Launcher.Plugin.PluginIndicator\Flow.Launcher.Plugin.PluginIndicator.csproj", "{FDED22C8-B637-42E8-824A-63B5B6E05A3A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Sys", "Plugins\Flow.Launcher.Plugin.Sys\Flow.Launcher.Plugin.Sys.csproj", "{0B9DE348-9361-4940-ADB6-F5953BFFCCEC}"
Expand Down Expand Up @@ -68,6 +66,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.Proces
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.PluginsManager", "Plugins\Flow.Launcher.Plugin.PluginsManager\Flow.Launcher.Plugin.PluginsManager.csproj", "{4792A74A-0CEA-4173-A8B2-30E6764C6217}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Flow.Launcher.Plugin.WindowsSettings", "Plugins\Flow.Launcher.Plugin.WindowsSettings\Flow.Launcher.Plugin.WindowsSettings.csproj", "{5043CECE-E6A7-4867-9CBE-02D27D83747A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -162,18 +162,6 @@ Global
{403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x64.Build.0 = Release|Any CPU
{403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x86.ActiveCfg = Release|Any CPU
{403B57F2-1856-4FC7-8A24-36AB346B763E}.Release|x86.Build.0 = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x64.ActiveCfg = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x64.Build.0 = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x86.ActiveCfg = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Debug|x86.Build.0 = Debug|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|Any CPU.Build.0 = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x64.ActiveCfg = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x64.Build.0 = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x86.ActiveCfg = Release|Any CPU
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0}.Release|x86.Build.0 = Release|Any CPU
{FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FDED22C8-B637-42E8-824A-63B5B6E05A3A}.Debug|x64.ActiveCfg = Debug|Any CPU
Expand Down Expand Up @@ -283,14 +271,25 @@ Global
{4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x64.Build.0 = Release|Any CPU
{4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x86.ActiveCfg = Release|Any CPU
{4792A74A-0CEA-4173-A8B2-30E6764C6217}.Release|x86.Build.0 = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x64.ActiveCfg = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x64.Build.0 = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x86.ActiveCfg = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Debug|x86.Build.0 = Debug|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|Any CPU.Build.0 = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.ActiveCfg = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x64.Build.0 = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.ActiveCfg = Release|Any CPU
{5043CECE-E6A7-4867-9CBE-02D27D83747A}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{403B57F2-1856-4FC7-8A24-36AB346B763E} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{1EE20B48-82FB-48A2-8086-675D6DDAB4F0} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{FDED22C8-B637-42E8-824A-63B5B6E05A3A} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{0B9DE348-9361-4940-ADB6-F5953BFFCCEC} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{A3DCCBCA-ACC1-421D-B16E-210896234C26} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
Expand All @@ -300,6 +299,7 @@ Global
{F9C4C081-4CC3-4146-95F1-E102B4E10A5F} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{588088F4-3262-4F9F-9663-A05DE12534C3} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{4792A74A-0CEA-4173-A8B2-30E6764C6217} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
{5043CECE-E6A7-4867-9CBE-02D27D83747A} = {3A73F5A7-0335-40D8-BF7C-F20BE5D0BA87}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {F26ACB50-3F6C-4907-B0C9-1ADACC1D0DED}
Expand Down
2 changes: 1 addition & 1 deletion Flow.Launcher/Languages/en.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
<system:String x:Key="newActionKeywordsHasBeenAssigned">This new Action Keyword is already assigned to another plugin, please choose a different one</system:String>
<system:String x:Key="success">Success</system:String>
<system:String x:Key="completedSuccessfully">Completed successfully</system:String>
<system:String x:Key="actionkeyword_tips">Enter the action keyword you need to start the plug-in. Use * if you don't want to specify an action keyword. In the case, The plug-in works without keywords.</system:String>
<system:String x:Key="actionkeyword_tips">Enter the action keyword you like to use to start the plugin. Use * if you don't want to specify any, and the plugin will be triggered without any action keywords.</system:String>

<!-- Custom Query Hotkey Dialog -->
<system:String x:Key="customeQueryHotkeyTitle">Custom Query Hotkey</system:String>
Expand Down
25 changes: 0 additions & 25 deletions Plugins/Flow.Launcher.Plugin.ControlPanel/ControlPanelItem.cs

This file was deleted.

Loading