Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

FancyZones: FZ & FZE now live in a dedicated dir (#2837)

Browse Source
This commit is contained in:
Andrey Nekrasov
2020-05-11 21:22:23 +03:00
committed by GitHub
parent 592c55c524
commit 8aa8c296e1
4 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
installer/PowerToysSetup/Product.wxs
View File

@@ -223,6 +223,7 @@
<?undef IdSafeLanguage?> <?undef IdSafeLanguage?>
<?endforeach?> <?endforeach?>
<Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview" /> <Directory Id="FileExplorerPreviewInstallFolder" Name="FileExplorerPreview" />
<Directory Id="FancyZonesInstallFolder" Name="FancyZones" />
<Directory Id="LauncherInstallFolder" Name="launcher"> <Directory Id="LauncherInstallFolder" Name="launcher">
<Directory Id="AssetsFolder" Name="Assets" /> <Directory Id="AssetsFolder" Name="Assets" />
<Directory Id="LauncherImagesFolder" Name="Images" /> <Directory Id="LauncherImagesFolder" Name="Images" />
@@ -356,29 +357,33 @@
<File Source="$(var.BinX64Dir)svgs\overlay_portrait.svg" /> <File Source="$(var.BinX64Dir)svgs\overlay_portrait.svg" />
</Component> </Component>
</DirectoryRef> </DirectoryRef>
<DirectoryRef Id="FancyZonesInstallFolder" FileSource="$(var.BinX64Dir)modules\">
<Component Id="Module_FancyZones" Guid="C6B5272E-6ED4-4B80-B0E7-2FF0355D8CF4" Win64="yes">
<File Source="$(var.BinX64Dir)modules\fancyzones.dll" KeyPath="yes" />
<File Source="$(var.BinX64Dir)modules\FancyZones\FancyZonesEditor.exe" >
<netfx:NativeImage Id="FancyZonesEditor.exe" Platform="64bit" Priority="0" />
</File>
<File Source="$(var.BinX64Dir)modules\FancyZones\ControlzEx.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\MahApps.Metro.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\Microsoft.Xaml.Behaviors.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\FancyZonesEditor.exe.config" />
<File Source="$(var.BinX64Dir)modules\FancyZones\Microsoft.Bcl.AsyncInterfaces.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Buffers.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Memory.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Numerics.Vectors.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Runtime.CompilerServices.Unsafe.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Text.Encodings.Web.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Text.Json.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.Threading.Tasks.Extensions.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZones\System.ValueTuple.dll" />
</Component>
</DirectoryRef>
<DirectoryRef Id="ModulesInstallFolder" FileSource="$(var.BinX64Dir)modules\"> <DirectoryRef Id="ModulesInstallFolder" FileSource="$(var.BinX64Dir)modules\">
<Component Id="Module_ShortcutGuide" Guid="CBD0AC09-91D3-428E-B2B3-05745ADF3473" Win64="yes"> <Component Id="Module_ShortcutGuide" Guid="CBD0AC09-91D3-428E-B2B3-05745ADF3473" Win64="yes">
<File Source="$(var.BinX64Dir)modules\shortcut_guide.dll" KeyPath="yes" /> <File Source="$(var.BinX64Dir)modules\shortcut_guide.dll" KeyPath="yes" />
</Component> </Component>
<Component Id="Module_FancyZones" Guid="C6B5272E-6ED4-4B80-B0E7-2FF0355D8CF4" Win64="yes">
<File Source="$(var.BinX64Dir)modules\fancyzones.dll" KeyPath="yes" />
<File Source="$(var.BinX64Dir)modules\FancyZonesEditor.exe" >
<netfx:NativeImage Id="FancyZonesEditor.exe" Platform="64bit" Priority="0" />
</File>
<File Source="$(var.BinX64Dir)modules\ControlzEx.dll" />
<File Source="$(var.BinX64Dir)modules\MahApps.Metro.dll" />
<File Source="$(var.BinX64Dir)modules\Microsoft.Xaml.Behaviors.dll" />
<File Source="$(var.BinX64Dir)modules\FancyZonesEditor.exe.config" />
<File Source="$(var.BinX64Dir)modules\Microsoft.Bcl.AsyncInterfaces.dll" />
<File Source="$(var.BinX64Dir)modules\System.Buffers.dll" />
<File Source="$(var.BinX64Dir)modules\System.Memory.dll" />
<File Source="$(var.BinX64Dir)modules\System.Numerics.Vectors.dll" />
<File Source="$(var.BinX64Dir)modules\System.Runtime.CompilerServices.Unsafe.dll" />
<File Source="$(var.BinX64Dir)modules\System.Text.Encodings.Web.dll" />
<File Source="$(var.BinX64Dir)modules\System.Text.Json.dll" />
<File Source="$(var.BinX64Dir)modules\System.Threading.Tasks.Extensions.dll" />
<File Source="$(var.BinX64Dir)modules\System.ValueTuple.dll" />
</Component>
<Component Id="Module_PowerRename" Guid="E4401D08-27FE-4F96-BA17-0C61FD79E684" Win64="yes"> <Component Id="Module_PowerRename" Guid="E4401D08-27FE-4F96-BA17-0C61FD79E684" Win64="yes">
<File Source="$(var.BinX64Dir)modules\PowerRenameExt.dll" KeyPath="yes" /> <File Source="$(var.BinX64Dir)modules\PowerRenameExt.dll" KeyPath="yes" />
<RegistryKey Root="HKCR" Key="CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}"> <RegistryKey Root="HKCR" Key="CLSID\{0440049F-D1DC-4E46-B27B-98393D79486B}">

4
src/modules/fancyzones/editor/FancyZonesEditor/FancyZonesEditor.csproj
View File

@@ -57,7 +57,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>..\..\..\..\..\x64\Debug\modules\</OutputPath> <OutputPath>..\..\..\..\..\x64\Debug\modules\FancyZones</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@@ -69,7 +69,7 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\modules\</OutputPath> <OutputPath>$(SolutionDir)$(Platform)\$(Configuration)\modules\FancyZones</OutputPath>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>

2
src/modules/fancyzones/lib/FancyZones.cpp
View File

@@ -513,7 +513,7 @@ void FancyZones::ToggleEditor() noexcept
SHELLEXECUTEINFO sei{ sizeof(sei) }; SHELLEXECUTEINFO sei{ sizeof(sei) };
sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI };
sei.lpFile = L"modules\\FancyZonesEditor.exe"; sei.lpFile = L"modules\\FancyZones\\FancyZonesEditor.exe";
sei.lpParameters = params.c_str(); sei.lpParameters = params.c_str();
sei.nShow = SW_SHOWNORMAL; sei.nShow = SW_SHOWNORMAL;
ShellExecuteEx(&sei); ShellExecuteEx(&sei);

1
src/runner/main.cpp
View File

@@ -138,6 +138,7 @@ int runner(bool isProcessElevated)
std::unordered_set<std::wstring> module_folders = { std::unordered_set<std::wstring> module_folders = {
L"", L"",
L"FileExplorerPreview/", L"FileExplorerPreview/",
L"FancyZones/"
}; };
for (std::wstring subfolderName : module_folders) for (std::wstring subfolderName : module_folders)