Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 03:37:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

[Settings][Dashboard]Switch to settings page on module clicked (#29554)

Browse Source 
* Settings Dashboard: Adding feature switch to settings page if module panel clicked.

* fixing xaml styling

* Refactoring, creating common methods GetModuleAccentColor and GetModulePageType

* Correct button style to be invisible. Add the same functionality to the disabled modules.

* fixing XAML styling
This commit is contained in:
Laszlo Nemeth
2023-11-09 15:43:28 +01:00
committed by GitHub
parent 912d7ec060
commit 9620d265ae
4 changed files with 225 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/settings-ui/Settings.UI/Helpers/ModuleHelper.cs
View File

@@ -5,6 +5,8 @@
using global::PowerToys.GPOWrapper; using global::PowerToys.GPOWrapper;
using ManagedCommon; using ManagedCommon;
using Microsoft.PowerToys.Settings.UI.Library; using Microsoft.PowerToys.Settings.UI.Library;
using Microsoft.PowerToys.Settings.UI.Views;
using Windows.UI;
namespace Microsoft.PowerToys.Settings.UI.Helpers namespace Microsoft.PowerToys.Settings.UI.Helpers
{ {
@@ -129,5 +131,69 @@ namespace Microsoft.PowerToys.Settings.UI.Helpers
default: return GpoRuleConfigured.Unavailable; default: return GpoRuleConfigured.Unavailable;
} }
} }
public static Color GetModuleAccentColor(ModuleType moduleType)
{
return moduleType switch
{
ModuleType.AlwaysOnTop => Color.FromArgb(255, 74, 196, 242), // #4ac4f2
ModuleType.Awake => Color.FromArgb(255, 40, 177, 233), // #28b1e9
ModuleType.ColorPicker => Color.FromArgb(255, 7, 129, 211), // #0781d3
ModuleType.CropAndLock => Color.FromArgb(255, 32, 166, 228), // #20a6e4
ModuleType.EnvironmentVariables => Color.FromArgb(255, 16, 132, 208), // #1084d0
ModuleType.FancyZones => Color.FromArgb(255, 65, 209, 247), // #41d1f7
ModuleType.FileLocksmith => Color.FromArgb(255, 245, 161, 20), // #f5a114
ModuleType.FindMyMouse => Color.FromArgb(255, 104, 109, 112), // #686d70
ModuleType.Hosts => Color.FromArgb(255, 16, 132, 208), // #1084d0
ModuleType.ImageResizer => Color.FromArgb(255, 85, 207, 248), // #55cff8
ModuleType.KeyboardManager => Color.FromArgb(255, 224, 231, 238), // #e0e7ee
ModuleType.MouseHighlighter => Color.FromArgb(255, 17, 126, 199), // #117ec7
ModuleType.MouseJump => Color.FromArgb(255, 240, 240, 239), // #f0f0ef
ModuleType.MousePointerCrosshairs => Color.FromArgb(255, 25, 115, 182), // #1973b6
ModuleType.MouseWithoutBorders => Color.FromArgb(255, 31, 164, 227), // #1fa4e3
ModuleType.PastePlain => Color.FromArgb(255, 243, 156, 16), // #f39c10
ModuleType.Peek => Color.FromArgb(255, 255, 214, 103), // #ffd667
ModuleType.PowerRename => Color.FromArgb(255, 43, 186, 243), // #2bbaf3
ModuleType.PowerLauncher => Color.FromArgb(255, 51, 191, 240), // #33bff0
ModuleType.PowerAccent => Color.FromArgb(255, 84, 89, 92), // #54595c
ModuleType.RegistryPreview => Color.FromArgb(255, 17, 80, 138), // #11508a
ModuleType.MeasureTool => Color.FromArgb(255, 135, 144, 153), // #879099
ModuleType.ShortcutGuide => Color.FromArgb(255, 193, 202, 209), // #c1cad1
ModuleType.PowerOCR => Color.FromArgb(255, 24, 153, 224), // #1899e0
_ => Color.FromArgb(255, 255, 255, 255), // never called, all values listed above
};
}
public static System.Type GetModulePageType(ModuleType moduleType)
{
return moduleType switch
{
ModuleType.AlwaysOnTop => typeof(AlwaysOnTopPage),
ModuleType.Awake => typeof(AwakePage),
ModuleType.ColorPicker => typeof(ColorPickerPage),
ModuleType.CropAndLock => typeof(CropAndLockPage),
ModuleType.EnvironmentVariables => typeof(EnvironmentVariablesPage),
ModuleType.FancyZones => typeof(FancyZonesPage),
ModuleType.FileLocksmith => typeof(FileLocksmithPage),
ModuleType.FindMyMouse => typeof(MouseUtilsPage),
ModuleType.Hosts => typeof(HostsPage),
ModuleType.ImageResizer => typeof(ImageResizerPage),
ModuleType.KeyboardManager => typeof(KeyboardManagerPage),
ModuleType.MouseHighlighter => typeof(MouseUtilsPage),
ModuleType.MouseJump => typeof(MouseUtilsPage),
ModuleType.MousePointerCrosshairs => typeof(MouseUtilsPage),
ModuleType.MouseWithoutBorders => typeof(MouseWithoutBordersPage),
ModuleType.PastePlain => typeof(PastePlainPage),
ModuleType.Peek => typeof(PeekPage),
ModuleType.PowerRename => typeof(PowerRenamePage),
ModuleType.PowerLauncher => typeof(PowerLauncherPage),
ModuleType.PowerAccent => typeof(PowerAccentPage),
ModuleType.RegistryPreview => typeof(RegistryPreviewPage),
ModuleType.MeasureTool => typeof(MeasureToolPage),
ModuleType.ShortcutGuide => typeof(ShortcutGuidePage),
ModuleType.PowerOCR => typeof(PowerOcrPage),
_ => typeof(DashboardPage), // never called, all values listed above
};
}
} }
} }

