Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-06 03:07:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes

Browse Source
This commit is contained in:
Niels Laute
2021-08-04 18:43:11 +02:00
parent f059216dcc
commit fc4f2ffcea
8 changed files with 222 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
View File

@@ -19,7 +19,25 @@
<ResourceDictionary Source="/Themes/SettingsExpanderStyles.xaml"/> <ResourceDictionary Source="/Themes/SettingsExpanderStyles.xaml"/>
<ResourceDictionary Source="/Themes/SettingsSectionStyles.xaml"/> <ResourceDictionary Source="/Themes/SettingsSectionStyles.xaml"/>
</ResourceDictionary.MergedDictionaries> </ResourceDictionary.MergedDictionaries>
<Thickness x:Key="InfoBarIconMargin">6,16,20,16</Thickness>
<Thickness x:Key="InfoBarContentRootPadding">16,0,0,0</Thickness>
<Style TargetType="ListViewItem" >
<Setter Property="Margin" Value="0,0,0,2" />
<Setter Property="Padding" Value="2,0,0,0" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
</Style>
<x:Double x:Key="SecondaryTextFontSize">12</x:Double>
<Style x:Key="SecondaryTextStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource SecondaryTextFontSize}"/>
<Setter Property="Foreground" Value="{ThemeResource TextFillColorSecondaryBrush}"/>
</Style>
<converters:ModuleEnabledToOpacityConverter x:Key="ModuleEnabledToOpacityConverter"/> <converters:ModuleEnabledToOpacityConverter x:Key="ModuleEnabledToOpacityConverter"/>
<ResourceDictionary.ThemeDictionaries> <ResourceDictionary.ThemeDictionaries>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/Setting/Setting.xaml
View File

@@ -4,7 +4,7 @@
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"> xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
<Style TargetType="controls:Setting"> <Style TargetType="controls:Setting">
<Setter Property="CornerRadius" Value="4"/> <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}"/>
<Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" /> <Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
<Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" /> <Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />
@@ -68,7 +68,7 @@
<ContentPresenter <ContentPresenter
x:Name="DescriptionPresenter" x:Name="DescriptionPresenter"
Content="{TemplateBinding Description}" Content="{TemplateBinding Description}"
FontSize="12" FontSize="{StaticResource SecondaryTextFontSize}"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"> Foreground="{ThemeResource TextFillColorSecondaryBrush}">
<ContentPresenter.Resources> <ContentPresenter.Resources>
<Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}"> <Style TargetType="TextBlock" BasedOn="{StaticResource CaptionTextBlockStyle}">

