diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index ebb108aa5e..43d33d4a2e 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -150,13 +150,13 @@ build: - 'PowerToys.exe' - 'PowerToysInterop.dll' - 'PowerToysSettings.exe' - - 'SettingsUIRunner\Microsoft.PowerToys.Settings.UI.exe' - - 'SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Lib.dll' - - 'SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.dll' - - 'SettingsUIRunner\Microsoft.PowerToys.Settings.UI.Runner.exe' - - 'SettingsUIRunner\PowerToysInterop.dll' - - 'SettingsUIRunner\Telemetry.dll' - - 'SettingsUIRunner\ManagedCommon.dll' + - 'Settings\Microsoft.PowerToys.Settings.UI.exe' + - 'Settings\Microsoft.PowerToys.Settings.UI.Lib.dll' + - 'Settings\PowerToys.Settings.dll' + - 'Settings\PowerToys.Settings.exe' + - 'Settings\PowerToysInterop.dll' + - 'Settings\Telemetry.dll' + - 'Settings\ManagedCommon.dll' signing_options: sign_inline: true # This does signing a soon as this command completes - !!buildcommand diff --git a/PowerToys.sln b/PowerToys.sln index c31302780d..0b600fd0b0 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -21,7 +21,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "runner", "src\runner\runner {A7D5099E-F0FD-4BF3-8522-5A682759F915} = {A7D5099E-F0FD-4BF3-8522-5A682759F915} {0B43679E-EDFA-4DA0-AD30-F4628B308B1B} = {0B43679E-EDFA-4DA0-AD30-F4628B308B1B} {B25AC7A5-FB9F-4789-B392-D5C85E948670} = {B25AC7A5-FB9F-4789-B392-D5C85E948670} - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F} = {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F} {AF2349B8-E5B6-4004-9502-687C1C7730B1} = {AF2349B8-E5B6-4004-9502-687C1C7730B1} {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA} = {A46629C4-1A6C-40FA-A8B6-10E5102BB0BA} {17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E} @@ -188,8 +187,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "powerpreviewTest", "src\mod EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "settings-ui", "settings-ui", "{C3081D9A-1586-441A-B5F4-ED815B3719C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Settings.UI.Runner", "src\settings-ui\Microsoft.PowerToys.Settings.UI.Runner\Microsoft.PowerToys.Settings.UI.Runner.csproj", "{E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.PowerToys.Settings.UI", "src\settings-ui\Microsoft.PowerToys.Settings.UI\Microsoft.PowerToys.Settings.UI.csproj", "{A7D5099E-F0FD-4BF3-8522-5A682759F915}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4981CCD1-4CD9-4A49-B240-00AA46493FF8}" @@ -309,6 +306,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.PowerToys.Run.Plugin.Registry.UnitTests", "src\modules\launcher\Plugins\Microsoft.PowerToys.Run.Plugin.Registry.UnitTest\Microsoft.PowerToys.Run.Plugin.Registry.UnitTests.csproj", "{0648DF05-5DDA-4BE1-B5F2-584926EBDB65}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PowerToys.Settings", "src\settings-ui\PowerToys.Settings\PowerToys.Settings.csproj", "{6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|x64 = Debug|x64 @@ -475,10 +474,6 @@ Global {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Debug|x64.Build.0 = Debug|x64 {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.ActiveCfg = Release|x64 {47310AB4-9034-4BD1-8D8B-E88AD21A171B}.Release|x64.Build.0 = Release|x64 - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Debug|x64.ActiveCfg = Debug|x64 - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Debug|x64.Build.0 = Debug|x64 - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Release|x64.ActiveCfg = Release|x64 - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F}.Release|x64.Build.0 = Release|x64 {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.ActiveCfg = Debug|x64 {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Debug|x64.Build.0 = Debug|x64 {A7D5099E-F0FD-4BF3-8522-5A682759F915}.Release|x64.ActiveCfg = Release|x64 @@ -631,6 +626,10 @@ Global {0648DF05-5DDA-4BE1-B5F2-584926EBDB65}.Debug|x64.Build.0 = Debug|x64 {0648DF05-5DDA-4BE1-B5F2-584926EBDB65}.Release|x64.ActiveCfg = Release|x64 {0648DF05-5DDA-4BE1-B5F2-584926EBDB65}.Release|x64.Build.0 = Release|x64 + {6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A}.Debug|x64.ActiveCfg = Debug|x64 + {6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A}.Debug|x64.Build.0 = Debug|x64 + {6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A}.Release|x64.ActiveCfg = Release|x64 + {6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -681,7 +680,6 @@ Global {748417CA-F17E-487F-9411-CAFB6D3F4877} = {2F305555-C296-497E-AC20-5FA1B237996A} {217DF501-135C-4E38-BFC8-99D4821032EA} = {2F305555-C296-497E-AC20-5FA1B237996A} {47310AB4-9034-4BD1-8D8B-E88AD21A171B} = {2F305555-C296-497E-AC20-5FA1B237996A} - {E4E0D2AE-B17D-4BD4-8BEE-AFC8CC464C5F} = {C3081D9A-1586-441A-B5F4-ED815B3719C1} {A7D5099E-F0FD-4BF3-8522-5A682759F915} = {C3081D9A-1586-441A-B5F4-ED815B3719C1} {B1BCC8C6-46B5-4BFA-8F22-20F32D99EC6A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1} {F055103B-F80B-4D0C-BF48-057C55620033} = {5A7818A8-109C-4E1C-850D-1A654E234B0E} @@ -725,6 +723,7 @@ Global {C3A17DCA-217B-462C-BB0C-BE086AF80081} = {1AFB6476-670D-4E80-A464-657E01DFF482} {4BABF3FE-3451-42FD-873F-3C332E18DCEF} = {4AFC9975-2456-4C70-94A4-84073C1CED93} {0648DF05-5DDA-4BE1-B5F2-584926EBDB65} = {4AFC9975-2456-4C70-94A4-84073C1CED93} + {6ED2F4FC-E122-4CEE-90F1-97E4CCC8BC7A} = {C3081D9A-1586-441A-B5F4-ED815B3719C1} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {C3A2F9D1-7930-4EF4-A6FC-7EE0A99821D0} diff --git a/doc/devdocs/settingsv2/project-overview.md b/doc/devdocs/settingsv2/project-overview.md index f606942f85..0c63892414 100644 --- a/doc/devdocs/settingsv2/project-overview.md +++ b/doc/devdocs/settingsv2/project-overview.md @@ -11,7 +11,7 @@ The Settings.UI project contains the xaml files for each of the UI components. I #### [Viewmodels:](/src/core/Microsoft.PowerToys.Settings.UI.Library) The Settings.UI.Library project contains the data that is to be rendered by the UI components. -#### [Settings Runner:](/src/core/Microsoft.PowerToys.Settings.UI.Runner) +#### [Settings Runner:](/src/core/PowerToys.Settings) The function of the settings runner project is to communicate all changes that the user makes in the user interface, to the runner so that it can be dispatched and reflected in all the modules. [MVVM]: https://docs.microsoft.com/en-us/windows/uwp/data-binding/data-binding-and-mvvm \ No newline at end of file diff --git a/doc/devdocs/settingsv2/runner-ipc.md b/doc/devdocs/settingsv2/runner-ipc.md index d10dcd7848..c4dfbdda54 100644 --- a/doc/devdocs/settingsv2/runner-ipc.md +++ b/doc/devdocs/settingsv2/runner-ipc.md @@ -4,7 +4,7 @@ The Settings v2 process uses two way IPC to communicate with the runner process. ## Initialization - On the settings' side, the two way IPC delegates are contained with the [`ShellPage.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml.cs) file. The delegates are static and the views for all the powerToys send the ipc information to the viewmodels as `ShellPage.DefaultSndMSGCallBack`. -- These delegates are initialized within the [`Mainwindow.xaml.cs`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml.cs) file in the `Settings.Runner` project. +- These delegates are initialized within the [`Mainwindow.xaml.cs`](/src/core/PowerToys.Settings/MainWindow.xaml.cs) file in the `Settings.Runner` project. ## Types of IPC delegates diff --git a/doc/devdocs/settingsv2/ui-architecture.md b/doc/devdocs/settingsv2/ui-architecture.md index d64077dfd0..3772ef8e48 100644 --- a/doc/devdocs/settingsv2/ui-architecture.md +++ b/doc/devdocs/settingsv2/ui-architecture.md @@ -1,8 +1,8 @@ # UI Architecture - The UI code is distributed between two projects: [`Microsoft.PowerToys.Settings.UI.Runner`](/src/core/Microsoft.PowerToys.Settings.UI.Runner) and [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library). [`Microsoft.PowerToys.Settings.UI.Runner`](/src/core/Microsoft.PowerToys.Settings.UI.Runner) is a WPF .net core application. It contains the parent display window and corresponding code is present in [`MainWindow.xaml.`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library) is UWP applications and contains views for base navigation and modules. Fig 1 provides a description of the UI controls hierarchy and each of the controls have been summarized below : -- [`MainWindow.xaml`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) is the parent WPF control. -- `WindowsXamlHost` control is used to host UWP control to [`MainWindow.xaml`](/src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml) parent control. + The UI code is distributed between two projects: [`PowerToys.Settings`](/src/core/PowerToys.Settings) and [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library). [`PowerToys.Settings`](/src/core/PowerToys.Settings) is a WPF .net core application. It contains the parent display window and corresponding code is present in [`MainWindow.xaml.`](/src/core/PowerToys.Settings/MainWindow.xaml) [`Microsoft.PowerToys.Settings.UI`](/src/core/Microsoft.PowerToys.Settings.UI.Library) is UWP applications and contains views for base navigation and modules. Fig 1 provides a description of the UI controls hierarchy and each of the controls have been summarized below : +- [`MainWindow.xaml`](/src/core/PowerToys.Settings/MainWindow.xaml) is the parent WPF control. +- `WindowsXamlHost` control is used to host UWP control to [`MainWindow.xaml`](/src/core/PowerToys.Settings/MainWindow.xaml) parent control. - [`ShellPage.xaml`](/src/core/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml) is a UWP control, consisting of a side navigation panel with an icon for each module. Clicking on a module icon loads the corresponding `setting.json` file and displays the data in the UI. ![Settings UI architecture](/doc/images/settingsv2/ui-architecture.png) diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index a27f944dd8..22e1006f5c 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -264,7 +264,7 @@ - + @@ -635,89 +635,89 @@ - + - - + + - - + + - - + + - + - + - - + + - + - - + + - + - + - - + - + - + - + - + - + - + - + - + - + - + - + @@ -907,7 +907,7 @@ - + diff --git a/installer/PowerToysSetup/publish.cmd b/installer/PowerToysSetup/publish.cmd index a240c1c5b4..6f916c9fae 100644 --- a/installer/PowerToysSetup/publish.cmd +++ b/installer/PowerToysSetup/publish.cmd @@ -3,7 +3,7 @@ setlocal enableDelayedExpansion IF NOT DEFINED PTRoot (SET PTRoot=..\..) rem Publish Settings -SET settingsProfileFolderName=!PTRoot!\src\settings-ui\Microsoft.PowerToys.Settings.UI.Runner\Properties\PublishProfiles\ +SET settingsProfileFolderName=!PTRoot!\src\settings-ui\PowerToys.Settings\Properties\PublishProfiles\ rem Create the publish profile folder if it doesn't exist IF NOT EXIST !settingsProfileFolderName! (mkdir !settingsProfileFolderName!) SET settingsProfileFileName=SettingsProfile.pubxml @@ -20,7 +20,7 @@ echo ^FileSystem^ >> !settingsPublishPr echo ^Release^ >> !settingsPublishProfile! echo ^x64^ >> !settingsPublishProfile! echo ^netcoreapp3.1^ >> !settingsPublishProfile! -echo ^..\..\..\x64\Release\SettingsUIRunner^ >> !settingsPublishProfile! +echo ^..\..\..\x64\Release\Settings^ >> !settingsPublishProfile! echo ^win-x64^ >> !settingsPublishProfile! echo ^false^ >> !settingsPublishProfile! echo ^False^ >> !settingsPublishProfile! @@ -29,7 +29,7 @@ echo ^ >> !settingsPublishProfile! echo ^ >> !settingsPublishProfile! rem In case of Release we should not use Debug CRT in VCRT forwarders -msbuild !PTRoot!\src\settings-ui\Microsoft.PowerToys.Settings.UI.Runner\Microsoft.PowerToys.Settings.UI.Runner.csproj -t:Publish -p:Configuration="Release" -p:Platform="x64" -p:AppxBundle=Never -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=!settingsProfileFileName! +msbuild !PTRoot!\src\settings-ui\PowerToys.Settings\PowerToys.Settings.csproj -t:Publish -p:Configuration="Release" -p:Platform="x64" -p:AppxBundle=Never -p:VCRTForwarders-IncludeDebugCRT=false -p:PublishProfile=!settingsProfileFileName! rem Publish Launcher diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp index 9c90c19797..34a87709d7 100644 --- a/installer/PowerToysSetupCustomActions/CustomAction.cpp +++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp @@ -606,7 +606,7 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall) std::array processesToTerminate = { L"PowerLauncher.exe", - L"Microsoft.PowerToys.Settings.UI.Runner.exe", + L"PowerToys.Settings.exe", L"Microsoft.PowerToys.Settings.UI.exe", L"PowerToys.exe" }; diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp index ae8078f522..97a345a9ee 100644 --- a/src/runner/settings_window.cpp +++ b/src/runner/settings_window.cpp @@ -296,7 +296,7 @@ void run_settings_window() if (UseNewSettings()) { - executable_path.append(L"\\SettingsUIRunner\\Microsoft.PowerToys.Settings.UI.Runner.exe"); + executable_path.append(L"\\Settings\\PowerToys.Settings.exe"); } else { diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml b/src/settings-ui/PowerToys.Settings/App.xaml similarity index 79% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml rename to src/settings-ui/PowerToys.Settings/App.xaml index 3ec7ac0ca4..7eff0b2507 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml +++ b/src/settings-ui/PowerToys.Settings/App.xaml @@ -1,4 +1,4 @@ - diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml.cs b/src/settings-ui/PowerToys.Settings/App.xaml.cs similarity index 87% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml.cs rename to src/settings-ui/PowerToys.Settings/App.xaml.cs index ed44bcfbab..7eefca8e6c 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/App.xaml.cs +++ b/src/settings-ui/PowerToys.Settings/App.xaml.cs @@ -4,7 +4,7 @@ using System.Windows; -namespace Microsoft.PowerToys.Settings.UI.Runner +namespace PowerToys.Settings { /// /// Interaction logic for App.xaml. diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml b/src/settings-ui/PowerToys.Settings/MainWindow.xaml similarity index 84% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml rename to src/settings-ui/PowerToys.Settings/MainWindow.xaml index bdf4da5bf8..0dffeae7be 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml +++ b/src/settings-ui/PowerToys.Settings/MainWindow.xaml @@ -1,9 +1,9 @@ -WinExe netcoreapp3.1 true - Microsoft.PowerToys.Settings.UI.Runner.Program + PowerToys.Settings.Program Microsoft Corporation PowerToys PowerToys Settings UI Runner @@ -32,12 +32,12 @@ - ..\..\..\$(Platform)\$(Configuration)\SettingsUIRunner + ..\..\..\$(Platform)\$(Configuration)\Settings false - ..\..\..\$(Platform)\$(Configuration)\SettingsUIRunner + ..\..\..\$(Platform)\$(Configuration)\Settings true diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/Program.cs b/src/settings-ui/PowerToys.Settings/Program.cs similarity index 97% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/Program.cs rename to src/settings-ui/PowerToys.Settings/Program.cs index 8220056412..b4457d3881 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/Program.cs +++ b/src/settings-ui/PowerToys.Settings/Program.cs @@ -11,7 +11,7 @@ using interop; using ManagedCommon; using Windows.UI.Popups; -namespace Microsoft.PowerToys.Settings.UI.Runner +namespace PowerToys.Settings { public static class Program { @@ -32,7 +32,7 @@ namespace Microsoft.PowerToys.Settings.UI.Runner [STAThread] public static void Main(string[] args) { - using (new UI.App()) + using (new Microsoft.PowerToys.Settings.UI.App()) { App app = new App(); app.InitializeComponent(); diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/app.manifest b/src/settings-ui/PowerToys.Settings/app.manifest similarity index 100% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/app.manifest rename to src/settings-ui/PowerToys.Settings/app.manifest diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/icon.ico b/src/settings-ui/PowerToys.Settings/icon.ico similarity index 100% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Runner/icon.ico rename to src/settings-ui/PowerToys.Settings/icon.ico