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] Removed muxc prefix (#20164)

Browse Source 
* Removed prefix

Quick deletion. Quick run in VS gave no problems.

* Removed prefix

Quick deletion. Quick run in VS gave no problems.

* update for new files

* Remove using muxc includes
This commit is contained in:
Jay
2022-09-20 18:59:18 +02:00
committed by GitHub
parent 3984ee79bf
commit 7740258440
22 changed files with 249 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/actions/spell-check/expect.txt vendored
View File

@@ -1313,7 +1313,6 @@ multizone
Mundrabilla Mundrabilla
mutex mutex
mutexes mutexes
muxc
MVVM MVVM
myfile myfile
MYICON MYICON

27
src/modules/powerrename/PowerRenameUILib/App.xaml
View File

@@ -5,7 +5,6 @@
xmlns:local="using:PowerRenameUI" xmlns:local="using:PowerRenameUI"
xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)" xmlns:contract7NotPresent="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractNotPresent(Windows.Foundation.UniversalApiContract,7)"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)" xmlns:contract6Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation?IsApiContractPresent(Windows.Foundation.UniversalApiContract,6)"
xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals" xmlns:animatedVisuals="using:Microsoft.UI.Xaml.Controls.AnimatedVisuals"
xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives"> xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
@@ -304,7 +303,7 @@
</Setter> </Setter>
</Style> </Style>
<Style x:Key="SplitAccentButtonStyle" TargetType="muxc:SplitButton"> <Style x:Key="SplitAccentButtonStyle" TargetType="SplitButton">
<Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" /> <Setter Property="Background" Value="{ThemeResource AccentButtonBackground}" />
<Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" /> <Setter Property="Foreground" Value="{ThemeResource AccentButtonForeground}" />
<Setter Property="BorderBrush" Value="{ThemeResource AccentButtonBorderBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource AccentButtonBorderBrush}" />
@@ -321,7 +320,7 @@
<!--<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />--> <!--<contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />-->
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="muxc:SplitButton"> <ControlTemplate TargetType="SplitButton">
<Grid <Grid
x:Name="RootGrid" x:Name="RootGrid"
Background="Transparent" Background="Transparent"
@@ -351,12 +350,12 @@
<VisualState x:Name="Normal"/> <VisualState x:Name="Normal"/>
<VisualState x:Name="PointerOver"> <VisualState x:Name="PointerOver">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(muxc:AnimatedIcon.State)" Value="PointerOver"/> <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Pressed"> <VisualState x:Name="Pressed">
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(muxc:AnimatedIcon.State)" Value="Pressed"/> <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="Disabled"> <VisualState x:Name="Disabled">
@@ -380,7 +379,7 @@
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
muxc:AnimatedIcon.State="Normal"/> AnimatedIcon.State="Normal"/>
</Grid> </Grid>
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
@@ -597,15 +596,15 @@
IsTabStop="False" IsTabStop="False"
AutomationProperties.AccessibilityView="Raw"> AutomationProperties.AccessibilityView="Raw">
<Button.Content> <Button.Content>
<muxc:AnimatedIcon Height="12" Width="12" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw"> <AnimatedIcon Height="12" Width="12" VerticalAlignment="Center" HorizontalAlignment="Right" AutomationProperties.AccessibilityView="Raw">
<animatedVisuals:AnimatedChevronDownSmallVisualSource/> <animatedVisuals:AnimatedChevronDownSmallVisualSource/>
<muxc:AnimatedIcon.FallbackIconSource> <AnimatedIcon.FallbackIconSource>
<muxc:FontIconSource FontFamily="{ThemeResource SymbolThemeFontFamily}" <FontIconSource FontFamily="{ThemeResource SymbolThemeFontFamily}"
FontSize="8" FontSize="8"
Glyph="&#xE96E;" Glyph="&#xE96E;"
IsTextScaleFactorEnabled="False"/> IsTextScaleFactorEnabled="False"/>
</muxc:AnimatedIcon.FallbackIconSource> </AnimatedIcon.FallbackIconSource>
</muxc:AnimatedIcon> </AnimatedIcon>
</Button.Content> </Button.Content>
</Button> </Button>
</Grid> </Grid>
@@ -724,7 +723,7 @@
HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}" HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
AutomationProperties.AccessibilityView="Raw" AutomationProperties.AccessibilityView="Raw"
muxc:AnimatedIcon.State="Normal"> AnimatedIcon.State="Normal">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="CommonStates"> <VisualStateGroup x:Name="CommonStates">
<VisualState x:Name="Normal" /> <VisualState x:Name="Normal" />
@@ -742,7 +741,7 @@
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
</Storyboard> </Storyboard>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(muxc:AnimatedIcon.State)" Value="PointerOver"/> <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="PointerOver"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>
@@ -759,7 +758,7 @@
</ObjectAnimationUsingKeyFrames> </ObjectAnimationUsingKeyFrames>
</Storyboard> </Storyboard>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="ContentPresenter.(muxc:AnimatedIcon.State)" Value="Pressed"/> <Setter Target="ContentPresenter.(AnimatedIcon.State)" Value="Pressed"/>
</VisualState.Setters> </VisualState.Setters>
</VisualState> </VisualState>

17
src/modules/powerrename/PowerRenameUILib/MainWindow.xaml
View File

