diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 2b9d821d7c..7e9445f893 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -68,7 +68,6 @@ body:
- Peek
- PowerRename
- PowerToys Run
- - Projects
- Quick Accent
- Registry Preview
- Screen ruler
@@ -77,6 +76,7 @@ body:
- System tray interaction
- TextExtractor
- Video Conference Mute
+ - Workspaces
- Welcome / PowerToys Tour window
validations:
required: true
diff --git a/.github/ISSUE_TEMPLATE/translation_issue.yml b/.github/ISSUE_TEMPLATE/translation_issue.yml
index 0bf7d75efd..8a6cd56280 100644
--- a/.github/ISSUE_TEMPLATE/translation_issue.yml
+++ b/.github/ISSUE_TEMPLATE/translation_issue.yml
@@ -42,7 +42,6 @@ body:
- Peek
- PowerRename
- PowerToys Run
- - Projects
- Quick Accent
- Registry Preview
- Screen ruler
@@ -51,6 +50,7 @@ body:
- System tray interaction
- TextExtractor
- Video Conference Mute
+ - Workspaces
- Welcome / PowerToys Tour window
validations:
required: true
diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 158f65762f..ba10752a53 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -1214,9 +1214,6 @@ PRODUCTVERSION
Progman
programdata
projectname
-PROJECTSEDITOR
-PROJECTSLAUNCHER
-PROJECTSSNAPSHOTTOOL
PROPBAG
PROPERTYKEY
propkey
@@ -1846,6 +1843,9 @@ WNDCLASSEXW
WNDCLASSW
WNDPROC
workarounds
+WORKSPACESEDITOR
+WORKSPACESLAUNCHER
+WORKSPACESSNAPSHOTTOOL
wox
wparam
wpf
diff --git a/.pipelines/ESRPSigning_core.json b/.pipelines/ESRPSigning_core.json
index 402cfd6cf6..b873c42b90 100644
--- a/.pipelines/ESRPSigning_core.json
+++ b/.pipelines/ESRPSigning_core.json
@@ -189,13 +189,13 @@
"WinUI3Apps\\PowerToys.PowerRenameContextMenu.dll",
"WinUI3Apps\\PowerRenameContextMenuPackage.msix",
- "PowerToys.ProjectsSnapshotTool.exe",
- "PowerToys.ProjectsLauncher.exe",
- "PowerToys.ProjectsEditor.exe",
- "PowerToys.ProjectsEditor.dll",
- "PowerToys.ProjectsLauncherUI.exe",
- "PowerToys.ProjectsLauncherUI.dll",
- "PowerToys.ProjectsModuleInterface.dll",
+ "PowerToys.WorkspacesSnapshotTool.exe",
+ "PowerToys.WorkspacesLauncher.exe",
+ "PowerToys.WorkspacesEditor.exe",
+ "PowerToys.WorkspacesEditor.dll",
+ "PowerToys.WorkspacesLauncherUI.exe",
+ "PowerToys.WorkspacesLauncherUI.dll",
+ "PowerToys.WorkspacesModuleInterface.dll",
"WinUI3Apps\\PowerToys.RegistryPreviewExt.dll",
"WinUI3Apps\\PowerToys.RegistryPreviewUILib.dll",
diff --git a/installer/PowerToysSetup/Common.wxi b/installer/PowerToysSetup/Common.wxi
index dc318b7a4e..f036b3797b 100644
--- a/installer/PowerToysSetup/Common.wxi
+++ b/installer/PowerToysSetup/Common.wxi
@@ -18,7 +18,7 @@
-
+
diff --git a/installer/PowerToysSetup/Resources.wxs b/installer/PowerToysSetup/Resources.wxs
index 478ab2ad65..0f4e10f4a6 100644
--- a/installer/PowerToysSetup/Resources.wxs
+++ b/installer/PowerToysSetup/Resources.wxs
@@ -450,13 +450,13 @@
-
+
-
+
diff --git a/installer/PowerToysSetupCustomActions/CustomAction.cpp b/installer/PowerToysSetupCustomActions/CustomAction.cpp
index 492c8683ad..969d8f0c7f 100644
--- a/installer/PowerToysSetupCustomActions/CustomAction.cpp
+++ b/installer/PowerToysSetupCustomActions/CustomAction.cpp
@@ -1255,9 +1255,10 @@ UINT __stdcall TerminateProcessesCA(MSIHANDLE hInstall)
L"PowerToys.MouseWithoutBordersService.exe",
L"PowerToys.CropAndLock.exe",
L"PowerToys.EnvironmentVariables.exe",
- L"PowerToys.ProjectsSnapshotTool.exe",
- L"PowerToys.ProjectsLauncher.exe",
- L"PowerToys.ProjectsEditor.exe",
+ L"PowerToys.WorkspacesSnapshotTool.exe",
+ L"PowerToys.WorkspacesLauncher.exe",
+ L"PowerToys.WorkspacesLauncherUI.exe",
+ L"PowerToys.WorkspacesEditor.exe",
L"PowerToys.exe",
};
diff --git a/src/common/Common.UI/SettingsDeepLink.cs b/src/common/Common.UI/SettingsDeepLink.cs
index c1078c13f8..41bd2c012e 100644
--- a/src/common/Common.UI/SettingsDeepLink.cs
+++ b/src/common/Common.UI/SettingsDeepLink.cs
@@ -31,7 +31,7 @@ namespace Common.UI
EnvironmentVariables,
Dashboard,
AdvancedPaste,
- Projects,
+ Workspaces,
}
private static string SettingsWindowNameToString(SettingsWindow value)
@@ -78,8 +78,8 @@ namespace Common.UI
return "Dashboard";
case SettingsWindow.AdvancedPaste:
return "AdvancedPaste";
- case SettingsWindow.Projects:
- return "App Layouts";
+ case SettingsWindow.Workspaces:
+ return "Workspaces";
default:
{
return string.Empty;
diff --git a/src/common/ManagedCommon/ModuleType.cs b/src/common/ManagedCommon/ModuleType.cs
index 5112f6d724..6f15bc3a15 100644
--- a/src/common/ManagedCommon/ModuleType.cs
+++ b/src/common/ManagedCommon/ModuleType.cs
@@ -8,7 +8,6 @@ namespace ManagedCommon
{
AdvancedPaste,
AlwaysOnTop,
- AppLayouts,
Awake,
ColorPicker,
CropAndLock,
@@ -31,5 +30,6 @@ namespace ManagedCommon
MeasureTool,
ShortcutGuide,
PowerOCR,
+ Workspaces,
}
}
diff --git a/src/common/interop/interop.cpp b/src/common/interop/interop.cpp
index 1266fcb2ce..40f3389a73 100644
--- a/src/common/interop/interop.cpp
+++ b/src/common/interop/interop.cpp
@@ -196,8 +196,8 @@ public
return gcnew String(CommonSharedConstants::FANCY_ZONES_EDITOR_TOGGLE_EVENT);
}
- static String ^ ProjectsLaunchEditorEvent() {
- return gcnew String(CommonSharedConstants::PROJECTS_LAUNCH_EDITOR_EVENT);
+ static String ^ WorkspacesLaunchEditorEvent() {
+ return gcnew String(CommonSharedConstants::WORKSPACES_LAUNCH_EDITOR_EVENT);
}
static String ^ ColorPickerSendSettingsTelemetryEvent() {
diff --git a/src/common/interop/shared_constants.h b/src/common/interop/shared_constants.h
index 4fcfadadb4..ca5a6029c1 100644
--- a/src/common/interop/shared_constants.h
+++ b/src/common/interop/shared_constants.h
@@ -41,7 +41,7 @@ namespace CommonSharedConstants
const wchar_t FANCY_ZONES_EDITOR_TOGGLE_EVENT[] = L"Local\\FancyZones-ToggleEditorEvent-1e174338-06a3-472b-874d-073b21c62f14";
- const wchar_t PROJECTS_LAUNCH_EDITOR_EVENT[] = L"Local\\Projects-LaunchEditorEvent-a55ff427-cf62-4994-a2cd-9f72139296bf";
+ const wchar_t WORKSPACES_LAUNCH_EDITOR_EVENT[] = L"Local\\Workspaces-LaunchEditorEvent-a55ff427-cf62-4994-a2cd-9f72139296bf";
const wchar_t SHOW_HOSTS_EVENT[] = L"Local\\Hosts-ShowHostsEvent-5a0c0aae-5ff5-40f5-95c2-20e37ed671f0";
@@ -98,7 +98,7 @@ namespace CommonSharedConstants
const wchar_t SHOW_ENVIRONMENT_VARIABLES_EVENT[] = L"Local\\PowerToysEnvironmentVariables-ShowEnvironmentVariablesEvent-1021f616-e951-4d64-b231-a8f972159978";
const wchar_t SHOW_ENVIRONMENT_VARIABLES_ADMIN_EVENT[] = L"Local\\PowerToysEnvironmentVariables-EnvironmentVariablesAdminEvent-8c95d2ad-047c-49a2-9e8b-b4656326cfb2";
- const wchar_t PROJECTS_EXIT_EVENT[] = L"Local\\PowerToys-Projects-ExitEvent-29a1566f-f4f8-4d56-9435-d2a437f727c6";
+ const wchar_t WORKSPACES_EXIT_EVENT[] = L"Local\\PowerToys-Workspaces-ExitEvent-29a1566f-f4f8-4d56-9435-d2a437f727c6";
// Max DWORD for key code to disable keys.
const DWORD VK_DISABLED = 0x100;
diff --git a/src/common/logger/logger_settings.h b/src/common/logger/logger_settings.h
index 4c1fb01cca..345286a38b 100644
--- a/src/common/logger/logger_settings.h
+++ b/src/common/logger/logger_settings.h
@@ -69,10 +69,10 @@ struct LogSettings
inline const static std::string environmentVariablesLoggerName = "environment-variables";
inline const static std::wstring cmdNotFoundLogPath = L"Logs\\cmd-not-found-log.txt";
inline const static std::string cmdNotFoundLoggerName = "cmd-not-found";
- inline const static std::string projectsLauncherLoggerName = "projects-launcher";
- inline const static std::wstring projectsLauncherLogPath = L"projects-launcher-log.txt";
- inline const static std::string projectsSnapshotToolLoggerName = "projects-snapshot-tool";
- inline const static std::wstring projectsSnapshotToolLogPath = L"projects-snapshot-tool-log.txt";
+ inline const static std::string workspacesLauncherLoggerName = "workspaces-launcher";
+ inline const static std::wstring workspacesLauncherLogPath = L"workspaces-launcher-log.txt";
+ inline const static std::string workspacesSnapshotToolLoggerName = "workspaces-snapshot-tool";
+ inline const static std::wstring workspacesSnapshotToolLogPath = L"workspaces-snapshot-tool-log.txt";
inline const static int retention = 30;
std::wstring logLevel;
LogSettings();
diff --git a/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml b/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
index 0451051347..0cfc689316 100644
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/disableAllModules.dsc.yaml
@@ -57,7 +57,7 @@ properties:
EnableQoiThumbnail: false
PowerOcr:
Enabled: false
- Projects:
+ Workspaces:
Enabled: false
ShortcutGuide:
Enabled: false
diff --git a/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml b/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
index 27d82b3f3c..c3bd636177 100644
--- a/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
+++ b/src/dsc/Microsoft.PowerToys.Configure/examples/enableAllModules.dsc.yaml
@@ -57,7 +57,7 @@ properties:
EnableQoiThumbnail: true
PowerOcr:
Enabled: true
- Projects:
+ Workspaces:
Enabled: true
ShortcutGuide:
Enabled: true
diff --git a/src/runner/settings_window.cpp b/src/runner/settings_window.cpp
index e12ecb7b4b..6b48cfaadc 100644
--- a/src/runner/settings_window.cpp
+++ b/src/runner/settings_window.cpp
@@ -672,8 +672,8 @@ std::string ESettingsWindowNames_to_string(ESettingsWindowNames value)
return "MeasureTool";
case ESettingsWindowNames::PowerOCR:
return "PowerOcr";
- case ESettingsWindowNames::Projects:
- return "App Layouts";
+ case ESettingsWindowNames::Workspaces:
+ return "Workspaces";
case ESettingsWindowNames::RegistryPreview:
return "RegistryPreview";
case ESettingsWindowNames::CropAndLock:
@@ -755,9 +755,9 @@ ESettingsWindowNames ESettingsWindowNames_from_string(std::string value)
{
return ESettingsWindowNames::PowerOCR;
}
- else if (value == "App Layouts")
+ else if (value == "Workspaces")
{
- return ESettingsWindowNames::Projects;
+ return ESettingsWindowNames::Workspaces;
}
else if (value == "RegistryPreview")
{
diff --git a/src/runner/settings_window.h b/src/runner/settings_window.h
index d37a62e77d..741ad56479 100644
--- a/src/runner/settings_window.h
+++ b/src/runner/settings_window.h
@@ -20,7 +20,7 @@ enum class ESettingsWindowNames
Hosts,
MeasureTool,
PowerOCR,
- Projects,
+ Workspaces,
RegistryPreview,
CropAndLock,
EnvironmentVariables,
diff --git a/tools/BugReportTool/BugReportTool/ProcessesList.cpp b/tools/BugReportTool/BugReportTool/ProcessesList.cpp
index 803a1843f9..02591aa1d6 100644
--- a/tools/BugReportTool/BugReportTool/ProcessesList.cpp
+++ b/tools/BugReportTool/BugReportTool/ProcessesList.cpp
@@ -43,7 +43,8 @@ std::vector processes =
L"PowerToys.Peek.UI.exe",
L"PowerToys.CropAndLock.exe",
L"PowerToys.EnvironmentVariables.exe",
- L"PowerToys.ProjectsSnapshotTool.exe",
- L"PowerToys.ProjectsLauncher.exe",
- L"PowerToys.ProjectsEditor.exe",
+ L"PowerToys.WorkspacesSnapshotTool.exe",
+ L"PowerToys.WorkspacesLauncher.exe",
+ L"PowerToys.WorkspacesLauncherUI.exe",
+ L"PowerToys.WorkspacesEditor.exe",
};
diff --git a/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp b/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
index 6677b865b0..491828060d 100644
--- a/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
+++ b/tools/BugReportTool/BugReportTool/ReportGPOValues.cpp
@@ -54,7 +54,7 @@ void ReportGPOValues(const std::filesystem::path& tmpDir)
report << "getConfiguredMouseWithoutBordersEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredMouseWithoutBordersEnabledValue()) << std::endl;
report << "getConfiguredPowerRenameEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredPowerRenameEnabledValue()) << std::endl;
report << "getConfiguredPowerLauncherEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredPowerLauncherEnabledValue()) << std::endl;
- report << "getConfiguredProjectsEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredProjectsEnabledValue()) << std::endl;
+ report << "getConfiguredWorkspacesEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredWorkspacesEnabledValue()) << std::endl;
report << "getConfiguredQuickAccentEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredQuickAccentEnabledValue()) << std::endl;
report << "getConfiguredScreenRulerEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredScreenRulerEnabledValue()) << std::endl;
report << "getConfiguredShortcutGuideEnabledValue: " << gpo_rule_configured_to_string(powertoys_gpo::getConfiguredShortcutGuideEnabledValue()) << std::endl;