Merge branch 'dev/feature/projects' of https://github.com/microsoft/PowerToys into dev/feature/projects

This commit is contained in:
seraphima
2024-06-17 14:09:35 +02:00
3 changed files with 4 additions and 5 deletions

View File

@@ -181,7 +181,7 @@
<Grid HorizontalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*" /> <ColumnDefinition Width="*" />
<ColumnDefinition Width="120" /> <ColumnDefinition Width="110" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="12,14,10,10"> <StackPanel Orientation="Vertical" HorizontalAlignment="Left" Margin="12,14,10,10">
<TextBlock <TextBlock

View File

@@ -122,9 +122,9 @@ namespace ProjectsEditor.Models
_icon = Icon.ExtractAssociatedIcon(AppPath); _icon = Icon.ExtractAssociatedIcon(AppPath);
} }
} }
catch (Exception e) catch (Exception)
{ {
Logger.LogError($"Exception while extracting icon from app path: {AppPath}. Exception message: {e.Message}"); Logger.LogWarning($"Icon not found on app path: {AppPath}. Using default icon");
IsNotFound = true; IsNotFound = true;
_icon = new Icon(@"images\DefaultIcon.ico"); _icon = new Icon(@"images\DefaultIcon.ico");
} }

View File

@@ -75,8 +75,7 @@ public:
// Return the configured status for the gpo policy for the module // Return the configured status for the gpo policy for the module
virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override virtual powertoys_gpo::gpo_rule_configured_t gpo_policy_enabled_configuration() override
{ {
// TODO: return powertoys_gpo::getConfiguredProjectsEnabledValue(); return powertoys_gpo::getConfiguredProjectsEnabledValue();
return powertoys_gpo::gpo_rule_configured_enabled;
} }
// Return JSON with the configuration options. // Return JSON with the configuration options.