@@ -7,7 +7,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:PowerRenameUI" xmlns:local="using:PowerRenameUI"
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"
mc:Ignorable="d"> mc:Ignorable="d">
<Grid Padding="12" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid Padding="12" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
@@ -534,7 +533,7 @@
<muxc:SplitButton <SplitButton
x:Name="button_rename" x:Name="button_rename"
x:Uid="ButtonApply" x:Uid="ButtonApply"
Grid.Row="2" Grid.Row="2"
@@ -544,11 +543,11 @@
VerticalAlignment="Bottom" VerticalAlignment="Bottom"
Click="button_rename_Click" Click="button_rename_Click"
Style="{StaticResource SplitAccentButtonStyle}"> Style="{StaticResource SplitAccentButtonStyle}">
<muxc:SplitButton.KeyboardAccelerators> <SplitButton.KeyboardAccelerators>
<KeyboardAccelerator Key="Enter" /> <KeyboardAccelerator Key="Enter" />
<KeyboardAccelerator Key="Enter" Modifiers="Control" /> <KeyboardAccelerator Key="Enter" Modifiers="Control" />
</muxc:SplitButton.KeyboardAccelerators> </SplitButton.KeyboardAccelerators>
<muxc:SplitButton.Content> <SplitButton.Content>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<FontIcon <FontIcon
Margin="0,2,10,0" Margin="0,2,10,0"
@@ -557,13 +556,13 @@
Glyph="&#xE8AC;" /> Glyph="&#xE8AC;" />
<TextBlock x:Uid="TxtBlock_ButtonApply" /> <TextBlock x:Uid="TxtBlock_ButtonApply" />
</StackPanel> </StackPanel>
</muxc:SplitButton.Content> </SplitButton.Content>
<muxc:SplitButton.Flyout> <SplitButton.Flyout>
<MenuFlyout> <MenuFlyout>
<MenuFlyoutItem x:Uid="TxtBlock_ButtonApplyAndClose" Click="MenuFlyoutItem_Click" /> <MenuFlyoutItem x:Uid="TxtBlock_ButtonApplyAndClose" Click="MenuFlyoutItem_Click" />
</MenuFlyout> </MenuFlyout>
</muxc:SplitButton.Flyout> </SplitButton.Flyout>
</muxc:SplitButton> </SplitButton>
<!--<StackPanel x:Name="TitleBar" Orientation="Horizontal"> <!--<StackPanel x:Name="TitleBar" Orientation="Horizontal">
<Image Source="Assets/PowerRename.png" Width="16" Height="16" VerticalAlignment="Top" Margin="20,9,0,0"/> <Image Source="Assets/PowerRename.png" Width="16" Height="16" VerticalAlignment="Top" Margin="20,9,0,0"/>

13
src/settings-ui/Settings.UI/Controls/ColorPickerButton.xaml
View File

@@ -5,7 +5,6 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="300" d:DesignHeight="300"
@@ -13,9 +12,9 @@
<Grid> <Grid>
<!--TODO(stefan): ToDisplayName is no longer available in ColorHelper <!--TODO(stefan): ToDisplayName is no longer available in ColorHelper
<muxc:DropDownButton Padding="4,4,8,4" AutomationProperties.FullDescription="{x:Bind clr:ColorHelper.ToDisplayName(SelectedColor), Mode=OneWay }"> <DropDownButton Padding="4,4,8,4" AutomationProperties.FullDescription="{x:Bind clr:ColorHelper.ToDisplayName(SelectedColor), Mode=OneWay }">
--> -->
<muxc:DropDownButton Padding="4,4,8,4"> <DropDownButton Padding="4,4,8,4">
<Border x:Name="ColorPreviewBorder" <Border x:Name="ColorPreviewBorder"
Width="48" Width="48"
CornerRadius="2" CornerRadius="2"
@@ -26,9 +25,9 @@
<SolidColorBrush Color="{x:Bind SelectedColor, Mode=OneWay}"/> <SolidColorBrush Color="{x:Bind SelectedColor, Mode=OneWay}"/>
</Border.Background> </Border.Background>
</Border> </Border>
<muxc:DropDownButton.Flyout> <DropDownButton.Flyout>
<Flyout> <Flyout>
<muxc:ColorPicker IsColorSliderVisible="True" <ColorPicker IsColorSliderVisible="True"
IsColorChannelTextInputVisible="True" IsColorChannelTextInputVisible="True"
IsHexInputVisible="True" IsHexInputVisible="True"
IsAlphaEnabled="False" IsAlphaEnabled="False"
@@ -36,7 +35,7 @@
IsAlphaTextInputVisible="False" IsAlphaTextInputVisible="False"
Color="{x:Bind SelectedColor, Mode=TwoWay}" /> Color="{x:Bind SelectedColor, Mode=TwoWay}" />
</Flyout> </Flyout>
</muxc:DropDownButton.Flyout> </DropDownButton.Flyout>
</muxc:DropDownButton> </DropDownButton>
</Grid> </Grid>
</UserControl> </UserControl>

1
src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutControl.xaml
View File

@@ -5,7 +5,6 @@
xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:local="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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"
mc:Ignorable="d" mc:Ignorable="d"
x:Name="LayoutRoot" x:Name="LayoutRoot"
d:DesignHeight="300" d:DesignHeight="300"

3
src/settings-ui/Settings.UI/Controls/ShortcutControl/ShortcutDialogContentControl.xaml
View File

@@ -6,7 +6,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"
x:Name="ShortcutContentControl"> x:Name="ShortcutContentControl">
@@ -70,7 +69,7 @@
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<!--TODO(stefan) InfoBadge not available <!--TODO(stefan) InfoBadge not available
<muxc:InfoBadge AutomationProperties.AccessibilityView="Raw" <InfoBadge AutomationProperties.AccessibilityView="Raw"
Margin="2,0,12,0" Margin="2,0,12,0"
Style="{StaticResource CriticalIconInfoBadgeStyle}" /> Style="{StaticResource CriticalIconInfoBadgeStyle}" />
--> -->

155
src/settings-ui/Settings.UI/OOBE/Views/OobeShellPage.xaml
View File