37
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@@ -594,7 +594,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Example: outlook.exe</value> <value>Example: outlook.exe</value>
<comment>Don't translate outlook.exe</comment> <comment>Don't translate outlook.exe</comment>
</data> </data>
<data name="ImageResizer_CustomSizes.Text" xml:space="preserve"> <data name="ImageResizer_CustomSizes.Header" xml:space="preserve">
<value>Image sizes</value> <value>Image sizes</value>
</data> </data>
<data name="About_ImageResizer.ModuleDescription" xml:space="preserve"> <data name="About_ImageResizer.ModuleDescription" xml:space="preserve">
@@ -629,15 +629,11 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<value>Remove</value> <value>Remove</value>
<comment>Removes a user defined setting group for Image Resizer</comment> <comment>Removes a user defined setting group for Image Resizer</comment>
</data> </data>
<data name="RemoveTooltip.Text" xml:space="preserve">
<value>Remove</value>
<comment>Removes a user defined setting group for Image Resizer</comment>
</data>
<data name="ImageResizer_Image.AutomationProperties.Name" xml:space="preserve"> <data name="ImageResizer_Image.AutomationProperties.Name" xml:space="preserve">
<value>Image Resizer</value> <value>Image Resizer</value>
</data> </data>
<data name="ImageResizer_AddSizeButton.Label" xml:space="preserve"> <data name="ImageResizer_AddSizeButton.Content" xml:space="preserve">
<value>Add size</value> <value>Add a size</value>
</data> </data>
<data name="ImageResizer_SaveSizeButton.Label" xml:space="preserve"> <data name="ImageResizer_SaveSizeButton.Label" xml:space="preserve">
<value>Save sizes</value> <value>Save sizes</value>
@@ -651,7 +647,7 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="ImageResizer_TIFFCompression.Header" xml:space="preserve"> <data name="ImageResizer_TIFFCompression.Header" xml:space="preserve">
<value>TIFF compression</value> <value>TIFF compression</value>
</data> </data>
<data name="File.Text" xml:space="preserve"> <data name="File.Header" xml:space="preserve">
<value>File</value> <value>File</value>
<comment>as in a computer file</comment> <comment>as in a computer file</comment>
</data> </data>
@@ -799,8 +795,8 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="General_Repository.Label" xml:space="preserve"> <data name="General_Repository.Label" xml:space="preserve">
<value>GitHub repository</value> <value>GitHub repository</value>
</data> </data>
<data name="General_Updates.Header" xml:space="preserve"> <data name="General_Version.Header" xml:space="preserve">
<value>Updates</value> <value>Version</value>
</data> </data>
<data name="General_VersionLastChecked.Text" xml:space="preserve"> <data name="General_VersionLastChecked.Text" xml:space="preserve">
<value>Last checked: </value> <value>Last checked: </value>
@@ -827,13 +823,13 @@ Disabling this module or closing PowerToys will unmute the microphone and camera
<data name="ImageResizer_FileFormatDescription.Text" xml:space="preserve"> <data name="ImageResizer_FileFormatDescription.Text" xml:space="preserve">
<value>The following parameters can be used:</value> <value>The following parameters can be used:</value>
</data> </data>
<data name="ImageResizer_FilenameFormatHeader.Text" xml:space="preserve"> <data name="ImageResizer_FilenameFormatHeader.Header" xml:space="preserve">
<value>Filename format</value> <value>Filename format</value>
</data> </data>
<data name="ImageResizer_UseOriginalDate.Content" xml:space="preserve"> <data name="ImageResizer_UseOriginalDate.Content" xml:space="preserve">
<value>Use original date modified</value> <value>Use original date modified</value>
</data> </data>
<data name="Encoding.Text" xml:space="preserve"> <data name="Encoding.Header" xml:space="preserve">
<value>Encoding</value> <value>Encoding</value>
</data> </data>
<data name="KeyboardManager_RemapKeyboardSubtitle.Text" xml:space="preserve"> <data name="KeyboardManager_RemapKeyboardSubtitle.Text" xml:space="preserve">
@@ -884,13 +880,13 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<data name="FileExplorerPreview_PreviewPane_GroupSettings.Header" xml:space="preserve"> <data name="FileExplorerPreview_PreviewPane_GroupSettings.Header" xml:space="preserve">
<value>Preview Pane</value> <value>Preview Pane</value>
</data> </data>
<data name="FileExplorerPreview_RunAsAdminRequired.Message" xml:space="preserve"> <data name="FileExplorerPreview_RunAsAdminRequired.Title" xml:space="preserve">
<value>You need to run as administrator to modify these settings.</value> <value>You need to run as administrator to modify these settings.</value>
</data> </data>
<data name="FileExplorerPreview_AffectsAllUsers.Message" xml:space="preserve"> <data name="FileExplorerPreview_AffectsAllUsers.Title" xml:space="preserve">
<value>The settings on this page affect all users on the system</value> <value>The settings on this page affect all users on the system</value>
</data> </data>
<data name="FileExplorerPreview_RebootRequired.Message" xml:space="preserve"> <data name="FileExplorerPreview_RebootRequired.Title" xml:space="preserve">
<value>A reboot may be required for changes to these settings to take effect</value> <value>A reboot may be required for changes to these settings to take effect</value>
</data> </data>
<data name="FancyZones_ExcludeApps_TextBoxControl.PlaceholderText" xml:space="preserve"> <data name="FancyZones_ExcludeApps_TextBoxControl.PlaceholderText" xml:space="preserve">
@@ -1325,25 +1321,25 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<value>Read more</value> <value>Read more</value>
</data> </data>
<data name="General_NewVersionAvailable.Title" xml:space="preserve"> <data name="General_NewVersionAvailable.Title" xml:space="preserve">
<value>A new version is available</value> <value>An update is available</value>
</data> </data>
<data name="General_Downloading.Text" xml:space="preserve"> <data name="General_Downloading.Text" xml:space="preserve">
<value>Downloading...</value> <value>Downloading...</value>
</data> </data>
<data name="General_TryAgainToDownloadAndInstall.Content" xml:space="preserve"> <data name="General_TryAgainToDownloadAndInstall.Content" xml:space="preserve">
<value>Try again to download and install</value> <value>Try again to download &amp; install</value>
</data> </data>
<data name="General_CheckingForUpdates.Text" xml:space="preserve"> <data name="General_CheckingForUpdates.Text" xml:space="preserve">
<value>Checking for updates...</value> <value>Checking for updates...</value>
</data> </data>
<data name="General_NewVersionReadyToInstall.Title" xml:space="preserve"> <data name="General_NewVersionReadyToInstall.Title" xml:space="preserve">
<value>A new version is ready to install</value> <value>An update is ready to install</value>
</data> </data>
<data name="General_UpToDate.Title" xml:space="preserve"> <data name="General_UpToDate.Title" xml:space="preserve">
<value>PowerToys is up to date</value> <value>PowerToys is up to date</value>
</data> </data>
<data name="General_DownloadAndInstall.Content" xml:space="preserve"> <data name="General_DownloadAndInstall.Content" xml:space="preserve">
<value>Download and install</value> <value>Download &amp; install</value>
</data> </data>
<data name="ImageResizer_Fit_Fill_ThirdPersonSingular" xml:space="preserve"> <data name="ImageResizer_Fit_Fill_ThirdPersonSingular" xml:space="preserve">
<value>Fills</value> <value>Fills</value>
@@ -1366,9 +1362,6 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<data name="ImageResizer_Unit_Pixel" xml:space="preserve"> <data name="ImageResizer_Unit_Pixel" xml:space="preserve">
<value>Pixels</value> <value>Pixels</value>
</data> </data>
<data name="EditTooltip.Text" xml:space="preserve">
<value>Edit</value>
</data>
<data name="EditButton.AutomationProperties.Name" xml:space="preserve"> <data name="EditButton.AutomationProperties.Name" xml:space="preserve">
<value>Edit</value> <value>Edit</value>
</data> </data>

