Merge pull request microsoft#28 from microsoft/user/ryanbod/rename_wox

Renaming Wox references
ryanbodrug-microsoft · Mar 30, 2020 · 59a2c5c · 59a2c5c
2 parents 71992f5 + 73a7ade
commit 59a2c5c
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 17 deletions.
diff --git a/src/modules/launcher/Doc/app.ico b/src/modules/launcher/Doc/app.ico
diff --git a/src/modules/launcher/Doc/app.png b/src/modules/launcher/Doc/app.png
diff --git a/src/modules/launcher/Doc/app.psd b/src/modules/launcher/Doc/app.psd
diff --git a/src/modules/launcher/Doc/app_error.png b/src/modules/launcher/Doc/app_error.png
diff --git a/src/modules/launcher/Doc/app_error.psd b/src/modules/launcher/Doc/app_error.psd
diff --git 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")]
diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.cs b/src/modules/launcher/Wox.Infrastructure/Wox.cs
@@ -7,7 +7,7 @@ namespace Wox.Infrastructure
 {
     public static class Constant
     {
-        public const string Wox = "Wox";
+        public const string Wox = "PowerLauncher";
         public const string Plugins = "Plugins";
 
         private static readonly Assembly Assembly = Assembly.GetExecutingAssembly();
@@ -33,7 +33,7 @@ public static string DetermineDataDirectory()
         public static readonly string DataDirectory = DetermineDataDirectory();
         public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins);
         public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins);
-        public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new";
+        public const string Issue = "https://github.com/microsoft/PowerToys/issues/new";
         public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion;
 
         public static readonly int ThumbnailSize = 64;

diff --git a/src/modules/launcher/Wox.Launcher/dllmain.cpp b/src/modules/launcher/Wox.Launcher/dllmain.cpp
@@ -131,7 +131,7 @@ class Wox_Launcher : public PowertoyModuleIface {
   {
       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
@@ -1,5 +1,5 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("Wox")]
+[assembly: InternalsVisibleTo("PowerLauncher")]
 [assembly: InternalsVisibleTo("Wox.Core")]
 [assembly: InternalsVisibleTo("Wox.Test")]
diff --git a/src/modules/launcher/Wox/Images/app.png b/src/modules/launcher/Wox/Images/app.png
diff --git a/src/modules/launcher/Wox/Images/app_error.png b/src/modules/launcher/Wox/Images/app_error.png
diff --git a/src/modules/launcher/Wox/Properties/Resources.Designer.cs b/src/modules/launcher/Wox/Properties/Resources.Designer.cs
diff --git a/src/modules/launcher/Wox/Properties/Resources.resx b/src/modules/launcher/Wox/Properties/Resources.resx
@@ -112,13 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="app" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\app.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="placeholderLauncher" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\placeholderLauncher.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
diff --git a/src/modules/launcher/Wox/Properties/Settings.Designer.cs b/src/modules/launcher/Wox/Properties/Settings.Designer.cs
diff --git a/src/modules/launcher/Wox/Properties/Settings.settings b/src/modules/launcher/Wox/Properties/Settings.settings
@@ -1,9 +1,9 @@
 <?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Wox.Properties" GeneratedClassName="Settings">
+<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="Launcher.Properties" GeneratedClassName="Settings">
   <Profiles />
   <Settings>
     <Setting Name="GithubRepo" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">https://github.com/Wox-launcher/Wox</Value>
+      <Value Profile="(Default)">https://github.com/Microsoft/PowerToys</Value>
     </Setting>
   </Settings>
 </SettingsFile>
diff --git a/src/modules/launcher/Wox/Resources/app.ico b/src/modules/launcher/Wox/Resources/app.ico
diff --git a/src/modules/launcher/Wox/Resources/placeholderLauncher.ico b/src/modules/launcher/Wox/Resources/placeholderLauncher.ico
diff --git a/src/modules/launcher/Wox/Wox.csproj b/src/modules/launcher/Wox/Wox.csproj
@@ -6,10 +6,11 @@
     <UseWPF>true</UseWPF>
     <UseWindowsForms>true</UseWindowsForms>
     <StartupObject>Wox.App</StartupObject>
-    <ApplicationIcon>Resources\app.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\placeholderLauncher.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
+    <AssemblyName>PowerLauncher</AssemblyName>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 
@@ -181,11 +182,12 @@
     </None>
   </ItemGroup>
 
+
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="powershell.exe -NoProfile -ExecutionPolicy Bypass -File $(SolutionDir)src\modules\launcher\Scripts\post_build.ps1 $(ConfigurationName) $(SolutionDir)src\modules\launcher" />
   </Target>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
-    <Exec Command="taskkill /f /fi &quot;IMAGENAME eq Wox.exe&quot;" />
+    <Exec Command="taskkill /f /fi &quot;IMAGENAME eq PowerLauncher.exe&quot;" />
   </Target>
 </Project>
diff --git a/src/modules/launcher/Wox/app.png b/src/modules/launcher/Wox/app.png