@@ -2,13 +2,12 @@
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"
xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views" xmlns:local="using:Microsoft.PowerToys.Settings.UI.OOBE.Views"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel" xmlns:localModels="using:Microsoft.PowerToys.Settings.UI.OOBE.ViewModel"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d"
HighContrastAdjustment="None"> HighContrastAdjustment="None">
<!-- todo(Stefan): <!-- todo(Stefan):
muxc:BackdropMaterial.ApplyToRootOrPageBackground="True" BackdropMaterial.ApplyToRootOrPageBackground="True"
--> -->
<Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
@@ -30,132 +29,132 @@
</VisualState> </VisualState>
</VisualStateGroup> </VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<muxc:NavigationView IsSettingsVisible="False" IsPaneToggleButtonVisible="False" <NavigationView IsSettingsVisible="False" IsPaneToggleButtonVisible="False"
IsPaneOpen="True" x:Name="NavigationView" OpenPaneLength="296" IsPaneOpen="True" x:Name="NavigationView" OpenPaneLength="296"
PaneDisplayMode="Left" SelectionChanged="NavigationView_SelectionChanged" PaneDisplayMode="Left" SelectionChanged="NavigationView_SelectionChanged"
IsBackButtonVisible="Collapsed"> IsBackButtonVisible="Collapsed">
<muxc:NavigationView.MenuItems> <NavigationView.MenuItems>
<muxc:NavigationViewItem x:Uid="Shell_General" Tag="Overview"> <NavigationViewItem x:Uid="Shell_General" Tag="Overview">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToys.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_AlwaysOnTop" Tag="AlwaysOnTop"> <NavigationViewItem x:Uid="Shell_AlwaysOnTop" Tag="AlwaysOnTop">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_Awake" Tag="Awake"> <NavigationViewItem x:Uid="Shell_Awake" Tag="Awake">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ColorPicker" Tag="ColorPicker"> <NavigationViewItem x:Uid="Shell_ColorPicker" Tag="ColorPicker">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_FancyZones" Tag="FancyZones"> <NavigationViewItem x:Uid="Shell_FancyZones" Tag="FancyZones">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerPreview" Tag="FileExplorer"> <NavigationViewItem x:Uid="Shell_PowerPreview" Tag="FileExplorer">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ImageResizer" Tag="ImageResizer"> <NavigationViewItem x:Uid="Shell_ImageResizer" Tag="ImageResizer">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_KeyboardManager" Tag="KBM"> <NavigationViewItem x:Uid="Shell_KeyboardManager" Tag="KBM">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_MouseUtilities" Tag="MouseUtils"> <NavigationViewItem x:Uid="Shell_MouseUtilities" Tag="MouseUtils">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerRename" Tag="PowerRename"> <NavigationViewItem x:Uid="Shell_PowerRename" Tag="PowerRename">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerLauncher" Tag="Run"> <NavigationViewItem x:Uid="Shell_PowerLauncher" Tag="Run">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_QuickAccent" Tag="QuickAccent"> <NavigationViewItem x:Uid="Shell_QuickAccent" Tag="QuickAccent">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_MeasureTool" Tag="MeasureTool"> <NavigationViewItem x:Uid="Shell_MeasureTool" Tag="MeasureTool">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" <BitmapIcon ShowAsMonochrome="False"
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" /> UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ShortcutGuide" Tag="ShortcutGuide"> <NavigationViewItem x:Uid="Shell_ShortcutGuide" Tag="ShortcutGuide">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor"> <NavigationViewItem x:Uid="Shell_TextExtractor" Tag="TextExtractor">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOCR.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_VideoConference" Tag="VideoConference"> <NavigationViewItem x:Uid="Shell_VideoConference" Tag="VideoConference">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon <BitmapIcon
UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
</muxc:NavigationView.MenuItems> </NavigationView.MenuItems>
<muxc:NavigationView.FooterMenuItems> <NavigationView.FooterMenuItems>
<muxc:NavigationViewItem x:Uid="Shell_WhatsNew" Tag="WhatsNew"> <NavigationViewItem x:Uid="Shell_WhatsNew" Tag="WhatsNew">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<FontIcon Glyph="&#xF133;" /> <FontIcon Glyph="&#xF133;" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
</muxc:NavigationView.FooterMenuItems> </NavigationView.FooterMenuItems>
<muxc:NavigationView.Content> <NavigationView.Content>
<Frame x:Name="NavigationFrame" /> <Frame x:Name="NavigationFrame" />
</muxc:NavigationView.Content> </NavigationView.Content>
</muxc:NavigationView> </NavigationView>
</Grid> </Grid>
</UserControl> </UserControl>

7
src/settings-ui/Settings.UI/OOBE/Views/OobeWhatsNew.xaml
View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls" xmlns:toolkitcontrols="using:CommunityToolkit.WinUI.UI.Controls"
mc:Ignorable="d" mc:Ignorable="d"
Loaded="Page_Loaded"> Loaded="Page_Loaded">
@@ -31,7 +30,7 @@
TextWrapping="Wrap" /> TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
<muxc:InfoBar <InfoBar
Severity="Error" Severity="Error"
x:Name="ErrorInfoBar" x:Name="ErrorInfoBar"
Grid.Row="1" Grid.Row="1"
@@ -41,7 +40,7 @@
IsClosable="False" IsClosable="False"
IsOpen="True" IsOpen="True"
IsTabStop="True" /> IsTabStop="True" />
<muxc:InfoBar <InfoBar
x:Name="ProxyWarningInfoBar" x:Name="ProxyWarningInfoBar"
Severity="Warning" Severity="Warning"
Grid.Row="1" Grid.Row="1"
@@ -53,7 +52,7 @@
IsTabStop="True" /> IsTabStop="True" />
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto"> <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
<Grid Margin="32,24,32,24"> <Grid Margin="32,24,32,24">
<muxc:ProgressRing <ProgressRing
x:Name="LoadingProgressRing" x:Name="LoadingProgressRing"
IsIndeterminate="True" IsIndeterminate="True"
VerticalAlignment="Center" VerticalAlignment="Center"

5
src/settings-ui/Settings.UI/Themes/SettingsExpanderStyles.xaml
View File

@@ -1,8 +1,7 @@
<ResourceDictionary <ResourceDictionary
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"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls">
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
<!-- Thickness --> <!-- Thickness -->
<Thickness x:Key="ExpanderContentPadding">0</Thickness> <Thickness x:Key="ExpanderContentPadding">0</Thickness>
@@ -45,7 +44,7 @@
<!-- Setting expander style --> <!-- Setting expander style -->
<Style x:Key="SettingExpanderStyle" TargetType="muxc:Expander"> <Style x:Key="SettingExpanderStyle" TargetType="Expander">
<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 CardBorderBrush}" /> <Setter Property="BorderBrush" Value="{ThemeResource CardBorderBrush}" />

