mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
## Summary of the Pull Request - Add the ability for users and admins (GPO) to control whether to display built in New on the context menu. - Changes to the setting are immediately reflected in the experience. - Built-in New is restored on uninstall. ## PR Checklist Note: Supersedes https://github.com/microsoft/PowerToys/pull/39843 - [x] **Closes**: [New+] Replace default New entry #37545 and Replace "New" with New+ option #37946 - [x] **Communication:** Discussed with @niels9001 - 1/22/2025 - [x] **Tests:** Completed manual test pass see highlight below - [x] **Localization:** All end-user-facing strings can be localized - [x] **Dev docs:** Updated "doc\devdocs\modules\newplus.md" - [n/a] **New binaries:** Added on the required places - [n/a] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [x] [WXS for installer] Updated installer (uninstall custom action) - [n/a] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [n/a] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [No] **Documentation updated:** Pending, coming soon. (original PR https://github.com/MicrosoftDocs/windows-dev-docs/pull/5473) ## Detailed Description of the Pull Request / Additional comments Added the ability for users' admins' to display Windows built-in New or not I'm NOT aware of an official supported way to do this, so I'm achieving this by adding an invalid context menu handler in place of New in the Computer\HKEY_CURRENT_USER\Software\Classes\Directory\background\ShellEx\ContextMenuHandlers\New Changes are immediate, after applying the change, built-in New is shown/hidden accordingly Updates to New+ Settings UI New setting introduced to track user' preference (saved to newplus/settings.json) GPO setting introduced for control New visibility via GPO (GPO wins over user preference) Updates to New+ power_module.cpp When runner is running new plus will also apply built-in New admin GPO and user preference (GPO wins over user preference) to ensure correct behavior on setting restore and GPO application. Updates to installer Uninstall always reenable built-in "New" context menu Updated DevDoc Added a note on how to manually restore built-in New ## Validation Steps Performed Windows 11 x64 Settings UI New+ enabled New+ disabled GPO setting enabled GPO settings disabled Manually updating newplus/settings.json Windows 11 ARM64 I tested the reg hack manually, but didn't go through a full pass. Windows 10 x64 NOT tested. Windows 11, Settings, New+ Disabled and no GPO <img width="1040" height="1002" alt="image" src="https://github.com/user-attachments/assets/1b827b10-f009-4b0b-954f-d9311d40d201" /> Windows 11, Settings, New+ Enabled and no GPO <img width="1015" height="781" alt="image" src="https://github.com/user-attachments/assets/a5fa09d3-7fd3-4830-99a4-5f2ac9ce1a38" /> Hide built-in New: Off (the default) <img width="321" height="417" alt="image" src="https://github.com/user-attachments/assets/355fea60-bbb8-4f11-b648-291aaf0c4a6d" /> Hide built-in New: On <img width="1015" height="87" alt="image" src="https://github.com/user-attachments/assets/e83e45c4-6b67-443b-b045-26e7dda2cf46" /> Modern <img width="308" height="360" alt="image" src="https://github.com/user-attachments/assets/b164b240-6e67-410c-8481-7db3ee3225b7" /> Classic <img width="308" height="289" alt="image" src="https://github.com/user-attachments/assets/e2b6c262-a311-454c-9c76-40cb11ff2970" /> Disabling New+ also unhide New <img width="1031" height="569" alt="image" src="https://github.com/user-attachments/assets/29b8dae7-8190-4e64-b106-c6861e472a3d" /> <img width="308" height="353" alt="image" src="https://github.com/user-attachments/assets/e1977d6b-dc85-4db4-b9ab-c7bb2b27dde2" /> Windows 11, Settings, New+ Enabled and with GPO Hide built-in New: GPO enabled <img width="1020" height="691" alt="image" src="https://github.com/user-attachments/assets/75053ab8-92c6-4d38-b1b8-9b0d8293c207" /> Hide built-in New: GPO disabled <img width="1050" height="161" alt="image" src="https://github.com/user-attachments/assets/1a50b841-ff01-4662-a923-aee63717c834" />
278 lines
8.8 KiB
C++
278 lines
8.8 KiB
C++
#include "pch.h"
|
|
|
|
#include <common/utils/gpo.h>
|
|
#include <common/utils/json.h>
|
|
#include <common/SettingsAPI/settings_helpers.h>
|
|
#include <common/SettingsAPI/settings_objects.h>
|
|
|
|
#include "settings.h"
|
|
#include "constants.h"
|
|
#include "Generated Files/resource.h"
|
|
|
|
// NewSettings are stored in PowerToys/New/settings.json
|
|
// The New PowerToy enabled state is stored in the general PowerToys/settings.json
|
|
|
|
static bool LastModifiedTime(const std::wstring& file_Path, FILETIME* returned_file_timestamp)
|
|
{
|
|
WIN32_FILE_ATTRIBUTE_DATA attr{};
|
|
if (GetFileAttributesExW(file_Path.c_str(), GetFileExInfoStandard, &attr))
|
|
{
|
|
*returned_file_timestamp = attr.ftLastWriteTime;
|
|
return true;
|
|
}
|
|
return false;
|
|
}
|
|
|
|
NewSettings::NewSettings()
|
|
{
|
|
// New+ overall enable state is stored in the general settings json file
|
|
general_settings_json_file_path = PTSettingsHelper::get_powertoys_general_save_file_location();
|
|
|
|
// New+' actual settings are stored in new_settings_json_file_path
|
|
std::wstring settings_save_path = PTSettingsHelper::get_module_save_folder_location(newplus::constants::non_localizable::powertoy_key);
|
|
new_settings_json_file_path = settings_save_path + newplus::constants::non_localizable::settings_json_data_file_path;
|
|
|
|
RefreshEnabledState();
|
|
|
|
Load();
|
|
}
|
|
|
|
void NewSettings::Save()
|
|
{
|
|
PowerToysSettings::PowerToyValues values(newplus::constants::non_localizable::powertoy_key, newplus::constants::non_localizable::powertoy_key);
|
|
|
|
values.add_property(newplus::constants::non_localizable::settings_json_key_hide_file_extension, new_settings.hide_file_extension);
|
|
values.add_property(newplus::constants::non_localizable::settings_json_key_hide_starting_digits, new_settings.hide_starting_digits);
|
|
values.add_property(newplus::constants::non_localizable::settings_json_key_replace_variables, new_settings.replace_variables);
|
|
values.add_property(newplus::constants::non_localizable::settings_json_key_template_location, new_settings.template_location);
|
|
values.add_property(newplus::constants::non_localizable::settings_json_key_hide_built_in_new, new_settings.hide_built_in_new_preference);
|
|
|
|
values.save_to_settings_file();
|
|
|
|
GetSystemTimeAsFileTime(&new_settings_last_loaded_timestamp);
|
|
}
|
|
|
|
void NewSettings::Load()
|
|
{
|
|
if (!std::filesystem::exists(new_settings_json_file_path))
|
|
{
|
|
InitializeWithDefaultSettings();
|
|
|
|
Save();
|
|
}
|
|
else
|
|
{
|
|
ParseJson();
|
|
}
|
|
}
|
|
|
|
void NewSettings::InitializeWithDefaultSettings()
|
|
{
|
|
// Init the default New settings - in case the New/settings.json doesn't exist
|
|
// Currently a similar defaulting logic is also in InitializeWithDefaultSettings in NewViewModel.cs
|
|
SetHideFileExtension(true);
|
|
|
|
// By default Replace Variables is turned off
|
|
SetReplaceVariables(false);
|
|
|
|
SetTemplateLocation(GetTemplateLocationDefaultPath());
|
|
|
|
// By default we show the built-in New context menu
|
|
SetHideBuiltInNew(false);
|
|
}
|
|
|
|
void NewSettings::RefreshEnabledState()
|
|
{
|
|
// Load json general settings from data file, if it was modified since we last checked
|
|
FILETIME last_modified_timestamp{};
|
|
if (!(LastModifiedTime(general_settings_json_file_path, &last_modified_timestamp) &&
|
|
CompareFileTime(&last_modified_timestamp, &general_settings_last_loaded_timestamp) == 1))
|
|
{
|
|
return;
|
|
}
|
|
|
|
general_settings_last_loaded_timestamp = last_modified_timestamp;
|
|
|
|
auto json = json::from_file(general_settings_json_file_path);
|
|
if (!json)
|
|
{
|
|
return;
|
|
}
|
|
|
|
// Load the enabled settings for the New PowerToy via the general settings
|
|
const json::JsonObject& json_general_settings = json.value();
|
|
try
|
|
{
|
|
json::JsonObject powertoy_new_enabled_state;
|
|
json::get(json_general_settings, L"enabled", powertoy_new_enabled_state, json::JsonObject{});
|
|
json::get(powertoy_new_enabled_state, newplus::constants::non_localizable::powertoy_key, new_settings.enabled, false);
|
|
}
|
|
catch (const winrt::hresult_error&)
|
|
{
|
|
Logger::error(L"New+ unable to load enabled state from json");
|
|
}
|
|
}
|
|
|
|
void NewSettings::Reload()
|
|
{
|
|
// Load json New settings from data file, if it was modified since we last checked.
|
|
FILETIME very_latest_modified_timestamp{};
|
|
if (LastModifiedTime(new_settings_json_file_path, &very_latest_modified_timestamp) &&
|
|
CompareFileTime(&very_latest_modified_timestamp, &new_settings_last_loaded_timestamp) == 1)
|
|
{
|
|
Load();
|
|
}
|
|
}
|
|
|
|
void NewSettings::ParseJson()
|
|
{
|
|
PowerToysSettings::PowerToyValues settings =
|
|
PowerToysSettings::PowerToyValues::load_from_settings_file(newplus::constants::non_localizable::powertoy_key);
|
|
|
|
auto templateValue = settings.get_string_value(newplus::constants::non_localizable::settings_json_key_template_location);
|
|
if (templateValue.has_value())
|
|
{
|
|
new_settings.template_location = templateValue.value();
|
|
}
|
|
|
|
auto hideFileExtensionValue = settings.get_bool_value(newplus::constants::non_localizable::settings_json_key_hide_file_extension);
|
|
if (hideFileExtensionValue.has_value())
|
|
{
|
|
new_settings.hide_file_extension = hideFileExtensionValue.value();
|
|
}
|
|
|
|
auto hideStartingDigitsValue = settings.get_bool_value(newplus::constants::non_localizable::settings_json_key_hide_starting_digits);
|
|
if (hideStartingDigitsValue.has_value())
|
|
{
|
|
new_settings.hide_starting_digits = hideStartingDigitsValue.value();
|
|
}
|
|
|
|
auto resolveVariables = settings.get_bool_value(newplus::constants::non_localizable::settings_json_key_replace_variables);
|
|
if (resolveVariables.has_value())
|
|
{
|
|
new_settings.replace_variables = resolveVariables.value();
|
|
}
|
|
|
|
const auto hideBuiltInNewValue = settings.get_bool_value(newplus::constants::non_localizable::settings_json_key_hide_built_in_new);
|
|
if (hideBuiltInNewValue.has_value())
|
|
{
|
|
new_settings.hide_built_in_new_preference = hideBuiltInNewValue.value();
|
|
}
|
|
|
|
GetSystemTimeAsFileTime(&new_settings_last_loaded_timestamp);
|
|
}
|
|
|
|
bool NewSettings::GetEnabled()
|
|
{
|
|
auto gpoSetting = powertoys_gpo::getConfiguredNewPlusEnabledValue();
|
|
if (gpoSetting == powertoys_gpo::gpo_rule_configured_enabled)
|
|
{
|
|
return true;
|
|
}
|
|
if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
Reload();
|
|
|
|
RefreshEnabledState();
|
|
|
|
return new_settings.enabled;
|
|
}
|
|
|
|
bool NewSettings::GetHideFileExtension() const
|
|
{
|
|
const auto gpoSetting = powertoys_gpo::getConfiguredNewPlusHideTemplateFilenameExtensionValue();
|
|
|
|
if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return new_settings.hide_file_extension;
|
|
}
|
|
|
|
void NewSettings::SetHideFileExtension(const bool hide_file_extension)
|
|
{
|
|
new_settings.hide_file_extension = hide_file_extension;
|
|
}
|
|
|
|
bool NewSettings::GetHideStartingDigits() const
|
|
{
|
|
return new_settings.hide_starting_digits;
|
|
}
|
|
|
|
void NewSettings::SetHideStartingDigits(const bool hide_starting_digits)
|
|
{
|
|
new_settings.hide_starting_digits = hide_starting_digits;
|
|
}
|
|
|
|
bool NewSettings::GetReplaceVariables() const
|
|
{
|
|
const auto gpoSetting = powertoys_gpo::getConfiguredNewPlusReplaceVariablesValue();
|
|
|
|
if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return new_settings.replace_variables;
|
|
}
|
|
|
|
void NewSettings::SetReplaceVariables(const bool replace_variables)
|
|
{
|
|
new_settings.replace_variables = replace_variables;
|
|
}
|
|
|
|
std::wstring NewSettings::GetTemplateLocation() const
|
|
{
|
|
return new_settings.template_location;
|
|
}
|
|
|
|
void NewSettings::SetTemplateLocation(const std::wstring template_location)
|
|
{
|
|
new_settings.template_location = template_location;
|
|
}
|
|
|
|
std::wstring NewSettings::GetTemplateLocationDefaultPath() const
|
|
{
|
|
static const std::wstring default_template_sub_folder_name =
|
|
GET_RESOURCE_STRING_FALLBACK(
|
|
IDS_DEFAULT_TEMPLATE_SUB_FOLDER_NAME_WHERE_TEMPLATES_ARE_STORED,
|
|
L"Templates");
|
|
|
|
static const std::wstring full_path = PTSettingsHelper::get_module_save_folder_location(
|
|
newplus::constants::non_localizable::powertoy_key) +
|
|
L"\\" + default_template_sub_folder_name;
|
|
|
|
return full_path;
|
|
}
|
|
|
|
bool NewSettings::GetHideBuiltInNew()
|
|
{
|
|
const auto gpoSetting = powertoys_gpo::getConfiguredNewPlusHideBuiltInNewContextMenuValue();
|
|
if (gpoSetting == powertoys_gpo::gpo_rule_configured_enabled)
|
|
{
|
|
return true;
|
|
}
|
|
else if (gpoSetting == powertoys_gpo::gpo_rule_configured_disabled)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return new_settings.hide_built_in_new_preference;
|
|
}
|
|
|
|
void NewSettings::SetHideBuiltInNew(const bool hide_built_in_new)
|
|
{
|
|
new_settings.hide_built_in_new_preference = hide_built_in_new;
|
|
}
|
|
|
|
NewSettings& NewSettingsInstance()
|
|
{
|
|
static NewSettings instance;
|
|
|
|
return instance;
|
|
}
|