252
src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml
View File

@@ -1,4 +1,4 @@
<Page <Page
x:Class="Microsoft.PowerToys.Settings.UI.Views.DashboardPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.DashboardPage"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
@@ -300,77 +300,86 @@
</ItemsRepeater.Layout> </ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate> <ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="viewmodels:DashboardListItem"> <DataTemplate x:DataType="viewmodels:DashboardListItem">
<Grid <Button
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" Padding="0"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalAlignment="Stretch"
BorderThickness="1" HorizontalContentAlignment="Stretch"
CornerRadius="{StaticResource OverlayCornerRadius}" Background="Transparent"
RowSpacing="0"> BorderThickness="0"
<Grid.RowDefinitions> Click="DashboardListItemClick"
<RowDefinition /> Tag="{x:Bind Tag, Mode=OneWay}">
<RowDefinition /> <Grid
</Grid.RowDefinitions> Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
<Border Grid.RowSpan="2" Opacity="0.05"> BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
<Border.Background> BorderThickness="1"
<LinearGradientBrush StartPoint="0,0" EndPoint="1,3"> CornerRadius="{StaticResource OverlayCornerRadius}"
<GradientStop Offset="0.5" Color="{x:Bind AccentColor, Mode=OneWay}" /> RowSpacing="0">
<GradientStop Offset="0.9" Color="Transparent" /> <Grid.RowDefinitions>
</LinearGradientBrush> <RowDefinition />
</Border.Background> <RowDefinition />
</Border> </Grid.RowDefinitions>
<Grid Margin="16,8,16,0" ColumnSpacing="12"> <Border Grid.RowSpan="2" Opacity="0.05">
<Grid.ColumnDefinitions> <Border.Background>
<ColumnDefinition Width="Auto" /> <LinearGradientBrush StartPoint="0,0" EndPoint="1,3">
<ColumnDefinition Width="*" /> <GradientStop Offset="0.5" Color="{x:Bind AccentColor, Mode=OneWay}" />
<ColumnDefinition Width="Auto" /> <GradientStop Offset="0.9" Color="Transparent" />
<ColumnDefinition Width="Auto" /> </LinearGradientBrush>
</Grid.ColumnDefinitions> </Border.Background>
<Image Width="20" Margin="0,0,0,0"> </Border>
<Image.Source> <Grid Margin="16,8,16,0" ColumnSpacing="12">
<BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" /> <Grid.ColumnDefinitions>
</Image.Source> <ColumnDefinition Width="Auto" />
</Image> <ColumnDefinition Width="*" />
<TextBlock <ColumnDefinition Width="Auto" />
Grid.Column="1" <ColumnDefinition Width="Auto" />
VerticalAlignment="Center" </Grid.ColumnDefinitions>
FontWeight="SemiBold" <Image Width="20" Margin="0,0,0,0">
Text="{x:Bind Label, Mode=OneWay}" <Image.Source>
TextTrimming="CharacterEllipsis" /> <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
<FontIcon </Image.Source>
Grid.Column="2" </Image>
Width="20" <TextBlock
Margin="0,0,-12,0" Grid.Column="1"
FontSize="16" VerticalAlignment="Center"
Glyph="&#xE72E;" FontWeight="SemiBold"
Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}"> Text="{x:Bind Label, Mode=OneWay}"
<ToolTipService.ToolTip> TextTrimming="CharacterEllipsis" />
<TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" /> <FontIcon
</ToolTipService.ToolTip> Grid.Column="2"
</FontIcon> Width="20"
<ToggleSwitch Margin="0,0,-12,0"
Grid.Column="3" FontSize="16"
Margin="0,-2,0,0" Glyph="&#xE72E;"
HorizontalAlignment="Right" Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}" <ToolTipService.ToolTip>
IsOn="{x:Bind IsEnabled, Mode=TwoWay}" <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
OffContent="" </ToolTipService.ToolTip>
OnContent="" </FontIcon>
Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" /> <ToggleSwitch
</Grid> Grid.Column="3"
Margin="0,-2,0,0"
HorizontalAlignment="Right"
IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
OffContent=""
OnContent=""
Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
</Grid>
<ItemsControl <ItemsControl
Grid.Row="1" Grid.Row="1"
Margin="16,8,16,16" Margin="16,8,16,16"
ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}" ItemTemplateSelector="{StaticResource ModuleItemTemplateSelector}"
ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}" ItemsSource="{x:Bind DashboardModuleItems, Mode=OneWay}"
Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"> Visibility="{x:Bind IsEnabled, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
<ItemsControl.ItemsPanel> <ItemsControl.ItemsPanel>
<ItemsPanelTemplate> <ItemsPanelTemplate>
<StackPanel Spacing="4" /> <StackPanel Spacing="4" />
</ItemsPanelTemplate> </ItemsPanelTemplate>
</ItemsControl.ItemsPanel> </ItemsControl.ItemsPanel>
</ItemsControl> </ItemsControl>
</Grid> </Grid>
</Button>
</DataTemplate> </DataTemplate>
</ItemsRepeater.ItemTemplate> </ItemsRepeater.ItemTemplate>
</ItemsRepeater> </ItemsRepeater>
@@ -389,53 +398,62 @@
</ItemsRepeater.Layout> </ItemsRepeater.Layout>
<ItemsRepeater.ItemTemplate> <ItemsRepeater.ItemTemplate>
<DataTemplate x:DataType="viewmodels:DashboardListItem"> <DataTemplate x:DataType="viewmodels:DashboardListItem">
<Grid <Button
Padding="16,12" Padding="0"
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}" HorizontalAlignment="Stretch"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}" HorizontalContentAlignment="Stretch"
BorderThickness="1" Background="Transparent"
CornerRadius="{StaticResource OverlayCornerRadius}" BorderThickness="0"
RowSpacing="12"> Click="DashboardListItemClick"
<Grid ColumnSpacing="12"> Tag="{x:Bind Tag, Mode=OneWay}">
<Grid.ColumnDefinitions> <Grid
<ColumnDefinition Width="Auto" /> Padding="16,12"
<ColumnDefinition Width="*" /> Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
<ColumnDefinition Width="Auto" /> BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
<ColumnDefinition Width="Auto" /> BorderThickness="1"
</Grid.ColumnDefinitions> CornerRadius="{StaticResource OverlayCornerRadius}"
<Image Width="20"> RowSpacing="12">
<Image.Source> <Grid ColumnSpacing="12">
<BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" /> <Grid.ColumnDefinitions>
</Image.Source> <ColumnDefinition Width="Auto" />
</Image> <ColumnDefinition Width="*" />
<TextBlock <ColumnDefinition Width="Auto" />
Grid.Column="1" <ColumnDefinition Width="Auto" />
VerticalAlignment="Center" </Grid.ColumnDefinitions>
FontWeight="SemiBold" <Image Width="20">
Text="{x:Bind Label, Mode=OneWay}" <Image.Source>
TextTrimming="CharacterEllipsis" /> <BitmapImage UriSource="{x:Bind Icon, Mode=OneWay}" />
<FontIcon </Image.Source>
Grid.Column="2" </Image>
Width="20" <TextBlock
Margin="0,0,-12,0" Grid.Column="1"
FontSize="16" VerticalAlignment="Center"
Glyph="&#xE72E;" FontWeight="SemiBold"
Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}"> Text="{x:Bind Label, Mode=OneWay}"
<ToolTipService.ToolTip> TextTrimming="CharacterEllipsis" />
<TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" /> <FontIcon
</ToolTipService.ToolTip> Grid.Column="2"
</FontIcon> Width="20"
<ToggleSwitch Margin="0,0,-12,0"
Grid.Column="3" FontSize="16"
Margin="0,-2,0,0" Glyph="&#xE72E;"
HorizontalAlignment="Right" Visibility="{x:Bind IsLocked, Converter={StaticResource BoolToInvertedVisibilityConverter}, ConverterParameter=True, Mode=OneWay}">
IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}" <ToolTipService.ToolTip>
IsOn="{x:Bind IsEnabled, Mode=TwoWay}" <TextBlock x:Uid="GPO_IsSettingForcedText" TextWrapping="WrapWholeWords" />
OffContent="" </ToolTipService.ToolTip>
OnContent="" </FontIcon>
Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" /> <ToggleSwitch
Grid.Column="3"
Margin="0,-2,0,0"
HorizontalAlignment="Right"
IsEnabled="{x:Bind IsLocked, Converter={StaticResource BoolNegationConverter}, ConverterParameter=True, Mode=OneWay}"
IsOn="{x:Bind IsEnabled, Mode=TwoWay}"
OffContent=""
OnContent=""
Style="{StaticResource RightAlignedCompactToggleSwitchStyle}" />
</Grid>
</Grid> </Grid>
</Grid> </Button>
</DataTemplate> </DataTemplate>
</ItemsRepeater.ItemTemplate> </ItemsRepeater.ItemTemplate>
</ItemsRepeater> </ItemsRepeater>