5
src/settings-ui/Settings.UI/Views/AwakePage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -45,7 +44,7 @@
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<StackPanel <StackPanel
Orientation="Horizontal"> Orientation="Horizontal">
<muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Hours" <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"
@@ -53,7 +52,7 @@
Width="96" Width="96"
SmallChange="1" SmallChange="1"
LargeChange="5"/> LargeChange="5"/>
<muxc:NumberBox x:Uid="Awake_TemporaryKeepAwake_Minutes" <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"

1
src/settings-ui/Settings.UI/Views/FancyZonesPage.xaml
View File

@@ -4,7 +4,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"

49
src/settings-ui/Settings.UI/Views/GeneralPage.xaml
View File

@@ -7,7 +7,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -41,7 +40,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
Orientation="Horizontal" Orientation="Horizontal"
Spacing="18"> Spacing="18">
<muxc:ProgressRing Height="24" <ProgressRing Height="24"
Width="24"/> Width="24"/>
<TextBlock x:Uid="General_CheckingForUpdates" <TextBlock x:Uid="General_CheckingForUpdates"
FontWeight="SemiBold" FontWeight="SemiBold"
@@ -58,20 +57,20 @@
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar x:Uid="General_UpToDate" <InfoBar x:Uid="General_UpToDate"
IsClosable="False" IsClosable="False"
Severity="Success" Severity="Success"
IsTabStop="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}" IsTabStop="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"
IsOpen="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"/> IsOpen="{Binding IsNewVersionCheckedAndUpToDate, Mode=OneWay}"/>
<!-- New version available --> <!-- New version available -->
<muxc:InfoBar x:Uid="General_NewVersionAvailable" <InfoBar x:Uid="General_NewVersionAvailable"
IsClosable="False" IsClosable="False"
Severity="Informational" Severity="Informational"
IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}" IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}" IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToDownload}"
Message="{Binding PowerToysNewAvailableVersion, Mode=OneWay}"> Message="{Binding PowerToysNewAvailableVersion, Mode=OneWay}">
<muxc:InfoBar.Content> <InfoBar.Content>
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<Button x:Uid="General_DownloadAndInstall" <Button x:Uid="General_DownloadAndInstall"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
@@ -83,56 +82,56 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="18" Spacing="18"
Margin="0,0,0,16"> Margin="0,0,0,16">
<muxc:ProgressRing Height="24" <ProgressRing Height="24"
Width="24"/> Width="24"/>
<TextBlock x:Uid="General_Downloading" <TextBlock x:Uid="General_Downloading"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" /> Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</muxc:InfoBar.Content> </InfoBar.Content>
<muxc:InfoBar.ActionButton> <InfoBar.ActionButton>
<HyperlinkButton x:Uid="SeeWhatsNew" <HyperlinkButton x:Uid="SeeWhatsNew"
Style="{StaticResource TextButtonStyle}" Style="{StaticResource TextButtonStyle}"
NavigateUri="{Binding PowerToysNewAvailableVersionLink}" NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
HorizontalAlignment="Right" /> HorizontalAlignment="Right" />
</muxc:InfoBar.ActionButton> </InfoBar.ActionButton>
</muxc:InfoBar> </InfoBar>
<!-- Ready to install --> <!-- Ready to install -->
<muxc:InfoBar x:Uid="General_NewVersionReadyToInstall" <InfoBar x:Uid="General_NewVersionReadyToInstall"
IsClosable="False" IsClosable="False"
Severity="Success" Severity="Success"
IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}" IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}" IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ReadyToInstall}"
Message="{Binding PowerToysNewAvailableVersion}"> Message="{Binding PowerToysNewAvailableVersion}">
<muxc:InfoBar.Content> <InfoBar.Content>
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<Button x:Uid="General_InstallNow" <Button x:Uid="General_InstallNow"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}" IsEnabled="{Binding IsDownloadAllowed, Mode=OneWay}"
Margin="0,0,0,16"/> Margin="0,0,0,16"/>
</StackPanel> </StackPanel>
</muxc:InfoBar.Content> </InfoBar.Content>
<muxc:InfoBar.ActionButton> <InfoBar.ActionButton>
<HyperlinkButton x:Uid="SeeWhatsNew" <HyperlinkButton x:Uid="SeeWhatsNew"
Style="{StaticResource TextButtonStyle}" Style="{StaticResource TextButtonStyle}"
NavigateUri="{Binding PowerToysNewAvailableVersionLink}" NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
HorizontalAlignment="Right" /> HorizontalAlignment="Right" />
</muxc:InfoBar.ActionButton> </InfoBar.ActionButton>
</muxc:InfoBar> </InfoBar>
<!-- Install failed --> <!-- Install failed -->
<muxc:InfoBar x:Uid="General_FailedToDownloadTheNewVersion" <InfoBar x:Uid="General_FailedToDownloadTheNewVersion"
IsClosable="False" IsClosable="False"
Severity="Error" Severity="Error"
IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}" IsTabStop="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}" IsOpen="{Binding PowerToysUpdatingState, Mode=OneWay, Converter={StaticResource UpdateStateToBoolConverter}, ConverterParameter=ErrorDownloading}"
Message="{Binding PowerToysNewAvailableVersion}"> Message="{Binding PowerToysNewAvailableVersion}">
<muxc:InfoBar.Content> <InfoBar.Content>
<StackPanel Spacing="16"> <StackPanel Spacing="16">
<Button x:Uid="General_TryAgainToDownloadAndInstall" <Button x:Uid="General_TryAgainToDownloadAndInstall"
Command="{Binding UpdateNowButtonEventHandler}" Command="{Binding UpdateNowButtonEventHandler}"
@@ -144,21 +143,21 @@
Orientation="Horizontal" Orientation="Horizontal"
Spacing="18" Spacing="18"
Margin="0,0,0,16"> Margin="0,0,0,16">
<muxc:ProgressRing Height="24" <ProgressRing Height="24"
Width="24"/> Width="24"/>
<TextBlock x:Uid="General_Downloading" <TextBlock x:Uid="General_Downloading"
FontWeight="SemiBold" FontWeight="SemiBold"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" /> Foreground="{ThemeResource TextFillColorSecondaryBrush}" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</muxc:InfoBar.Content> </InfoBar.Content>
<muxc:InfoBar.ActionButton> <InfoBar.ActionButton>
<HyperlinkButton x:Uid="SeeWhatsNew" <HyperlinkButton x:Uid="SeeWhatsNew"
NavigateUri="{Binding PowerToysNewAvailableVersionLink}" NavigateUri="{Binding PowerToysNewAvailableVersionLink}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Style="{StaticResource TextButtonStyle}"/> Style="{StaticResource TextButtonStyle}"/>
</muxc:InfoBar.ActionButton> </InfoBar.ActionButton>
</muxc:InfoBar> </InfoBar>
<controls:Setting x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates" <controls:Setting x:Uid="GeneralPage_ToggleSwitch_AutoDownloadUpdates"
Margin="0,-6,0,0" Margin="0,-6,0,0"
@@ -193,12 +192,12 @@
<ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}" x:Uid="ToggleSwitch"/> <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=RunElevated}" x:Uid="ToggleSwitch"/>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar x:Uid="General_RunAsAdminRequired" <InfoBar x:Uid="General_RunAsAdminRequired"
Severity="Warning" Severity="Warning"
IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}" IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
IsClosable="False" IsClosable="False"
IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"> IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
</muxc:InfoBar> </InfoBar>
</StackPanel> </StackPanel>
</controls:SettingExpander.Content> </controls:SettingExpander.Content>
</controls:SettingExpander> </controls:SettingExpander>

