diff --git a/src/modules/launcher/Doc/app.ico b/src/modules/launcher/Doc/app.ico deleted file mode 100644 index 38c401c8ca..0000000000 Binary files a/src/modules/launcher/Doc/app.ico and /dev/null differ diff --git a/src/modules/launcher/Doc/app.png b/src/modules/launcher/Doc/app.png deleted file mode 100644 index 8c9ca7971a..0000000000 Binary files a/src/modules/launcher/Doc/app.png and /dev/null differ diff --git a/src/modules/launcher/Doc/app.psd b/src/modules/launcher/Doc/app.psd deleted file mode 100644 index 833fd6529a..0000000000 Binary files a/src/modules/launcher/Doc/app.psd and /dev/null differ diff --git a/src/modules/launcher/Doc/app_error.png b/src/modules/launcher/Doc/app_error.png deleted file mode 100644 index 5106d6e8a9..0000000000 Binary files a/src/modules/launcher/Doc/app_error.png and /dev/null differ diff --git a/src/modules/launcher/Doc/app_error.psd b/src/modules/launcher/Doc/app_error.psd deleted file mode 100644 index 174e9cb62d..0000000000 Binary files a/src/modules/launcher/Doc/app_error.psd and /dev/null differ diff --git a/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs b/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs index b48a6ef581..4b0a7d6d56 100644 --- a/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs +++ b/src/modules/launcher/Wox.Infrastructure/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Wox")] +[assembly: InternalsVisibleTo("PowerLauncher")] [assembly: InternalsVisibleTo("Wox.Core")] [assembly: InternalsVisibleTo("Wox.Test")] \ No newline at end of file diff --git a/src/modules/launcher/Wox.Launcher/dllmain.cpp b/src/modules/launcher/Wox.Launcher/dllmain.cpp index 773c726525..76057c0e13 100644 --- a/src/modules/launcher/Wox.Launcher/dllmain.cpp +++ b/src/modules/launcher/Wox.Launcher/dllmain.cpp @@ -131,7 +131,7 @@ public: { SHELLEXECUTEINFO sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\launcher\\Wox.exe"; + sei.lpFile = L"modules\\launcher\\PowerLauncher.exe"; sei.nShow = SW_SHOWNORMAL; ShellExecuteEx(&sei); diff --git a/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs b/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs index b48a6ef581..4b0a7d6d56 100644 --- a/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs +++ b/src/modules/launcher/Wox.Plugin/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Wox")] +[assembly: InternalsVisibleTo("PowerLauncher")] [assembly: InternalsVisibleTo("Wox.Core")] [assembly: InternalsVisibleTo("Wox.Test")] \ No newline at end of file diff --git a/src/modules/launcher/Wox/Images/app.png b/src/modules/launcher/Wox/Images/app.png index 8c9ca7971a..8311fd5d41 100644 Binary files a/src/modules/launcher/Wox/Images/app.png and b/src/modules/launcher/Wox/Images/app.png differ diff --git a/src/modules/launcher/Wox/Images/app_error.png b/src/modules/launcher/Wox/Images/app_error.png index 5106d6e8a9..ca781a9c40 100644 Binary files a/src/modules/launcher/Wox/Images/app_error.png and b/src/modules/launcher/Wox/Images/app_error.png differ diff --git a/src/modules/launcher/Wox/Properties/Resources.Designer.cs b/src/modules/launcher/Wox/Properties/Resources.Designer.cs index 26a9ddff90..87f02e8ec4 100644 --- a/src/modules/launcher/Wox/Properties/Resources.Designer.cs +++ b/src/modules/launcher/Wox/Properties/Resources.Designer.cs @@ -63,9 +63,10 @@ namespace Wox.Properties { /// /// Looks up a localized resource of type System.Drawing.Icon similar to (Icon). /// - internal static System.Drawing.Icon app { + internal static System.Drawing.Icon placeholderLauncher + { get { - object obj = ResourceManager.GetObject("app", resourceCulture); + object obj = ResourceManager.GetObject("placeholderLauncher", resourceCulture); return ((System.Drawing.Icon)(obj)); } } diff --git a/src/modules/launcher/Wox/Properties/Resources.resx b/src/modules/launcher/Wox/Properties/Resources.resx index 3ae43d89b0..9709239a7e 100644 --- a/src/modules/launcher/Wox/Properties/Resources.resx +++ b/src/modules/launcher/Wox/Properties/Resources.resx @@ -112,13 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\placeholderLauncher.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/src/modules/launcher/Wox/Properties/Settings.Designer.cs b/src/modules/launcher/Wox/Properties/Settings.Designer.cs index be9020f6e6..a394e85313 100644 --- a/src/modules/launcher/Wox/Properties/Settings.Designer.cs +++ b/src/modules/launcher/Wox/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace Wox.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Wox-launcher/Wox")] + [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Microsoft/PowerToys")] public string GithubRepo { get { return ((string)(this["GithubRepo"])); diff --git a/src/modules/launcher/Wox/Properties/Settings.settings b/src/modules/launcher/Wox/Properties/Settings.settings index 1fc52390be..60156e31b4 100644 --- a/src/modules/launcher/Wox/Properties/Settings.settings +++ b/src/modules/launcher/Wox/Properties/Settings.settings @@ -1,9 +1,9 @@  - + - https://github.com/Wox-launcher/Wox + https://github.com/Microsoft/PowerToys \ No newline at end of file diff --git a/src/modules/launcher/Wox/Resources/app.ico b/src/modules/launcher/Wox/Resources/app.ico deleted file mode 100644 index 38c401c8ca..0000000000 Binary files a/src/modules/launcher/Wox/Resources/app.ico and /dev/null differ diff --git a/src/modules/launcher/Wox/Resources/placeholderLauncher.ico b/src/modules/launcher/Wox/Resources/placeholderLauncher.ico new file mode 100644 index 0000000000..8aa98e515d Binary files /dev/null and b/src/modules/launcher/Wox/Resources/placeholderLauncher.ico differ diff --git a/src/modules/launcher/Wox/Wox.csproj b/src/modules/launcher/Wox/Wox.csproj index 919ef223a1..f2a1305b61 100644 --- a/src/modules/launcher/Wox/Wox.csproj +++ b/src/modules/launcher/Wox/Wox.csproj @@ -6,10 +6,11 @@ true true Wox.App - Resources\app.ico + Resources\placeholderLauncher.ico app.manifest false false + PowerLauncher x64 @@ -181,11 +182,12 @@ + - + \ No newline at end of file diff --git a/src/modules/launcher/Wox/app.png b/src/modules/launcher/Wox/app.png index 8c9ca7971a..ae307b7c77 100644 Binary files a/src/modules/launcher/Wox/app.png and b/src/modules/launcher/Wox/app.png differ