59
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
View File

@@ -33,34 +33,32 @@
<toolkitcontrols:HeaderedItemsControl x:Uid="Awake_Behavior_GroupSettings"> <toolkitcontrols:HeaderedItemsControl x:Uid="Awake_Behavior_GroupSettings" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:Setting x:Uid="Awake_EnableDisplayKeepAwake" Icon="&#xE7FB;"> <controls:Setting x:Uid="Awake_EnableDisplayKeepAwake" Icon="&#xE7FB;">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<ToggleSwitch FlowDirection="RightToLeft" IsOn="{x:Bind ViewModel.KeepDisplayOn, Mode=TwoWay}" /> <ToggleSwitch FlowDirection="RightToLeft" IsOn="{x:Bind ViewModel.KeepDisplayOn, Mode=TwoWay}" />
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" /> <controls:Setting x:Uid="Awake_Mode" Icon="&#xEC4E;" Style="{StaticResource ExpanderHeaderSettingStyle}" />
</muxc:Expander.Header> </muxc:Expander.Header>
<muxc:Expander.Content> <muxc:Expander.Content>
<StackPanel Padding="16" Spacing="12"> <StackPanel Padding="56,16,16,24" Spacing="12">
<RadioButton x:Uid="Awake_NoKeepAwake" <RadioButton x:Uid="Awake_NoKeepAwake"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=0}">
IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=0}">
<RadioButton.Content> <RadioButton.Content>
<TextBlock TextWrapping="WrapWholeWords" LineHeight="20"> <TextBlock TextWrapping="WrapWholeWords" LineHeight="20">
<Run x:Uid="Awake_NoKeepAwakeContent"/> <Run x:Uid="Awake_NoKeepAwakeContent"/>
<LineBreak/> <LineBreak/>
<Run Foreground="{ThemeResource TextFillColorSecondaryBrush}" <Run Foreground="{ThemeResource TextFillColorSecondaryBrush}"
x:Uid="Awake_NoKeepAwakeDescription"/> x:Uid="Awake_NoKeepAwakeDescription"/>
</TextBlock> </TextBlock>
</RadioButton.Content> </RadioButton.Content>
</RadioButton> </RadioButton>
<RadioButton x:Uid="Awake_IndefiniteKeepAwake" <RadioButton x:Uid="Awake_IndefiniteKeepAwake"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=1}">
IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=1}">
<RadioButton.Content> <RadioButton.Content>
<TextBlock TextWrapping="WrapWholeWords" LineHeight="20"> <TextBlock TextWrapping="WrapWholeWords" LineHeight="20">
<Run x:Uid="Awake_IndefiniteKeepAwakeContent"/> <Run x:Uid="Awake_IndefiniteKeepAwakeContent"/>
@@ -71,8 +69,7 @@
</RadioButton.Content> </RadioButton.Content>
</RadioButton> </RadioButton>
<RadioButton x:Uid="Awake_TemporaryKeepAwake" <RadioButton x:Uid="Awake_TemporaryKeepAwake"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=2}">
IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=2}">
<RadioButton.Content> <RadioButton.Content>
<TextBlock TextWrapping="WrapWholeWords" LineHeight="20"> <TextBlock TextWrapping="WrapWholeWords" LineHeight="20">
<Run x:Uid="Awake_TemporaryKeepAwakeContent"/> <Run x:Uid="Awake_TemporaryKeepAwakeContent"/>
@@ -87,34 +84,28 @@
<StackPanel Margin="28,8,0,0" Orientation="Horizontal"> <StackPanel Margin="28,8,0,0" Orientation="Horizontal">
<muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Hours" <muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Hours"
Value="{x:Bind ViewModel.Hours, Mode=TwoWay}" Value="{x:Bind ViewModel.Hours, Mode=TwoWay}"
Minimum="0" Minimum="0"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
MinWidth="90" MinWidth="90"
IsEnabled="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}" SmallChange="1"
SmallChange="1" LargeChange="5"/>
LargeChange="5"/>
<muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Minutes" <muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Minutes"
Value="{x:Bind ViewModel.Minutes, Mode=TwoWay}" Value="{x:Bind ViewModel.Minutes, Mode=TwoWay}"
Minimum="0" Minimum="0"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
Margin="8,0,0,0" Margin="8,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsEnabled="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}" MinWidth="90"
MinWidth="90" SmallChange="1"
SmallChange="1" LargeChange="5"/>
LargeChange="5"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
</toolkitcontrols:HeaderedItemsControl> </toolkitcontrols:HeaderedItemsControl>
</StackPanel> </StackPanel>
</controls:SettingsPageControl.ModuleContent> </controls:SettingsPageControl.ModuleContent>