5
src/settings-ui/Settings.UI/Views/ImageResizerPage.xaml
View File

@@ -6,7 +6,6 @@
xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library" xmlns:models="using:Microsoft.PowerToys.Settings.UI.Library"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:toolkitconverters="using:CommunityToolkit.WinUI.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"
@@ -104,14 +103,14 @@
</ComboBox> </ComboBox>
<StackPanel Spacing="8" Orientation="Horizontal"> <StackPanel Spacing="8" Orientation="Horizontal">
<muxc:NumberBox <NumberBox
x:Uid="ImageResizer_Width" x:Uid="ImageResizer_Width"
Value="{x:Bind Path=Width, Mode=TwoWay}" Value="{x:Bind Path=Width, Mode=TwoWay}"
Minimum="0" Minimum="0"
Width="116" Width="116"
SpinButtonPlacementMode="Compact"/> SpinButtonPlacementMode="Compact"/>
<muxc:NumberBox <NumberBox
x:Uid="ImageResizer_Height" x:Uid="ImageResizer_Height"
Value="{x:Bind Path=Height, Mode=TwoWay}" Value="{x:Bind Path=Height, Mode=TwoWay}"
Width="116" Width="116"

3
src/settings-ui/Settings.UI/Views/MeasureToolPage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -43,7 +42,7 @@
<ToggleSwitch IsOn="{x:Bind ViewModel.ContinuousCapture, Mode=TwoWay}" x:Uid="MeasureTool_ContinuousCapture_ToggleSwitch" /> <ToggleSwitch IsOn="{x:Bind ViewModel.ContinuousCapture, Mode=TwoWay}" x:Uid="MeasureTool_ContinuousCapture_ToggleSwitch" />
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar <InfoBar
Severity="Warning" Severity="Warning"
x:Uid="MeasureTool_ContinuousCapture_Information" x:Uid="MeasureTool_ContinuousCapture_Information"
IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.ShowContinuousCaptureWarning}" IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.ShowContinuousCaptureWarning}"

19
src/settings-ui/Settings.UI/Views/MouseUtilsPage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d" mc:Ignorable="d"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:localConverters="using:Microsoft.PowerToys.Settings.UI.Converters"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -40,7 +39,7 @@
<StackPanel> <StackPanel>
<controls:Setting x:Uid="MouseUtils_FindMyMouse_ShakingMinimumDistance" Style="{StaticResource ExpanderContentSettingStyle}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationShakeMouseIntToVisibilityConverter}}"> <controls:Setting x:Uid="MouseUtils_FindMyMouse_ShakingMinimumDistance" Style="{StaticResource ExpanderContentSettingStyle}" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.FindMyMouseActivationMethod, Converter={StaticResource FindMyMouseActivationShakeMouseIntToVisibilityConverter}}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox <NumberBox
Minimum="0" Minimum="0"
Maximum="1000000" Maximum="1000000"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseShakingMinimumDistance}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseShakingMinimumDistance}"
@@ -86,7 +85,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="MouseUtils_FindMyMouse_SpotlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_FindMyMouse_SpotlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="5" <NumberBox Minimum="5"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightRadius}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseSpotlightRadius}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
@@ -106,7 +105,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="MouseUtils_FindMyMouse_AnimationDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_FindMyMouse_AnimationDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsFindMyMouseEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="0" <NumberBox Minimum="0"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseAnimationDurationMs}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.FindMyMouseAnimationDurationMs}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
@@ -189,7 +188,7 @@
<controls:Setting x:Uid="MouseUtils_MouseHighlighter_HighlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MouseHighlighter_HighlightRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="5" <NumberBox Minimum="5"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterRadius}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterRadius}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
@@ -201,7 +200,7 @@
<controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="100" <NumberBox Minimum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDelayMs}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDelayMs}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
@@ -213,7 +212,7 @@
<controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MouseHighlighter_FadeDurationMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMouseHighlighterEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="100" <NumberBox Minimum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDurationMs}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MouseHighlighterFadeDurationMs}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
@@ -264,7 +263,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsRadius" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="1" <NumberBox Minimum="1"
Maximum="500" Maximum="500"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsRadius}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsRadius}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -276,7 +275,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsThickness" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsThickness" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="1" <NumberBox Minimum="1"
Maximum="50" Maximum="50"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsThickness}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsThickness}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -293,7 +292,7 @@
</controls:Setting> </controls:Setting>
<controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderSize" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="MouseUtils_MousePointerCrosshairs_CrosshairsBorderSize" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsMousePointerCrosshairsEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="0" <NumberBox Minimum="0"
Maximum="50" Maximum="50"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsBorderSize}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MousePointerCrosshairsBorderSize}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"

