[File Explorer] Added an overall toggle switch (#23723) #33475
+247
−67
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -166,6 +166,18 @@ void PowerPreviewModule::enable() | |
| } | ||
|
|
||
| m_enabled = true; | ||
|
|
||
| try | ||
| { | ||
| PowerToysSettings::PowerToyValues settings = | ||
| PowerToysSettings::PowerToyValues::load_from_settings_file(PowerPreviewModule::get_key()); | ||
|
|
||
| apply_settings(settings); | ||
| } | ||
| catch (std::exception const& e) | ||
| { | ||
| Trace::InitSetErrorLoadingFile(e.what()); | ||
| } | ||
| } | ||
|
|
||
| // Disable active preview handlers. | ||
|
|
@@ -218,56 +230,59 @@ void PowerPreviewModule::apply_settings(const PowerToysSettings::PowerToyValues& | |
| { | ||
| bool notifyShell = false; | ||
|
|
||
| if (m_enabled) | ||
|
There was a problem hiding this comment. @htcfreek There was a problem hiding this comment. Sure. But the policy state won't be written into the settings file. You have to explicit query the policy values and evaluate them. Like here: There was a problem hiding this comment. Because you shouldn't be able to bypass a force-enabled add-on by turning off all extensions? There was a problem hiding this comment. But what about force disabled? There was a problem hiding this comment. What do you think of There was a problem hiding this comment. yes, it does look good to me now. |
||
| { | ||
| for (auto& fileExplorerModule : m_fileExplorerModules) | ||
| { | ||
| const auto toggle = settings.get_bool_value(fileExplorerModule.settingName); | ||
| const auto gpo_rule = fileExplorerModule.checkModuleGPOEnabledRuleFunction(); | ||
| const auto gpo_is_configured = gpo_rule == powertoys_gpo::gpo_rule_configured_enabled || gpo_rule == powertoys_gpo::gpo_rule_configured_disabled; | ||
|
|
||
| if (gpo_rule == powertoys_gpo::gpo_rule_configured_unavailable) | ||
| { | ||
| Logger::warn(L"Couldn't read the gpo rule for Power Preview module {}", fileExplorerModule.settingName); | ||
| } | ||
| if (gpo_rule == powertoys_gpo::gpo_rule_configured_wrong_value) | ||
| { | ||
| Logger::warn(L"gpo rule for Power Preview module {} is set to an unknown value", fileExplorerModule.settingName); | ||
| } | ||
|
|
||
| // Skip if no need to update | ||
| if (!toggle.has_value() && !gpo_is_configured) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| bool module_new_state = false; | ||
| if (toggle.has_value()) | ||
| { | ||
| module_new_state = *toggle; | ||
| } | ||
| if (gpo_is_configured) | ||
| { | ||
| // gpo rule overrides settings state | ||
| module_new_state = gpo_rule == powertoys_gpo::gpo_rule_configured_enabled; | ||
| } | ||
|
|
||
| // Skip if no need to update | ||
| if (module_new_state == fileExplorerModule.registryChanges.isApplied()) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| // (Un)Apply registry changes depending on the new setting value | ||
| const bool updated = module_new_state ? fileExplorerModule.registryChanges.apply() : fileExplorerModule.registryChanges.unApply(); | ||
|
|
||
| if (updated) | ||
| { | ||
| notifyShell = true; | ||
| Trace::PowerPreviewSettingsUpdated(fileExplorerModule.settingName.c_str(), !*toggle, *toggle, true); | ||
| } | ||
| else | ||
| { | ||
| Logger::error(L"Couldn't {} file explorer module {} during apply_settings", *toggle ? L"enable " : L"disable", fileExplorerModule.settingName); | ||
| Trace::PowerPreviewSettingsUpdateFailed(fileExplorerModule.settingName.c_str(), !*toggle, *toggle, true); | ||
| } | ||
| } | ||
| } | ||
| if (notifyShell) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will be 0.83.0 . Please update all occurrences.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done.