rename: other

This commit is contained in:
Seraphima
2024-08-16 16:39:22 +02:00
parent 4825c62c50
commit a4e07a7b5d
18 changed files with 44 additions and 42 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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",

View File

@@ -18,7 +18,7 @@
<?define AdvancedPasteProjectName="AdvancedPaste"?>
<?define RegistryPreviewProjectName="RegistryPreview"?>
<?define PeekProjectName="Peek"?>
<?define ProjectsProjectName="Projects"?>
<?define WorkspacesProjectName="Workspaces"?>
<?define RepoDir="$(var.ProjectDir)..\..\" ?>
<?if $(var.Platform) = x64?>

View File

@@ -450,13 +450,13 @@
<File Id="PowerOCR_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.PowerOCR.resources.dll" />
</Component>
<Component
Id="ProjectsEditor_$(var.IdSafeLanguage)_Component"
Id="WorkspacesEditor_$(var.IdSafeLanguage)_Component"
Directory="Resource$(var.IdSafeLanguage)INSTALLFOLDER"
Guid="$(var.CompGUIDPrefix)21">
<RegistryKey Root="$(var.RegistryScope)" Key="Software\Classes\powertoys\components">
<RegistryValue Type="string" Name="ProjectsEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
<RegistryValue Type="string" Name="WorkspacesEditor_$(var.IdSafeLanguage)_Component" Value="" KeyPath="yes"/>
</RegistryKey>
<File Id="ProjectsEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.ProjectsEditor.resources.dll" />
<File Id="WorkspacesEditor_$(var.IdSafeLanguage)_File" Source="$(var.BinDir)\$(var.Language)\PowerToys.WorkspacesEditor.resources.dll" />
</Component>
<?undef IdSafeLanguage?>
<?undef CompGUIDPrefix?>

View File

@@ -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",
};

View File

@@ -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;

View File

@@ -8,7 +8,6 @@ namespace ManagedCommon
{
AdvancedPaste,
AlwaysOnTop,
AppLayouts,
Awake,
ColorPicker,
CropAndLock,
@@ -31,5 +30,6 @@ namespace ManagedCommon
MeasureTool,
ShortcutGuide,
PowerOCR,
Workspaces,
}
}

View File

@@ -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() {

View File

@@ -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;

View File

@@ -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();

View File

@@ -57,7 +57,7 @@ properties:
EnableQoiThumbnail: false
PowerOcr:
Enabled: false
Projects:
Workspaces:
Enabled: false
ShortcutGuide:
Enabled: false

View File

@@ -57,7 +57,7 @@ properties:
EnableQoiThumbnail: true
PowerOcr:
Enabled: true
Projects:
Workspaces:
Enabled: true
ShortcutGuide:
Enabled: true

View File

@@ -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")
{

View File

@@ -20,7 +20,7 @@ enum class ESettingsWindowNames
Hosts,
MeasureTool,
PowerOCR,
Projects,
Workspaces,
RegistryPreview,
CropAndLock,
EnvironmentVariables,

View File

@@ -43,7 +43,8 @@ std::vector<std::wstring> 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",
};

View File

@@ -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;