3
src/settings-ui/Settings.UI/Views/PowerAccentPage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters" xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -58,7 +57,7 @@
<controls:SettingsGroup x:Uid="QuickAccent_Behavior" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}"> <controls:SettingsGroup x:Uid="QuickAccent_Behavior" IsEnabled="{Binding Mode=OneWay, Path=IsEnabled}">
<controls:Setting x:Uid="QuickAccent_InputTimeMs" Icon="&#xE916;"> <controls:Setting x:Uid="QuickAccent_InputTimeMs" Icon="&#xE916;">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="100" <NumberBox Minimum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.InputTimeMs}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.InputTimeMs}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"

27
src/settings-ui/Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -4,7 +4,6 @@
xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.Library.ViewModels" xmlns:ViewModels="using:Microsoft.PowerToys.Settings.UI.Library.ViewModels"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
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:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:i="using:Microsoft.Xaml.Interactivity"
x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage" x:Class="Microsoft.PowerToys.Settings.UI.Views.PowerLauncherPage"
@@ -106,7 +105,7 @@
<StackPanel> <StackPanel>
<controls:Setting x:Uid="PowerLauncher_FastSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="PowerLauncher_FastSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="0" <NumberBox Minimum="0"
Maximum="500" Maximum="500"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelayFast}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelayFast}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -119,7 +118,7 @@
<controls:Setting x:Uid="PowerLauncher_SlowSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting x:Uid="PowerLauncher_SlowSearchInputDelayMs" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryResultsWithDelay}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="0" <NumberBox Minimum="0"
Maximum="1000" Maximum="1000"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelay}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchInputDelay}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -138,7 +137,7 @@
<controls:SettingExpander.Header> <controls:SettingExpander.Header>
<controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xec8f;" Style="{StaticResource ExpanderHeaderSettingStyle}"> <controls:Setting x:Uid="PowerLauncher_MaximumNumberOfResults" Icon="&#xec8f;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}" <NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
Minimum="1"/> Minimum="1"/>
@@ -162,7 +161,7 @@
<StackPanel> <StackPanel>
<controls:Setting x:Uid="PowerLauncher_SearchClickedItemWeight" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}"> <controls:Setting x:Uid="PowerLauncher_SearchClickedItemWeight" Style="{StaticResource ExpanderContentSettingStyle}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SearchQueryTuningEnabled}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="0" <NumberBox Minimum="0"
Maximum="1000" Maximum="1000"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchClickedItemWeight}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.SearchClickedItemWeight}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -243,16 +242,16 @@
<controls:SettingsGroup x:Uid="PowerLauncher_Plugins" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"> <controls:SettingsGroup x:Uid="PowerLauncher_Plugins" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
<muxc:InfoBar x:Uid="Run_ConflictingKeywordInfo" <InfoBar x:Uid="Run_ConflictingKeywordInfo"
Severity="Informational" Severity="Informational"
IsClosable="False" IsClosable="False"
IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}" IsOpen="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"> IsTabStop="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
<muxc:InfoBar.ActionButton> <InfoBar.ActionButton>
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun#direct-activation-commands" <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun#direct-activation-commands"
x:Uid="Run_ConflictingKeywordInfo_Link"/> x:Uid="Run_ConflictingKeywordInfo_Link"/>
</muxc:InfoBar.ActionButton> </InfoBar.ActionButton>
</muxc:InfoBar> </InfoBar>
<controls:Setting x:Uid="Run_PluginUseDescription" Icon="&#xEA86;"> <controls:Setting x:Uid="Run_PluginUseDescription" Icon="&#xEA86;">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
@@ -268,14 +267,14 @@
</AutoSuggestBox> </AutoSuggestBox>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar x:Uid="Run_AllPluginsDisabled" <InfoBar x:Uid="Run_AllPluginsDisabled"
Severity="Error" Severity="Error"
IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}" IsTabStop="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
IsOpen="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}" IsOpen="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay}"
IsClosable="False" /> IsClosable="False" />
<StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.ShowPluginsLoadingMessage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> <StackPanel Orientation="Horizontal" Visibility="{x:Bind ViewModel.ShowPluginsLoadingMessage, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
<muxc:ProgressRing IsActive="True" Width="20" Height="20" Margin="18,18" /> <ProgressRing IsActive="True" Width="20" Height="20" Margin="18,18" />
<TextBlock x:Uid="Run_PluginsLoading" Style="{ThemeResource SecondaryTextStyle}" VerticalAlignment="Center" /> <TextBlock x:Uid="Run_PluginsLoading" Style="{ThemeResource SecondaryTextStyle}" VerticalAlignment="Center" />
</StackPanel> </StackPanel>
@@ -298,7 +297,7 @@
<StackPanel Orientation="Horizontal" Spacing="16" > <StackPanel Orientation="Horizontal" Spacing="16" >
<!-- todo(Stefan): InfoBadge not available <!-- todo(Stefan): InfoBadge not available
<muxc:InfoBadge AutomationProperties.AccessibilityView="Raw" <InfoBadge AutomationProperties.AccessibilityView="Raw"
Visibility="{x:Bind ShowBadgeOnPluginSettingError}" Visibility="{x:Bind ShowBadgeOnPluginSettingError}"
Style="{StaticResource CriticalIconInfoBadgeStyle}" /> Style="{StaticResource CriticalIconInfoBadgeStyle}" />
--> -->
@@ -326,7 +325,7 @@
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar Severity="Error" x:Uid="Run_NotAccessibleWarning" <InfoBar Severity="Error" x:Uid="Run_NotAccessibleWarning"
IsTabStop="{x:Bind ShowNotAccessibleWarning}" IsTabStop="{x:Bind ShowNotAccessibleWarning}"
IsOpen="{x:Bind ShowNotAccessibleWarning}" IsOpen="{x:Bind ShowNotAccessibleWarning}"
IsClosable="False" /> IsClosable="False" />
@@ -352,7 +351,7 @@
Style="{StaticResource ExpanderContentSettingStyleTight}" Style="{StaticResource ExpanderContentSettingStyleTight}"
IsEnabled="{x:Bind IsGlobalAndEnabled, Mode=OneWay}"> IsEnabled="{x:Bind IsGlobalAndEnabled, Mode=OneWay}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox Minimum="-1000" <NumberBox Minimum="-1000"
Maximum="1000" Maximum="1000"
Value="{x:Bind Mode=TwoWay, Path=WeightBoost}" Value="{x:Bind Mode=TwoWay, Path=WeightBoost}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"

