Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-10 05:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #76 from microsoft/MicrosoftLauncher

Browse Source 
Rename Wox.Launcher -> Microsoft.Launcher and Wox.Plugin.Indexer -> Microsoft.Plugin.Indexer
This commit is contained in:
Alekhya
2020-04-09 10:26:51 -07:00
committed by GitHub
parent 4e35b58d59 b7e6d8646f
commit a39faeec32
20 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
PowerToys.sln
View File

@@ -183,13 +183,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Shell", "src\mod
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "src\modules\launcher\Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Folder", "src\modules\launcher\Plugins\Wox.Plugin.Folder\Wox.Plugin.Folder.csproj", "{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Wox.Launcher", "src\modules\launcher\Wox.Launcher\Wox.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Plugin.Indexer", "src\modules\launcher\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}"
ProjectSection(ProjectDependencies) = postProject
{8451ECDD-2EA4-4966-BB0A-7BBC40138E80} = {8451ECDD-2EA4-4966-BB0A-7BBC40138E80}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.Launcher", "src\modules\launcher\Microsoft.Launcher\Microsoft.Launcher.vcxproj", "{E364F67B-BB12-4E91-B639-355866EBCD8B}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wox.Plugin.Indexer", "src\modules\launcher\Plugins\Wox.Plugin.Indexer\Wox.Plugin.Indexer.csproj", "{F8B870EB-D5F5-45BA-9CF7-A5C459818820}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher", "src\modules\launcher\PowerLauncher\PowerLauncher.csproj", "{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerLauncher", "src\modules\launcher\PowerLauncher\PowerLauncher.csproj", "{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerLauncher.UI", "src\modules\launcher\PowerLauncher.UI\PowerLauncher.UI.csproj", "{4A3DE70C-684C-410D-B851-C23B6DAEDF16}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerLauncher.UI", "src\modules\launcher\PowerLauncher.UI\PowerLauncher.UI.csproj", "{4A3DE70C-684C-410D-B851-C23B6DAEDF16}"
@@ -362,14 +365,14 @@ Global
{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.Build.0 = Debug|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Debug|x64.Build.0 = Debug|x64
{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.ActiveCfg = Release|x64
{787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64 {787B8AA6-CA93-4C84-96FE-DF31110AD1C4}.Release|x64.Build.0 = Release|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64
{F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.ActiveCfg = Debug|x64
{F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Debug|x64.Build.0 = Debug|x64
{F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.ActiveCfg = Release|x64
{F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64 {F8B870EB-D5F5-45BA-9CF7-A5C459818820}.Release|x64.Build.0 = Release|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.ActiveCfg = Debug|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Debug|x64.Build.0 = Debug|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.ActiveCfg = Release|x64
{E364F67B-BB12-4E91-B639-355866EBCD8B}.Release|x64.Build.0 = Release|x64
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.ActiveCfg = Debug|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.ActiveCfg = Debug|x64
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.Build.0 = Debug|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Debug|x64.Build.0 = Debug|x64
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Release|x64.ActiveCfg = Release|x64 {F97E5003-F263-4D4A-A964-0F1F3C82DEF2}.Release|x64.ActiveCfg = Release|x64
@@ -460,8 +463,8 @@ Global
{FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {FDB3555B-58EF-4AE6-B5F1-904719637AB4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
{C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {C21BFF9C-2C99-4B5F-B7C9-A5E6DDDB37B0} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
{787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {787B8AA6-CA93-4C84-96FE-DF31110AD1C4} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
{E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {F8B870EB-D5F5-45BA-9CF7-A5C459818820} = {4AFC9975-2456-4C70-94A4-84073C1CED93}
{E364F67B-BB12-4E91-B639-355866EBCD8B} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {F97E5003-F263-4D4A-A964-0F1F3C82DEF2} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{4A3DE70C-684C-410D-B851-C23B6DAEDF16} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68} {4A3DE70C-684C-410D-B851-C23B6DAEDF16} = {C140A3EF-6DBF-4084-9D4C-4EB5A99FEE68}
{880ED251-9E16-4713-9A70-D35FE0C01669} = {E775CC2C-24CB-48D6-9C3A-BE4CCE0DB17A} {880ED251-9E16-4713-9A70-D35FE0C01669} = {E775CC2C-24CB-48D6-9C3A-BE4CCE0DB17A}

0
src/modules/launcher/Wox.Launcher/Wox.Launcher.rc → src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.rc
View File

8
src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj → src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj
View File

@@ -16,7 +16,7 @@
<Keyword>Win32Proj</Keyword> <Keyword>Win32Proj</Keyword>
<RootNamespace>Wox_Launcher</RootNamespace> <RootNamespace>Wox_Launcher</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion> <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
<ProjectName>Wox.Launcher</ProjectName> <ProjectName>Microsoft.Launcher</ProjectName>
</PropertyGroup> </PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -109,14 +109,14 @@
</ClCompile> </ClCompile>
<ClCompile Include="trace.cpp" /> <ClCompile Include="trace.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="Wox.Launcher.rc" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\..\..\common\common.vcxproj"> <ProjectReference Include="..\..\..\common\common.vcxproj">
<Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project> <Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<ResourceCompile Include="Microsoft.Launcher.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>

2
src/modules/launcher/Wox.Launcher/Wox.Launcher.vcxproj.filters → src/modules/launcher/Microsoft.Launcher/Microsoft.Launcher.vcxproj.filters
View File

@@ -11,6 +11,6 @@
<ClInclude Include="resource.h" /> <ClInclude Include="resource.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="Wox.Launcher.rc" /> <ResourceCompile Include="Microsoft.Launcher.rc" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
src/modules/launcher/Wox.Launcher/dllmain.cpp → src/modules/launcher/Microsoft.Launcher/dllmain.cpp
View File

@@ -29,7 +29,7 @@ struct ModuleSettings {
} g_settings; } g_settings;
// Implement the PowerToy Module Interface and all the required methods. // Implement the PowerToy Module Interface and all the required methods.
class Wox_Launcher : public PowertoyModuleIface { class Microsoft_Launcher : public PowertoyModuleIface {
private: private:
// The PowerToy state. // The PowerToy state.
bool m_enabled = false; bool m_enabled = false;
@@ -45,12 +45,12 @@ private:
public: public:
// Constructor // Constructor
Wox_Launcher() { Microsoft_Launcher() {
app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME); app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME);
init_settings(); init_settings();
}; };
~Wox_Launcher() { ~Microsoft_Launcher() {
if (m_enabled) if (m_enabled)
{ {
TerminateProcess(m_hProcess, 1); TerminateProcess(m_hProcess, 1);
@@ -179,7 +179,7 @@ public:
}; };
// Load the settings file. // Load the settings file.
void Wox_Launcher::init_settings() { void Microsoft_Launcher::init_settings() {
try { try {
// Load and parse the settings file for this PowerToy. // Load and parse the settings file for this PowerToy.
PowerToysSettings::PowerToyValues settings = PowerToysSettings::PowerToyValues settings =
@@ -193,5 +193,5 @@ void Wox_Launcher::init_settings() {
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() { extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() {
return new Wox_Launcher(); return new Microsoft_Launcher();
} }

0
src/modules/launcher/Wox.Launcher/pch.cpp → src/modules/launcher/Microsoft.Launcher/pch.cpp
View File

0
src/modules/launcher/Wox.Launcher/pch.h → src/modules/launcher/Microsoft.Launcher/pch.h
View File

0
src/modules/launcher/Wox.Launcher/resource.h → src/modules/launcher/Microsoft.Launcher/resource.h
View File

0
src/modules/launcher/Wox.Launcher/trace.cpp → src/modules/launcher/Microsoft.Launcher/trace.cpp
View File

0
src/modules/launcher/Wox.Launcher/trace.h → src/modules/launcher/Microsoft.Launcher/trace.h
View File

0
src/modules/launcher/Plugins/Wox.Plugin.Indexer/Images/WindowsIndexerImg.bmp → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Images/WindowsIndexerImg.bmp
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

4
src/modules/launcher/Plugins/Wox.Plugin.Indexer/Main.cs → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Main.cs
View File

@@ -8,10 +8,10 @@ using Wox.Plugin;
using System.IO; using System.IO;
using System.ComponentModel; using System.ComponentModel;
using Wox.Infrastructure.Storage; using Wox.Infrastructure.Storage;
using Wox.Plugin.Indexer.SearchHelper; using Microsoft.Plugin.Indexer.SearchHelper;
using Microsoft.Search.Interop; using Microsoft.Search.Interop;
namespace Wox.Plugin.Indexer namespace Microsoft.Plugin.Indexer
{ {
class Main : IPlugin, ISavable, IPluginI18n class Main : IPlugin, ISavable, IPluginI18n
{ {

8
src/modules/launcher/Plugins/Wox.Plugin.Indexer/Wox.Plugin.Indexer.csproj → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Microsoft.Plugin.Indexer.csproj
View File

@@ -4,8 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<ProjectGuid>{F8B870EB-D5F5-45BA-9CF7-A5C459818820}</ProjectGuid> <ProjectGuid>{F8B870EB-D5F5-45BA-9CF7-A5C459818820}</ProjectGuid>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Wox.Plugin.Indexer</RootNamespace> <RootNamespace>Microsoft.Plugin.Indexer</RootNamespace>
<AssemblyName>Wox.Plugin.Indexer</AssemblyName> <AssemblyName>Microsoft.Plugin.Indexer</AssemblyName>
<useWPF>true</useWPF> <useWPF>true</useWPF>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath> <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
@@ -14,7 +14,7 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Wox.Plugin.Indexer\</OutputPath> <OutputPath>..\..\..\..\..\x64\Debug\modules\launcher\Plugins\Microsoft.Plugin.Indexer\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
@@ -26,7 +26,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Wox.Plugin.Indexer\</OutputPath> <OutputPath>..\..\..\..\..\x64\Release\modules\launcher\Plugins\Microsoft.Plugin.Indexer\</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>

2
src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/SearchResult.cs → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/SearchResult.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Wox.Plugin.Indexer.SearchHelper namespace Microsoft.Plugin.Indexer.SearchHelper
{ {
public class SearchResult public class SearchResult
{ {

2
src/modules/launcher/Plugins/Wox.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/SearchHelper/WindowsSearchAPI.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Data.OleDb; using System.Data.OleDb;
using Microsoft.Search.Interop; using Microsoft.Search.Interop;
namespace Wox.Plugin.Indexer.SearchHelper namespace Microsoft.Plugin.Indexer.SearchHelper
{ {
public class WindowsSearchAPI public class WindowsSearchAPI
{ {

2
src/modules/launcher/Plugins/Wox.Plugin.Indexer/Settings.cs → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/Settings.cs
View File

@@ -4,7 +4,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace Wox.Plugin.Indexer namespace Microsoft.Plugin.Indexer
{ {
public class Settings public class Settings
{ {

2
src/modules/launcher/Plugins/Wox.Plugin.Indexer/plugin.json → src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json
View File

@@ -7,6 +7,6 @@
"Version": "1.0.0", "Version": "1.0.0",
"Language": "csharp", "Language": "csharp",
"Website": "http://www.wox.one/plugin", "Website": "http://www.wox.one/plugin",
"ExecuteFileName": "Wox.Plugin.Indexer.dll", "ExecuteFileName": "Microsoft.Plugin.Indexer.dll",
"IcoPath": "Images\\WindowsIndexerImg.bmp" "IcoPath": "Images\\WindowsIndexerImg.bmp"
} }

2
src/modules/launcher/Wox.Test/Plugins/WindowsIndexerTest.cs
View File

@@ -3,7 +3,7 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data.OleDb; using System.Data.OleDb;
using Microsoft.Search.Interop; using Microsoft.Search.Interop;
using Wox.Plugin.Indexer.SearchHelper; using Microsoft.Plugin.Indexer.SearchHelper;
namespace Wox.Test.Plugins namespace Wox.Test.Plugins
{ {

2
src/modules/launcher/Wox.Test/Wox.Test.csproj
View File

@@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Plugins\Wox.Plugin.Indexer\Wox.Plugin.Indexer.csproj" /> <ProjectReference Include="..\Plugins\Microsoft.Plugin.Indexer\Microsoft.Plugin.Indexer.csproj" />
<ProjectReference Include="..\Wox.Core\Wox.Core.csproj" /> <ProjectReference Include="..\Wox.Core\Wox.Core.csproj" />
<ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" /> <ProjectReference Include="..\Wox.Infrastructure\Wox.Infrastructure.csproj" />
<ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" /> <ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />

2
src/runner/main.cpp
View File

@@ -201,7 +201,7 @@ int runner(bool isProcessElevated)
L"shortcut_guide.dll", L"shortcut_guide.dll",
L"fancyzones.dll", L"fancyzones.dll",
L"PowerRenameExt.dll", L"PowerRenameExt.dll",
L"Wox.Launcher.dll", L"Microsoft.Launcher.dll",
L"ImageResizerExt.dll", L"ImageResizerExt.dll",
L"powerpreview.dll", L"powerpreview.dll",
L"WindowWalker.dll" L"WindowWalker.dll"