mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-05 10:46:33 +02:00
Merge pull request #76 from microsoft/MicrosoftLauncher
Rename Wox.Launcher -> Microsoft.Launcher and Wox.Plugin.Indexer -> Microsoft.Plugin.Indexer
This commit is contained in:
@@ -16,7 +16,7 @@
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
<RootNamespace>Wox_Launcher</RootNamespace>
|
||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||
<ProjectName>Wox.Launcher</ProjectName>
|
||||
<ProjectName>Microsoft.Launcher</ProjectName>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
@@ -109,14 +109,14 @@
|
||||
</ClCompile>
|
||||
<ClCompile Include="trace.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="Wox.Launcher.rc" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\common\common.vcxproj">
|
||||
<Project>{74485049-c722-400f-abe5-86ac52d929b3}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="Microsoft.Launcher.rc" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
@@ -11,6 +11,6 @@
|
||||
<ClInclude Include="resource.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ResourceCompile Include="Wox.Launcher.rc" />
|
||||
<ResourceCompile Include="Microsoft.Launcher.rc" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
@@ -29,7 +29,7 @@ struct ModuleSettings {
|
||||
} g_settings;
|
||||
|
||||
// Implement the PowerToy Module Interface and all the required methods.
|
||||
class Wox_Launcher : public PowertoyModuleIface {
|
||||
class Microsoft_Launcher : public PowertoyModuleIface {
|
||||
private:
|
||||
// The PowerToy state.
|
||||
bool m_enabled = false;
|
||||
@@ -45,12 +45,12 @@ private:
|
||||
|
||||
public:
|
||||
// Constructor
|
||||
Wox_Launcher() {
|
||||
Microsoft_Launcher() {
|
||||
app_name = GET_RESOURCE_STRING(IDS_LAUNCHER_NAME);
|
||||
init_settings();
|
||||
};
|
||||
|
||||
~Wox_Launcher() {
|
||||
~Microsoft_Launcher() {
|
||||
if (m_enabled)
|
||||
{
|
||||
TerminateProcess(m_hProcess, 1);
|
||||
@@ -179,7 +179,7 @@ public:
|
||||
};
|
||||
|
||||
// Load the settings file.
|
||||
void Wox_Launcher::init_settings() {
|
||||
void Microsoft_Launcher::init_settings() {
|
||||
try {
|
||||
// Load and parse the settings file for this PowerToy.
|
||||
PowerToysSettings::PowerToyValues settings =
|
||||
@@ -193,5 +193,5 @@ void Wox_Launcher::init_settings() {
|
||||
|
||||
|
||||
extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() {
|
||||
return new Wox_Launcher();
|
||||
return new Microsoft_Launcher();
|
||||
}
|
||||
|
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 3.7 KiB |
@@ -8,10 +8,10 @@ using Wox.Plugin;
|
||||
using System.IO;
|
||||
using System.ComponentModel;
|
||||
using Wox.Infrastructure.Storage;
|
||||
using Wox.Plugin.Indexer.SearchHelper;
|
||||
using Microsoft.Plugin.Indexer.SearchHelper;
|
||||
using Microsoft.Search.Interop;
|
||||
|
||||
namespace Wox.Plugin.Indexer
|
||||
namespace Microsoft.Plugin.Indexer
|
||||
{
|
||||
class Main : IPlugin, ISavable, IPluginI18n
|
||||
{
|
||||
@@ -4,8 +4,8 @@
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<ProjectGuid>{F8B870EB-D5F5-45BA-9CF7-A5C459818820}</ProjectGuid>
|
||||
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||
<RootNamespace>Wox.Plugin.Indexer</RootNamespace>
|
||||
<AssemblyName>Wox.Plugin.Indexer</AssemblyName>
|
||||
<RootNamespace>Microsoft.Plugin.Indexer</RootNamespace>
|
||||
<AssemblyName>Microsoft.Plugin.Indexer</AssemblyName>
|
||||
<useWPF>true</useWPF>
|
||||
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
|
||||
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
|
||||
@@ -14,7 +14,7 @@
|
||||
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<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>
|
||||
<DebugType>full</DebugType>
|
||||
<PlatformTarget>x64</PlatformTarget>
|
||||
@@ -26,7 +26,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<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>
|
||||
<Optimize>true</Optimize>
|
||||
<DebugType>pdbonly</DebugType>
|
||||
@@ -4,7 +4,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Wox.Plugin.Indexer.SearchHelper
|
||||
namespace Microsoft.Plugin.Indexer.SearchHelper
|
||||
{
|
||||
public class SearchResult
|
||||
{
|
||||
@@ -3,7 +3,7 @@ using System.Collections.Generic;
|
||||
using System.Data.OleDb;
|
||||
using Microsoft.Search.Interop;
|
||||
|
||||
namespace Wox.Plugin.Indexer.SearchHelper
|
||||
namespace Microsoft.Plugin.Indexer.SearchHelper
|
||||
{
|
||||
public class WindowsSearchAPI
|
||||
{
|
||||
@@ -4,7 +4,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace Wox.Plugin.Indexer
|
||||
namespace Microsoft.Plugin.Indexer
|
||||
{
|
||||
public class Settings
|
||||
{
|
||||
@@ -7,6 +7,6 @@
|
||||
"Version": "1.0.0",
|
||||
"Language": "csharp",
|
||||
"Website": "http://www.wox.one/plugin",
|
||||
"ExecuteFileName": "Wox.Plugin.Indexer.dll",
|
||||
"ExecuteFileName": "Microsoft.Plugin.Indexer.dll",
|
||||
"IcoPath": "Images\\WindowsIndexerImg.bmp"
|
||||
}
|
||||
@@ -3,7 +3,7 @@ using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Data.OleDb;
|
||||
using Microsoft.Search.Interop;
|
||||
using Wox.Plugin.Indexer.SearchHelper;
|
||||
using Microsoft.Plugin.Indexer.SearchHelper;
|
||||
|
||||
namespace Wox.Test.Plugins
|
||||
{
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<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.Infrastructure\Wox.Infrastructure.csproj" />
|
||||
<ProjectReference Include="..\Wox.Plugin\Wox.Plugin.csproj" />
|
||||
|
||||
Reference in New Issue
Block a user