12
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -18,6 +18,8 @@
<localConverters:UpdatingStateCannotDownloadToVisibilityConverter x:Key="UpdatingStateCannotDownloadToVisibilityConverter" /> <localConverters:UpdatingStateCannotDownloadToVisibilityConverter x:Key="UpdatingStateCannotDownloadToVisibilityConverter" />
<localConverters:UpdatingStateReadyToDownloadToVisibilityConverter x:Key="UpdatingStateReadyToDownloadToVisibilityConverter" /> <localConverters:UpdatingStateReadyToDownloadToVisibilityConverter x:Key="UpdatingStateReadyToDownloadToVisibilityConverter" />
<localConverters:UpdatingStateReadyToInstallToVisibilityConverter x:Key="UpdatingStateReadyToInstallToVisibilityConverter" /> <localConverters:UpdatingStateReadyToInstallToVisibilityConverter x:Key="UpdatingStateReadyToInstallToVisibilityConverter" />
</Page.Resources> </Page.Resources>
<controls:SettingsPageControl x:Uid="General" <controls:SettingsPageControl x:Uid="General"
@@ -26,10 +28,10 @@
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<toolkitcontrols:HeaderedItemsControl x:Uid="General_Updates"> <toolkitcontrols:HeaderedItemsControl x:Uid="General_Version">
<controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;"> <controls:Setting Header="{Binding PowerToysVersion}" Icon="&#xE117;">
<controls:Setting.Description> <controls:Setting.Description>
<TextBlock> <TextBlock Style="{StaticResource SecondaryTextStyle}">
<Run x:Uid="General_VersionLastChecked" /> <Run x:Uid="General_VersionLastChecked" />
<Run Text="{Binding UpdateCheckedDate, Mode=OneWay}"/> <Run Text="{Binding UpdateCheckedDate, Mode=OneWay}"/>
</TextBlock> </TextBlock>
@@ -63,7 +65,7 @@
<muxc:InfoBar x:Uid="General_NewVersionAvailable" <muxc:InfoBar x:Uid="General_NewVersionAvailable"
IsOpen="True" IsOpen="True"
IsClosable="False" IsClosable="False"
Severity="Informational" Severity="Success"
Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}"> Visibility="{Binding PowerToysUpdatingState, Converter={StaticResource UpdatingStateReadyToDownloadToVisibilityConverter}}">
<muxc:InfoBar.Content> <muxc:InfoBar.Content>
<StackPanel Spacing="16"> <StackPanel Spacing="16">
@@ -90,6 +92,7 @@
</muxc:InfoBar.Content> </muxc:InfoBar.Content>
<muxc:InfoBar.ActionButton> <muxc:InfoBar.ActionButton>
<Button x:Uid="General_DownloadAndInstall" <Button x:Uid="General_DownloadAndInstall"
HorizontalAlignment="Right"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
IsEnabled="{Binding IsDownloadAllowed}"/> IsEnabled="{Binding IsDownloadAllowed}"/>
</muxc:InfoBar.ActionButton> </muxc:InfoBar.ActionButton>
@@ -118,6 +121,7 @@
</muxc:InfoBar.Content> </muxc:InfoBar.Content>
<muxc:InfoBar.ActionButton> <muxc:InfoBar.ActionButton>
<Button x:Uid="General_InstallNow" <Button x:Uid="General_InstallNow"
HorizontalAlignment="Right"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
IsEnabled="{Binding IsDownloadAllowed}"/> IsEnabled="{Binding IsDownloadAllowed}"/>
</muxc:InfoBar.ActionButton> </muxc:InfoBar.ActionButton>
@@ -156,6 +160,7 @@
</muxc:InfoBar.Content> </muxc:InfoBar.Content>
<muxc:InfoBar.ActionButton> <muxc:InfoBar.ActionButton>
<Button x:Uid="General_TryAgainToDownloadAndInstall" <Button x:Uid="General_TryAgainToDownloadAndInstall"
HorizontalAlignment="Right"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
IsEnabled="{Binding IsDownloadAllowed}"/> IsEnabled="{Binding IsDownloadAllowed}"/>
</muxc:InfoBar.ActionButton> </muxc:InfoBar.ActionButton>
@@ -202,7 +207,6 @@
IsClosable="False" IsClosable="False"
IsOpen="True" IsOpen="True"
Visibility="{Binding Mode=TwoWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/> Visibility="{Binding Mode=TwoWay, Path=IsElevated, Converter={StaticResource BoolToVisibilityConverter}}"/>
</StackPanel> </StackPanel>
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>