5
src/settings-ui/Settings.UI/SettingsXAML/Views/DashboardPage.xaml.cs
View File

@@ -49,5 +49,10 @@ namespace Microsoft.PowerToys.Settings.UI.Views
{ {
ViewModel.SWVersionButtonClicked(); ViewModel.SWVersionButtonClicked();
} }
private void DashboardListItemClick(object sender, RoutedEventArgs e)
{
ViewModel.DashboardListItemClick(sender);
}
} }
} }

52
src/settings-ui/Settings.UI/ViewModels/DashboardViewModel.cs
View File

@@ -78,7 +78,7 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled, IsLocked = gpo == GpoRuleConfigured.Enabled || gpo == GpoRuleConfigured.Disabled,
Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType), Icon = ModuleHelper.GetModuleTypeFluentIconName(moduleType),
EnabledChangedCallback = EnabledChangedOnUI, EnabledChangedCallback = EnabledChangedOnUI,
AccentColor = GetModuleAccentColor(moduleType), AccentColor = ModuleHelper.GetModuleAccentColor(moduleType),
DashboardModuleItems = GetModuleItems(moduleType), DashboardModuleItems = GetModuleItems(moduleType),
}); });
if (moduleType == ModuleType.KeyboardManager && gpo != GpoRuleConfigured.Disabled) if (moduleType == ModuleType.KeyboardManager && gpo != GpoRuleConfigured.Disabled)
@@ -88,38 +88,6 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
} }
} }
private Color GetModuleAccentColor(ModuleType moduleType)
{
return moduleType switch
{
ModuleType.AlwaysOnTop => Color.FromArgb(255, 74, 196, 242), // #4ac4f2
ModuleType.Awake => Color.FromArgb(255, 40, 177, 233), // #28b1e9
ModuleType.ColorPicker => Color.FromArgb(255, 7, 129, 211), // #0781d3
ModuleType.CropAndLock => Color.FromArgb(255, 32, 166, 228), // #20a6e4
ModuleType.EnvironmentVariables => Color.FromArgb(255, 16, 132, 208), // #1084d0
ModuleType.FancyZones => Color.FromArgb(255, 65, 209, 247), // #41d1f7
ModuleType.FileLocksmith => Color.FromArgb(255, 245, 161, 20), // #f5a114
ModuleType.FindMyMouse => Color.FromArgb(255, 104, 109, 112), // #686d70
ModuleType.Hosts => Color.FromArgb(255, 16, 132, 208), // #1084d0
ModuleType.ImageResizer => Color.FromArgb(255, 85, 207, 248), // #55cff8
ModuleType.KeyboardManager => Color.FromArgb(255, 224, 231, 238), // #e0e7ee
ModuleType.MouseHighlighter => Color.FromArgb(255, 17, 126, 199), // #117ec7
ModuleType.MouseJump => Color.FromArgb(255, 240, 240, 239), // #f0f0ef
ModuleType.MousePointerCrosshairs => Color.FromArgb(255, 25, 115, 182), // #1973b6
ModuleType.MouseWithoutBorders => Color.FromArgb(255, 31, 164, 227), // #1fa4e3
ModuleType.PastePlain => Color.FromArgb(255, 243, 156, 16), // #f39c10
ModuleType.Peek => Color.FromArgb(255, 255, 214, 103), // #ffd667
ModuleType.PowerRename => Color.FromArgb(255, 43, 186, 243), // #2bbaf3
ModuleType.PowerLauncher => Color.FromArgb(255, 51, 191, 240), // #33bff0
ModuleType.PowerAccent => Color.FromArgb(255, 84, 89, 92), // #54595c
ModuleType.RegistryPreview => Color.FromArgb(255, 17, 80, 138), // #11508a
ModuleType.MeasureTool => Color.FromArgb(255, 135, 144, 153), // #879099
ModuleType.ShortcutGuide => Color.FromArgb(255, 193, 202, 209), // #c1cad1
ModuleType.PowerOCR => Color.FromArgb(255, 24, 153, 224), // #1899e0
_ => Color.FromArgb(255, 255, 255, 255), // never called, all values listed above
};
}
private void LoadKBMSettingsFromJson() private void LoadKBMSettingsFromJson()
{ {
KeyboardManagerProfile kbmProfile = GetKBMProfile(); KeyboardManagerProfile kbmProfile = GetKBMProfile();
@@ -528,5 +496,23 @@ namespace Microsoft.PowerToys.Settings.UI.ViewModels
var actionName = "Launch"; var actionName = "Launch";
SendConfigMSG("{\"action\":{\"RegistryPreview\":{\"action_name\":\"" + actionName + "\", \"value\":\"\"}}}"); SendConfigMSG("{\"action\":{\"RegistryPreview\":{\"action_name\":\"" + actionName + "\", \"value\":\"\"}}}");
} }
internal void DashboardListItemClick(object sender)
{
Button button = sender as Button;
if (button == null)
{
return;
}
if (!(button.Tag is ModuleType))
{
return;
}
ModuleType moduleType = (ModuleType)button.Tag;
NavigationService.Navigate(ModuleHelper.GetModulePageType(moduleType));
}
} }
} }