mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-04-03 17:56:44 +02:00
Adds BgcodeThumbnailProvider and BgcodePreviewHandler (#38667)
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [X] **Closes:** #30352 - [X] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected - [X] **Tests:** Added/updated and all pass - [X] **Localization:** All end user facing strings can be localized - [ ] **Dev docs:** Added/updated - [X] **New binaries:** Added on the required places - [X] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [X] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Provide a more detailed description of the PR, other things fixed or any additional comments/features here --> ## Detailed Description of the Pull Request / Additional comments   <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed - Close PowerToys if installed in your machine - Full build the solution: PowerToys.sln - Start PowerToys from PowerToys\x64\Debug\PowerToys.exe or PowerToys\x64\Release\PowerToys.exe - Toggle the "Binary G-code thumbnail previewer" setting to enable - Open HelperFiles folder on the tests and check if the icon changes to an image - Check explorer preview to see if image is also shown there --------- Co-authored-by: leileizhang <leilzh@microsoft.com>
This commit is contained in:
Pedro Lamas
@@ -125,6 +125,20 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
_gcodeRenderIsEnabled = Settings.Properties.EnableGcodePreview;
|
||||
}
|
||||
|
||||
_bgcodeRenderEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredBgcodePreviewEnabledValue();
|
||||
if (_bgcodeRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _bgcodeRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
||||
{
|
||||
// Get the enabled state from GPO.
|
||||
_bgcodeRenderEnabledStateIsGPOConfigured = true;
|
||||
_bgcodeRenderIsEnabled = _bgcodeRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
||||
_bgcodeRenderIsGpoEnabled = _bgcodeRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
||||
_bgcodeRenderIsGpoDisabled = _bgcodeRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled;
|
||||
}
|
||||
else
|
||||
{
|
||||
_bgcodeRenderIsEnabled = Settings.Properties.EnableBgcodePreview;
|
||||
}
|
||||
|
||||
_qoiRenderEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredQoiPreviewEnabledValue();
|
||||
if (_qoiRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _qoiRenderEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
||||
{
|
||||
@@ -181,6 +195,20 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
_gcodeThumbnailIsEnabled = Settings.Properties.EnableGcodeThumbnail;
|
||||
}
|
||||
|
||||
_bgcodeThumbnailEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredBgcodeThumbnailsEnabledValue();
|
||||
if (_bgcodeThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _bgcodeThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
||||
{
|
||||
// Get the enabled state from GPO.
|
||||
_bgcodeThumbnailEnabledStateIsGPOConfigured = true;
|
||||
_bgcodeThumbnailIsEnabled = _bgcodeThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
||||
_bgcodeThumbnailIsGpoEnabled = _bgcodeThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled;
|
||||
_bgcodeThumbnailIsGpoDisabled = _bgcodeThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled;
|
||||
}
|
||||
else
|
||||
{
|
||||
_bgcodeThumbnailIsEnabled = Settings.Properties.EnableBgcodeThumbnail;
|
||||
}
|
||||
|
||||
_stlThumbnailEnabledGpoRuleConfiguration = GPOWrapper.GetConfiguredStlThumbnailsEnabledValue();
|
||||
if (_stlThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Disabled || _stlThumbnailEnabledGpoRuleConfiguration == GpoRuleConfigured.Enabled)
|
||||
{
|
||||
@@ -251,6 +279,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
private bool _gcodeRenderIsGpoDisabled;
|
||||
private bool _gcodeRenderIsEnabled;
|
||||
|
||||
private GpoRuleConfigured _bgcodeRenderEnabledGpoRuleConfiguration;
|
||||
private bool _bgcodeRenderEnabledStateIsGPOConfigured;
|
||||
private bool _bgcodeRenderIsGpoEnabled;
|
||||
private bool _bgcodeRenderIsGpoDisabled;
|
||||
private bool _bgcodeRenderIsEnabled;
|
||||
|
||||
private GpoRuleConfigured _qoiRenderEnabledGpoRuleConfiguration;
|
||||
private bool _qoiRenderEnabledStateIsGPOConfigured;
|
||||
private bool _qoiRenderIsGpoEnabled;
|
||||
@@ -275,6 +309,12 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
private bool _gcodeThumbnailIsGpoDisabled;
|
||||
private bool _gcodeThumbnailIsEnabled;
|
||||
|
||||
private GpoRuleConfigured _bgcodeThumbnailEnabledGpoRuleConfiguration;
|
||||
private bool _bgcodeThumbnailEnabledStateIsGPOConfigured;
|
||||
private bool _bgcodeThumbnailIsGpoEnabled;
|
||||
private bool _bgcodeThumbnailIsGpoDisabled;
|
||||
private bool _bgcodeThumbnailIsEnabled;
|
||||
|
||||
private GpoRuleConfigured _stlThumbnailEnabledGpoRuleConfiguration;
|
||||
private bool _stlThumbnailEnabledStateIsGPOConfigured;
|
||||
private bool _stlThumbnailIsGpoEnabled;
|
||||
@@ -294,7 +334,8 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
{
|
||||
return _svgRenderEnabledStateIsGPOConfigured || _mdRenderEnabledStateIsGPOConfigured
|
||||
|| _monacoRenderEnabledStateIsGPOConfigured || _pdfRenderEnabledStateIsGPOConfigured
|
||||
|| _gcodeRenderEnabledStateIsGPOConfigured || _qoiRenderEnabledStateIsGPOConfigured;
|
||||
|| _gcodeRenderEnabledStateIsGPOConfigured || _qoiRenderEnabledStateIsGPOConfigured
|
||||
|| _bgcodeRenderEnabledStateIsGPOConfigured;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -304,7 +345,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
{
|
||||
return _svgThumbnailEnabledStateIsGPOConfigured || _pdfThumbnailEnabledStateIsGPOConfigured
|
||||
|| _gcodeThumbnailEnabledStateIsGPOConfigured || _stlThumbnailEnabledStateIsGPOConfigured
|
||||
|| _qoiThumbnailEnabledStateIsGPOConfigured;
|
||||
|| _qoiThumbnailEnabledStateIsGPOConfigured || _bgcodeThumbnailEnabledStateIsGPOConfigured;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -778,6 +819,48 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
}
|
||||
}
|
||||
|
||||
public bool BGCODERenderIsEnabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeRenderIsEnabled;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (_bgcodeRenderEnabledStateIsGPOConfigured)
|
||||
{
|
||||
// If it's GPO configured, shouldn't be able to change this state.
|
||||
return;
|
||||
}
|
||||
|
||||
if (value != _bgcodeRenderIsEnabled)
|
||||
{
|
||||
_bgcodeRenderIsEnabled = value;
|
||||
Settings.Properties.EnableBgcodePreview = value;
|
||||
RaisePropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Used to only disable enabled button on forced enabled state. (With this users still able to change the utility properties.)
|
||||
public bool BGCODERenderIsGpoEnabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeRenderIsGpoEnabled;
|
||||
}
|
||||
}
|
||||
|
||||
// Used to disable the settings card on forced disabled state.
|
||||
public bool BGCODERenderIsGpoDisabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeRenderIsGpoDisabled;
|
||||
}
|
||||
}
|
||||
|
||||
public bool GCODEThumbnailIsEnabled
|
||||
{
|
||||
get
|
||||
@@ -820,6 +903,48 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
|
||||
}
|
||||
}
|
||||
|
||||
public bool BGCODEThumbnailIsEnabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeThumbnailIsEnabled;
|
||||
}
|
||||
|
||||
set
|
||||
{
|
||||
if (_bgcodeThumbnailEnabledStateIsGPOConfigured)
|
||||
{
|
||||
// If it's GPO configured, shouldn't be able to change this state.
|
||||
return;
|
||||
}
|
||||
|
||||
if (value != _bgcodeThumbnailIsEnabled)
|
||||
{
|
||||
_bgcodeThumbnailIsEnabled = value;
|
||||
Settings.Properties.EnableBgcodeThumbnail = value;
|
||||
RaisePropertyChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Used to only disable enabled button on forced enabled state. (With this users still able to change the utility properties.)
|
||||
public bool BGCODEThumbnailIsGpoEnabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeThumbnailIsGpoEnabled;
|
||||
}
|
||||
}
|
||||
|
||||
// Used to disable the settings card on forced disabled state.
|
||||
public bool BGCODEThumbnailIsGpoDisabled
|
||||
{
|
||||
get
|
||||
{
|
||||
return _bgcodeThumbnailIsGpoDisabled;
|
||||
}
|
||||
}
|
||||
|
||||
public bool STLThumbnailIsEnabled
|
||||
{
|
||||
get
|
||||
|
||||
Reference in New Issue
Block a user