281
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@@ -8,6 +8,7 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:toolkitcontrols="using:Microsoft.Toolkit.Uwp.UI.Controls"
xmlns:toolkitconverters="using:Microsoft.Toolkit.Uwp.UI.Converters" xmlns:toolkitconverters="using:Microsoft.Toolkit.Uwp.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main" x:Name="RootPage"> AutomationProperties.LandmarkType="Main" x:Name="RootPage">
@@ -23,44 +24,63 @@
<controls:SettingsPageControl.ModuleContent> <controls:SettingsPageControl.ModuleContent>
<StackPanel> <StackPanel>
<ToggleSwitch x:Uid="ImageResizer_EnableToggle" <controls:Setting x:Uid="ImageResizer_EnableToggle">
IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/> <controls:Setting.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" ShowAsMonochrome="False" />
</controls:Setting.Icon>
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{x:Bind ViewModel.IsEnabled, Mode=TwoWay}" FlowDirection="RightToLeft" />
</controls:Setting.ActionContent>
</controls:Setting>
<TextBlock x:Uid="ImageResizer_CustomSizes"
Style="{StaticResource SettingsGroupTitleStyle}" <toolkitcontrols:HeaderedItemsControl x:Uid="ImageResizer_CustomSizes">
Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/> <controls:Setting x:Uid="ImageResizer_CustomSizes" Icon="&#xE2B2;">
<controls:Setting.ActionContent>
<Button x:Uid="ImageResizer_AddSizeButton" Click="AddSizeButton_Click" Style="{ThemeResource AccentButtonStyle}" />
</controls:Setting.ActionContent>
</controls:Setting>
</toolkitcontrols:HeaderedItemsControl>
<ListView x:Name="ImagesSizesListView" <ListView x:Name="ImagesSizesListView"
x:Uid="ImagesSizesListView" x:Uid="ImagesSizesListView"
ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}" ItemsSource="{x:Bind ViewModel.Sizes, Mode=TwoWay}"
Padding="-12,0,0,0"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
SelectionMode="None" SelectionMode="None"
ScrollViewer.HorizontalScrollMode="Enabled" ScrollViewer.HorizontalScrollMode="Enabled"
ScrollViewer.HorizontalScrollBarVisibility="Auto" ScrollViewer.HorizontalScrollBarVisibility="Auto"
ScrollViewer.IsHorizontalRailEnabled="True" ScrollViewer.IsHorizontalRailEnabled="True"
ContainerContentChanging="ImagesSizesListView_ContainerContentChanging"> ContainerContentChanging="ImagesSizesListView_ContainerContentChanging">
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize"> <DataTemplate x:Name="SingleLineDataTemplate" x:DataType="models:ImageSize">
<Grid Padding="0,12,12,12" Width="420" AutomationProperties.Name="{x:Bind Name, Mode=OneWay}"> <Grid AutomationProperties.Name="{x:Bind Name, Mode=OneWay}" HorizontalAlignment="Stretch"
<Grid.ColumnDefinitions> Background="{ThemeResource CardBackgroundBrush}"
<ColumnDefinition Width="40" /> BorderThickness="{ThemeResource CardBorderThickness}"
<ColumnDefinition Width="*" /> BorderBrush="{ThemeResource CardBorderBrush}"
<ColumnDefinition Width="52" /> CornerRadius="{ThemeResource ControlCornerRadius}"
</Grid.ColumnDefinitions> Padding="0,0,16,0"
MinHeight="68">
<FontIcon Glyph="&#xE73F;" FontSize="18" Margin="0,8,0,0" VerticalAlignment="Top" Grid.RowSpan="2" Foreground="{StaticResource SystemColorControlAccentBrush}" />
<StackPanel Orientation="Vertical" Grid.Column="1" Margin="0,0,16,0"> <Grid.ColumnDefinitions>
<TextBlock Text="{x:Bind Name, Mode=OneWay}" FontSize="18" /> <ColumnDefinition Width="56" />
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,4,0,0" > <ColumnDefinition Width="*" />
<TextBlock Text="{x:Bind Fit, Mode=OneWay, Converter={StaticResource ImageResizerFitToStringConverter}}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,0,4,0"/> <ColumnDefinition Width="52" />
<TextBlock Text="{x:Bind Width, Mode=OneWay}" FontWeight="SemiBold" Margin="0,0,4,0"/> </Grid.ColumnDefinitions>
<TextBlock Text="&#xE947;" FontFamily="Segoe MDL2 Assets" FontSize="11" AutomationProperties.AccessibilityView="Raw" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,5,4,0"/>
<TextBlock Text="{x:Bind Height, Mode=OneWay}" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" FontWeight="SemiBold" Margin="0,0,4,0"/> <StackPanel Orientation="Vertical" VerticalAlignment="Center" Grid.Column="1" Margin="0,0,16,0">
<TextBlock Text="{x:Bind Unit, Mode=OneWay, Converter={StaticResource ImageResizerUnitToStringConverter},ConverterParameter=ToLower}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,0,4,0"/> <TextBlock Text="{x:Bind Name, Mode=OneWay}"/>
<StackPanel Orientation="Horizontal" Grid.Row="1" Grid.Column="1" Margin="0,4,0,0">
<TextBlock Text="{x:Bind Fit, Mode=OneWay, Converter={StaticResource ImageResizerFitToStringConverter}}" Style="{ThemeResource SecondaryTextStyle}" Margin="0,0,4,0"/>
<TextBlock Text="{x:Bind Width, Mode=OneWay}" FontWeight="SemiBold" Margin="0,0,4,0" Style="{ThemeResource SecondaryTextStyle}"/>
<TextBlock Text="&#xE947;" FontFamily="{ThemeResource SymbolThemeFontFamily}" FontSize="10" AutomationProperties.AccessibilityView="Raw" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,5,4,0" Style="{ThemeResource SecondaryTextStyle}"/>
<TextBlock Text="{x:Bind Height, Mode=OneWay}" Visibility="{x:Bind Path=EnableEtraBoxes, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" FontWeight="SemiBold" Margin="0,0,4,0" Style="{ThemeResource SecondaryTextStyle}"/>
<TextBlock Text="{x:Bind Unit, Mode=OneWay, Converter={StaticResource ImageResizerUnitToStringConverter},ConverterParameter=ToLower}" Foreground="{ThemeResource SystemBaseMediumColor}" Margin="0,0,4,0" Style="{ThemeResource SecondaryTextStyle}"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Spacing="8" HorizontalAlignment="Right" Grid.Column="2" Orientation="Horizontal"> <StackPanel Spacing="8" HorizontalAlignment="Right" Grid.Column="2" Orientation="Horizontal">
<Button <Button
x:Uid="EditButton" x:Uid="EditButton"
@@ -144,131 +164,124 @@
</ListView> </ListView>
<StackPanel Orientation="Horizontal">
<AppBarButton Icon="Add"
x:Name="AddSizeButton"
Style="{StaticResource AddItemAppBarButtonStyle}"
IsEnabled="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"
x:Uid="ImageResizer_AddSizeButton"
Click="AddSizeButton_Click"
Margin="{StaticResource AddItemButtonMargin}"
/>
</StackPanel>
<TextBlock x:Uid="Encoding" <toolkitcontrols:HeaderedItemsControl x:Uid="Encoding">
Style="{StaticResource SettingsGroupTitleStyle}" <controls:Setting x:Uid="ImageResizer_FallBackEncoderText">
Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/> <controls:Setting.ActionContent>
<ComboBox SelectedIndex="{x:Bind Path=ViewModel.Encoder, Mode=TwoWay}"
MinWidth="240"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
</ComboBox>
</controls:Setting.ActionContent>
</controls:Setting>
<ComboBox x:Uid="ImageResizer_FallBackEncoderText" <controls:Setting x:Uid="ImageResizer_Encoding">
SelectedIndex="{x:Bind Path=ViewModel.Encoder, Mode=TwoWay}" <controls:Setting.ActionContent>
MinWidth="240" <muxc:NumberBox
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_PNG" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_BMP" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_JPEG" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_TIFF" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_WMPhoto" />
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
</ComboBox>
<muxc:NumberBox x:Uid="ImageResizer_Encoding"
Minimum="0" Minimum="0"
Maximum="100" Maximum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
MinWidth="240" MinWidth="240"
Margin="{StaticResource SmallTopMargin}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Right"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_Encoding}"
/> />
</controls:Setting.ActionContent>
</controls:Setting>
<ComboBox x:Uid="ImageResizer_PNGInterlacing" <controls:Setting x:Uid="ImageResizer_PNGInterlacing">
SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.PngInterlaceOption}" <controls:Setting.ActionContent>
MinWidth="240" <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.PngInterlaceOption}">
Margin="{StaticResource SmallTopMargin}" <ComboBoxItem x:Uid="Default"/>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <ComboBoxItem x:Uid="On"/>
<ComboBoxItem x:Uid="Default"/> <ComboBoxItem x:Uid="Off"/>
<ComboBoxItem x:Uid="On"/> </ComboBox>
<ComboBoxItem x:Uid="Off"/> </controls:Setting.ActionContent>
</ComboBox> </controls:Setting>
<ComboBox x:Uid="ImageResizer_TIFFCompression" <controls:Setting x:Uid="ImageResizer_TIFFCompression">
SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.TiffCompressOption}" <controls:Setting.ActionContent>
MinWidth="240" <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.TiffCompressOption}">
Margin="{StaticResource SmallTopMargin}" <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Default"/>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_None"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Default"/> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT3"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_None"/> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT4"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT3"/> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_LZW"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_CCITT4"/> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_RLE"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_LZW"/> <ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Zip"/>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_RLE"/> </ComboBox>
<ComboBoxItem x:Uid="ImageResizer_ENCODER_TIFF_Zip"/> </controls:Setting.ActionContent>
</ComboBox> </controls:Setting>
<TextBlock x:Uid="File" </toolkitcontrols:HeaderedItemsControl>
Style="{StaticResource SettingsGroupTitleStyle}"
Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
<toolkitcontrols:HeaderedItemsControl x:Uid="File">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
<muxc:Expander.Header>
<controls:Setting x:Uid="ImageResizer_FilenameFormatHeader" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent>
<StackPanel Spacing="4" Orientation="Horizontal">
<TextBox Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}"
HorizontalAlignment="Right"
MinWidth="240"
x:Uid="ImageResizer_FilenameFormatPlaceholder"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
<Button Content="&#xE946;" FontFamily="{ThemeResource SymbolThemeFontFamily}">
<ToolTipService.ToolTip>
<ToolTip>
<TextBlock x:Name="FileFormatTextBlock">
<Run x:Uid="ImageResizer_FileFormatDescription"/>
<LineBreak/>
<LineBreak/>
<Run Text="%1" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_Filename" />
<LineBreak/>
<Run Text="%2" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_Sizename"/>
<LineBreak/>
<Run Text="%3" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
<LineBreak/>
<Run Text="%4" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
<LineBreak/>
<Run Text="%5" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
<LineBreak/>
<Run Text="%6" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
</TextBlock>
</ToolTip>
</ToolTipService.ToolTip>
</Button>
</StackPanel>
</controls:Setting.ActionContent>
</controls:Setting>
</muxc:Expander.Header>
<muxc:Expander.Content>
<CheckBox x:Uid="ImageResizer_UseOriginalDate"
IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}"
Margin="16,0,0,0" />
</muxc:Expander.Content>
</muxc:Expander>
</toolkitcontrols:HeaderedItemsControl>
<TextBox Text="{x:Bind Mode=TwoWay, Path=ViewModel.FileName}"
HorizontalAlignment="Left"
MinWidth="240"
x:Uid="ImageResizer_FilenameFormatPlaceholder"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
Margin="{StaticResource SmallTopMargin}"
AutomationProperties.LabeledBy="{Binding ElementName=ImageResizer_FilenameFormatHeader}"
AutomationProperties.HelpText="{Binding ElementName=FileFormatTextBlock, Path=Text}"
>
<TextBox.Header>
<StackPanel Orientation="Horizontal">
<TextBlock Name="ImageResizer_FilenameFormatHeader"
x:Uid="ImageResizer_FilenameFormatHeader"
Margin="0,0,0,0"
Opacity="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToOpacityConverter}}"/>
<TextBlock Text="&#xE946;" AutomationProperties.AccessibilityView="Raw"
FontFamily="Segoe MDL2 Assets"
Margin="4,4,0,0"/>
</StackPanel>
</TextBox.Header>
<ToolTipService.ToolTip>
<TextBlock x:Name="FileFormatTextBlock">
<Run x:Uid="ImageResizer_FileFormatDescription"/>
<LineBreak/>
<LineBreak/>
<Run Text="%1" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_Filename" />
<LineBreak/>
<Run Text="%2" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_Sizename"/>
<LineBreak/>
<Run Text="%3" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_SelectedWidth"/>
<LineBreak/>
<Run Text="%4" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_SelectedHeight"/>
<LineBreak/>
<Run Text="%5" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_ActualWidth"/>
<LineBreak/>
<Run Text="%6" FontWeight="Bold" />
<Run Text=" - "/>
<Run x:Uid="ImageResizer_Formatting_ActualHeight"/>
</TextBlock>
</ToolTipService.ToolTip>
</TextBox>
<CheckBox x:Uid="ImageResizer_UseOriginalDate"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
Margin="{StaticResource SmallTopMargin}"
IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.KeepDateModified}"/>
</StackPanel> </StackPanel>
</controls:SettingsPageControl.ModuleContent> </controls:SettingsPageControl.ModuleContent>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
View File