7
src/settings-ui/Settings.UI/Views/PowerPreviewPage.xaml
View File

@@ -6,7 +6,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -21,7 +20,7 @@
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<controls:SettingsGroup x:Uid="FileExplorerPreview_PreviewPane"> <controls:SettingsGroup x:Uid="FileExplorerPreview_PreviewPane">
<muxc:InfoBar Severity="Warning" <InfoBar Severity="Warning"
x:Uid="FileExplorerPreview_PreviewHandlerOutlookIncompatibility" x:Uid="FileExplorerPreview_PreviewHandlerOutlookIncompatibility"
IsOpen="True" IsOpen="True"
IsTabStop="True" IsTabStop="True"
@@ -82,13 +81,13 @@
</controls:SettingsGroup> </controls:SettingsGroup>
<controls:SettingsGroup x:Uid="FileExplorerPreview_IconThumbnail_GroupSettings"> <controls:SettingsGroup x:Uid="FileExplorerPreview_IconThumbnail_GroupSettings">
<muxc:InfoBar Severity="Informational" <InfoBar Severity="Informational"
x:Uid="FileExplorerPreview_RebootRequired" x:Uid="FileExplorerPreview_RebootRequired"
IsOpen="True" IsOpen="True"
IsTabStop="True" IsTabStop="True"
IsClosable="False" IsClosable="False"
/> />
<muxc:InfoBar Severity="Warning" <InfoBar Severity="Warning"
x:Uid="FileExplorerPreview_ThumbnailsMightNotAppearOnRemoteFolders" x:Uid="FileExplorerPreview_ThumbnailsMightNotAppearOnRemoteFolders"
IsOpen="True" IsOpen="True"
IsTabStop="True" IsTabStop="True"

3
src/settings-ui/Settings.UI/Views/PowerRenamePage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -66,7 +65,7 @@
Style="{StaticResource ExpanderContentSettingStyle}" Style="{StaticResource ExpanderContentSettingStyle}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}"> IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox SpinButtonPlacementMode="Compact" <NumberBox SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}"
Minimum="0" Minimum="0"

161
src/settings-ui/Settings.UI/Views/ShellPage.xaml
View File