@@ -35,10 +35,6 @@
IsClosable="False" IsClosable="False"
/> />
<toolkitcontrols:HeaderedItemsControl x:Uid="FileExplorerPreview_PreviewPane_GroupSettings"> <toolkitcontrols:HeaderedItemsControl x:Uid="FileExplorerPreview_PreviewPane_GroupSettings">
<controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG" Icon="&#xE91B;"> <controls:Setting x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG" Icon="&#xE91B;">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>

15
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -36,7 +36,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="ShortcutGuide_OpenShortcutGuide" Icon="&#xEDA7;"> <controls:Setting x:Uid="ShortcutGuide_OpenShortcutGuide" Icon="&#xEDA7;" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:Setting.Description> <controls:Setting.Description>
<TextBlock> <TextBlock>
<Run x:Uid="ShortcutWarningLabel"/> <Run x:Uid="ShortcutWarningLabel"/>
@@ -47,15 +47,14 @@
<controls:HotkeySettingsControl Width="240" HotkeySettings="{x:Bind Path=ViewModel.OpenShortcutGuide, Mode=TwoWay}" Keys="Win, Ctrl, Alt, Shift"/> <controls:HotkeySettingsControl Width="240" HotkeySettings="{x:Bind Path=ViewModel.OpenShortcutGuide, Mode=TwoWay}" Keys="Win, Ctrl, Alt, Shift"/>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<toolkitcontrols:HeaderedItemsControl x:Uid="ShortcutGuide_Appearance_Behavior"> <toolkitcontrols:HeaderedItemsControl x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}"> <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.Description> <controls:Setting.Description>
<HyperlinkButton Click="OpenColorsSettings_Click" <HyperlinkButton Click="OpenColorsSettings_Click"
x:Uid="Windows_Color_Settings" x:Uid="Windows_Color_Settings"/>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
</controls:Setting.Description> </controls:Setting.Description>
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}"> <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}">
@@ -73,21 +72,19 @@
<Slider Minimum="0" <Slider Minimum="0"
Maximum="100" Maximum="100"
Width="240" Width="240"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"/>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
</StackPanel> </StackPanel>
</muxc:Expander.Content> </muxc:Expander.Content>
</muxc:Expander> </muxc:Expander>
<muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <muxc:Expander IsExpanded="True" Style="{StaticResource SettingsExpanderStyle}">
<muxc:Expander.Header> <muxc:Expander.Header>
<controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/> <controls:Setting x:Uid="ShortcutGuide_DisabledApps" Style="{StaticResource ExpanderHeaderSettingStyle}"/>
</muxc:Expander.Header> </muxc:Expander.Header>
<muxc:Expander.Content> <muxc:Expander.Content>
<TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl" <TextBox x:Uid="ShortcutGuide_DisabledApps_TextBoxControl"
Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}" Text="{x:Bind Mode=TwoWay, Path=ViewModel.DisabledApps, UpdateSourceTrigger=PropertyChanged}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
ScrollViewer.VerticalScrollBarVisibility ="Visible" ScrollViewer.VerticalScrollBarVisibility ="Visible"
ScrollViewer.VerticalScrollMode="Enabled" ScrollViewer.VerticalScrollMode="Enabled"
ScrollViewer.IsVerticalRailEnabled="True" ScrollViewer.IsVerticalRailEnabled="True"