@@ -7,7 +7,6 @@
xmlns:i="using:Microsoft.Xaml.Interactivity" xmlns:i="using:Microsoft.Xaml.Interactivity"
xmlns:ic="using:Microsoft.Xaml.Interactions.Core" xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
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:views="using:Microsoft.PowerToys.Settings.UI.Views" xmlns:views="using:Microsoft.PowerToys.Settings.UI.Views"
HighContrastAdjustment="None" HighContrastAdjustment="None"
mc:Ignorable="d"> mc:Ignorable="d">
@@ -24,7 +23,7 @@
<Grid x:Name="RootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> <Grid x:Name="RootGrid" Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<muxc:NavigationView <NavigationView
x:Name="navigationView" x:Name="navigationView"
CompactModeThresholdWidth="1007" CompactModeThresholdWidth="1007"
ExpandedModeThresholdWidth="1007" ExpandedModeThresholdWidth="1007"
@@ -35,133 +34,133 @@
PaneClosed="NavigationView_PaneClosed" PaneClosed="NavigationView_PaneClosed"
PaneOpened="NavigationView_PaneOpened" PaneOpened="NavigationView_PaneOpened"
SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}"> SelectedItem="{x:Bind ViewModel.Selected, Mode=OneWay}">
<muxc:NavigationView.Resources> <NavigationView.Resources>
<SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" /> <SolidColorBrush x:Key="NavigationViewContentBackground" Color="Transparent" />
<SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="NavigationViewContentGridBorderBrush" Color="Transparent" />
</muxc:NavigationView.Resources> </NavigationView.Resources>
<muxc:NavigationView.MenuItems> <NavigationView.MenuItems>
<muxc:NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage"> <NavigationViewItem x:Uid="Shell_General" helpers:NavHelper.NavigateTo="views:GeneralPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsSettings.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_AlwaysOnTop" helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage"> <NavigationViewItem x:Uid="Shell_AlwaysOnTop" helpers:NavHelper.NavigateTo="views:AlwaysOnTopPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAlwaysOnTop.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_Awake" helpers:NavHelper.NavigateTo="views:AwakePage"> <NavigationViewItem x:Uid="Shell_Awake" helpers:NavHelper.NavigateTo="views:AwakePage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsAwake.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage"> <NavigationViewItem x:Uid="Shell_ColorPicker" helpers:NavHelper.NavigateTo="views:ColorPickerPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsColorPicker.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage"> <NavigationViewItem x:Uid="Shell_FancyZones" helpers:NavHelper.NavigateTo="views:FancyZonesPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFancyZones.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerPreview" helpers:NavHelper.NavigateTo="views:PowerPreviewPage"> <NavigationViewItem x:Uid="Shell_PowerPreview" helpers:NavHelper.NavigateTo="views:PowerPreviewPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsFileExplorerPreview.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ImageResizer" helpers:NavHelper.NavigateTo="views:ImageResizerPage"> <NavigationViewItem x:Uid="Shell_ImageResizer" helpers:NavHelper.NavigateTo="views:ImageResizerPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsImageResizer.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_KeyboardManager" helpers:NavHelper.NavigateTo="views:KeyboardManagerPage"> <NavigationViewItem x:Uid="Shell_KeyboardManager" helpers:NavHelper.NavigateTo="views:KeyboardManagerPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsKeyboardManager.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_MouseUtilities" helpers:NavHelper.NavigateTo="views:MouseUtilsPage"> <NavigationViewItem x:Uid="Shell_MouseUtilities" helpers:NavHelper.NavigateTo="views:MouseUtilsPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsMouseUtils.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage"> <NavigationViewItem x:Uid="Shell_PowerRename" helpers:NavHelper.NavigateTo="views:PowerRenamePage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerRename.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage"> <NavigationViewItem x:Uid="Shell_PowerLauncher" helpers:NavHelper.NavigateTo="views:PowerLauncherPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerToysRun.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_QuickAccent" <NavigationViewItem x:Uid="Shell_QuickAccent"
helpers:NavHelper.NavigateTo="views:PowerAccentPage"> helpers:NavHelper.NavigateTo="views:PowerAccentPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png" <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerAccent.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_MeasureTool" helpers:NavHelper.NavigateTo="views:MeasureToolPage"> <NavigationViewItem x:Uid="Shell_MeasureTool" helpers:NavHelper.NavigateTo="views:MeasureToolPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsScreenRuler.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage"> <NavigationViewItem x:Uid="Shell_ShortcutGuide" helpers:NavHelper.NavigateTo="views:ShortcutGuidePage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsShortcutGuide.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Shell_TextExtractor" <NavigationViewItem x:Uid="Shell_TextExtractor"
helpers:NavHelper.NavigateTo="views:PowerOcrPage"> helpers:NavHelper.NavigateTo="views:PowerOcrPage">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png" <BitmapIcon UriSource="ms-appx:///Assets/FluentIcons/FluentIconsPowerOcr.png"
ShowAsMonochrome="False" /> ShowAsMonochrome="False" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem <NavigationViewItem
x:Uid="Shell_VideoConference" x:Uid="Shell_VideoConference"
helpers:NavHelper.NavigateTo="views:VideoConferencePage" helpers:NavHelper.NavigateTo="views:VideoConferencePage"
IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}"> IsEnabled="{x:Bind ViewModel.IsVideoConferenceBuild, Mode=OneWay}">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" /> <BitmapIcon ShowAsMonochrome="False" UriSource="ms-appx:///Assets/FluentIcons/FluentIconsVideoConferenceMute.png" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
</muxc:NavigationView.MenuItems> </NavigationView.MenuItems>
<muxc:NavigationView.PaneFooter> <NavigationView.PaneFooter>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<muxc:NavigationViewItem x:Uid="OOBE_NavViewItem" Tapped="OOBEItem_Tapped"> <NavigationViewItem x:Uid="OOBE_NavViewItem" Tapped="OOBEItem_Tapped">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<FontIcon Glyph="&#xF133;" /> <FontIcon Glyph="&#xF133;" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Feedback_NavViewItem" Tapped="FeedbackItem_Tapped"> <NavigationViewItem x:Uid="Feedback_NavViewItem" Tapped="FeedbackItem_Tapped">
<muxc:NavigationViewItem.Icon> <NavigationViewItem.Icon>
<FontIcon Glyph="&#xED15;" /> <FontIcon Glyph="&#xED15;" />
</muxc:NavigationViewItem.Icon> </NavigationViewItem.Icon>
</muxc:NavigationViewItem> </NavigationViewItem>
</StackPanel> </StackPanel>
</muxc:NavigationView.PaneFooter> </NavigationView.PaneFooter>
<i:Interaction.Behaviors> <i:Interaction.Behaviors>
<ic:EventTriggerBehavior EventName="ItemInvoked"> <ic:EventTriggerBehavior EventName="ItemInvoked">
<ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" /> <ic:InvokeCommandAction Command="{x:Bind ViewModel.ItemInvokedCommand}" />
</ic:EventTriggerBehavior> </ic:EventTriggerBehavior>
</i:Interaction.Behaviors> </i:Interaction.Behaviors>
<Frame x:Name="shellFrame" /> <Frame x:Name="shellFrame" />
</muxc:NavigationView> </NavigationView>
</Grid> </Grid>
</UserControl> </UserControl>

5
src/settings-ui/Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -5,7 +5,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
mc:Ignorable="d" mc:Ignorable="d"
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
@@ -50,7 +49,7 @@
<controls:Setting x:Uid="ShortcutGuide_PressTime" Icon="&#xE916;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource TrueToVisibleConverter}}"> <controls:Setting x:Uid="ShortcutGuide_PressTime" Icon="&#xE916;" Visibility="{x:Bind Mode=OneWay, Path=ViewModel.UseLegacyPressWinKeyBehavior, Converter={StaticResource TrueToVisibleConverter}}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox <NumberBox
Minimum="100" Minimum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
@@ -62,7 +61,7 @@
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar <InfoBar
x:Uid="ShortcutGuide_PressWinKeyWarning" x:Uid="ShortcutGuide_PressWinKeyWarning"
Severity="Warning" Severity="Warning"
IsTabStop="True" IsTabStop="True"

3
src/settings-ui/Settings.UI/Views/VideoConference.xaml
View File

@@ -6,7 +6,6 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls" xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters" xmlns:converters="using:CommunityToolkit.WinUI.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d"> mc:Ignorable="d">
<Page.Resources> <Page.Resources>
@@ -28,7 +27,7 @@
<ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=IsEnabled}" x:Uid="ToggleSwitch"/> <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=IsEnabled}" x:Uid="ToggleSwitch"/>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
<muxc:InfoBar <InfoBar
Severity="Warning" Severity="Warning"
x:Uid="VideoConference_RunAsAdminRequired" x:Uid="VideoConference_RunAsAdminRequired"
IsOpen="True" IsOpen="True"