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

[Settings] Updated adaptive trigger behavior (#5434)

Browse Source 
* Updated adaptive trigger behavior

* Fixed wrapping for KBM subtitle textblock

* Fix

Co-authored-by: Niels Laute <niels9001@hotmail.com>
This commit is contained in:
Niels Laute
2020-08-07 21:00:48 +02:00
committed by GitHub
parent ada42f6e94
commit e88812458e
14 changed files with 80 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Microsoft.PowerToys.Settings.UI.Runner/MainWindow.xaml
View File

@@ -7,7 +7,7 @@
xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls" xmlns:Controls="clr-namespace:Microsoft.Toolkit.Wpf.UI.Controls;assembly=Microsoft.Toolkit.Wpf.UI.Controls"
xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost" xmlns:xaml="clr-namespace:Microsoft.Toolkit.Wpf.UI.XamlHost;assembly=Microsoft.Toolkit.Wpf.UI.XamlHost"
mc:Ignorable="d" mc:Ignorable="d"
Title="PowerToys Settings" Height="800" Width="1100" Closing="MainWindow_Closing"> Title="PowerToys Settings" MinWidth="480" Height="800" Width="1100" Closing="MainWindow_Closing">
<Grid> <Grid>
<xaml:WindowsXamlHost InitialTypeName="Microsoft.PowerToys.Settings.UI.Views.ShellPage" ChildChanged="WindowsXamlHost_ChildChanged" /> <xaml:WindowsXamlHost InitialTypeName="Microsoft.PowerToys.Settings.UI.Views.ShellPage" ChildChanged="WindowsXamlHost_ChildChanged" />
</Grid> </Grid>

2
src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@@ -640,7 +640,7 @@
<value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value> <value>Remap shortcuts to other shortcuts or keys. Additionally, mappings can be targeted to specific applications as well.</value>
</data> </data>
<data name="About_PowerToys.Text" xml:space="preserve"> <data name="About_PowerToys.Text" xml:space="preserve">
<value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity</value> <value>Microsoft PowerToys is a set of utilities for power users to tune and streamline their Windows experience for greater productivity.</value>
</data> </data>
<data name="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl.Content" xml:space="preserve"> <data name="FancyZones_SpanZonesAcrossMonitorsCheckBoxControl.Content" xml:space="preserve">
<value>Allow zones to span across monitors</value> <value>Allow zones to span across monitors</value>

6
src/core/Microsoft.PowerToys.Settings.UI/Styles/_Sizes.xaml
View File

@@ -6,10 +6,10 @@
<x:Double x:Key="SidePanelWidth">240</x:Double> <x:Double x:Key="SidePanelWidth">240</x:Double>
<!-- Breakpoint for wide layout (side panel next to content) --> <!-- Breakpoint for wide layout (side panel next to content) -->
<x:Double x:Key="WideLayoutMinWidth">1008</x:Double> <x:Double x:Key="WideLayoutMinWidth">720</x:Double>
<!-- Breakpoint for small layout (side panel under content) --> <!-- Breakpoint for small layout (side panel above content) -->
<x:Double x:Key="SmallLayoutMinWidth">480</x:Double> <x:Double x:Key="SmallLayoutMinWidth">600</x:Double>
<!-- Column spacing between content and sidepanel --> <!-- Column spacing between content and sidepanel -->
<x:Double x:Key="DefaultColumnSpacing">24</x:Double> <x:Double x:Key="DefaultColumnSpacing">24</x:Double>

17
src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -11,29 +11,23 @@
d:DesignWidth="400" d:DesignWidth="400"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="ColorPickerSettingsView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="ColorPickerSettingsView.(Grid.Row)" Value="1" /> <Setter Target="ColorPickerView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -51,7 +45,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" x:Name="ColorPickerSettingsView"> <StackPanel Orientation="Vertical" x:Name="ColorPickerView">
<ToggleSwitch x:Uid="ColorPicker_EnableColorPicker" <ToggleSwitch x:Uid="ColorPicker_EnableColorPicker"
IsOn="{Binding IsEnabled, Mode=TwoWay}"/> IsOn="{Binding IsEnabled, Mode=TwoWay}"/>
@@ -111,6 +105,7 @@
<Image Source="ms-appx:///Assets/Modules/ColorPicker.png" /> <Image Source="ms-appx:///Assets/Modules/ColorPicker.png" />
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ColorPicker">

19
src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@@ -19,31 +19,23 @@
<converters:StringFormatConverter x:Key="StringFormatConverter"/> <converters:StringFormatConverter x:Key="StringFormatConverter"/>
</Page.Resources> </Page.Resources>
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" <Grid x:Name="MainView" RowSpacing="{StaticResource DefaultRowSpacing}">
RowSpacing="{StaticResource DefaultRowSpacing}"
x:Name="MainView">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="FZSettingsView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="FZSettingsView.(Grid.Row)" Value="1" /> <Setter Target="FZView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -61,7 +53,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel x:Name="FZSettingsView" Orientation="Vertical"> <StackPanel x:Name="FZView" Orientation="Vertical">
<ToggleSwitch x:Name="FancyZones_EnableToggleControl_HeaderText" <ToggleSwitch x:Name="FancyZones_EnableToggleControl_HeaderText"
x:Uid="FancyZones_EnableToggleControl_HeaderText" x:Uid="FancyZones_EnableToggleControl_HeaderText"
IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/> IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/>
@@ -315,6 +307,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones">

18
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@@ -17,30 +17,23 @@
<viewModel:GeneralViewModel x:Key="eventViewModel"/> <viewModel:GeneralViewModel x:Key="eventViewModel"/>
</Page.Resources> </Page.Resources>
<Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="GeneralSettingsView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="GeneralSettingsView.(Grid.Row)" Value="1" /> <Setter Target="GeneralView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -59,7 +52,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
x:Name="GeneralSettingsView"> x:Name="GeneralView">
<TextBlock x:Uid="Admin_Mode" FontWeight="SemiBold" <TextBlock x:Uid="Admin_Mode" FontWeight="SemiBold"
Style="{StaticResource SubtitleTextBlockStyle}"/> Style="{StaticResource SubtitleTextBlockStyle}"/>
@@ -158,6 +151,7 @@
<Image Source="ms-appx:///Assets/Modules/PT.png" /> <Image Source="ms-appx:///Assets/Modules/PT.png" />
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >

2
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml.cs
View File

@@ -26,7 +26,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
InitializeComponent(); InitializeComponent();
ViewModel = new GeneralViewModel(); ViewModel = new GeneralViewModel();
GeneralSettingsView.DataContext = ViewModel; GeneralView.DataContext = ViewModel;
} }
} }
} }

13
src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@@ -15,28 +15,22 @@
<viewModel:ImageResizerViewModel x:Key="ViewModel"/> <viewModel:ImageResizerViewModel x:Key="ViewModel"/>
</Page.Resources> </Page.Resources>
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="ImageResizerView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="ImageResizerView.(Grid.Row)" Value="1" /> <Setter Target="ImageResizerView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
@@ -320,6 +314,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ImageResizer">

14
src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@@ -173,28 +173,22 @@
</DataTemplate> </DataTemplate>
</Page.Resources> </Page.Resources>
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="KeyboardManagerView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="KeyboardManagerView.(Grid.Row)" Value="1" /> <Setter Target="KeyboardManagerView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
@@ -276,6 +270,7 @@
<TextBlock x:Uid="KeyboardManager_RemapShortcutsSubtitle" <TextBlock x:Uid="KeyboardManager_RemapShortcutsSubtitle"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
TextWrapping="WrapWholeWords"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.Enabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.Enabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<Button x:Uid="KeyboardManager_RemapShortcutsButton" <Button x:Uid="KeyboardManager_RemapShortcutsButton"
@@ -342,6 +337,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_KeyboardManager">

57
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -11,36 +11,30 @@
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> </VisualState>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/> <VisualState x:Name="SmallLayout">
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/> <VisualState.StateTriggers>
<Setter Target="PowerToysRunView.(Grid.Row)" Value="0" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/> <AdaptiveTrigger MinWindowWidth="0" />
<Setter Target="AboutTitle.Visibility" Value="Visible" /> </VisualState.StateTriggers>
</VisualState.Setters> <VisualState.Setters>
</VisualState> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<VisualState x:Name="SmallLayout"> <Setter Target="SidePanel.Width" Value="Auto"/>
<VisualState.StateTriggers> <Setter Target="LauncherView.(Grid.Row)" Value="1" />
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
</VisualState.StateTriggers> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<VisualState.Setters> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="AboutTitle.Visibility" Value="Collapsed" />
<Setter Target="SidePanel.Width" Value="500"/> </VisualState.Setters>
<Setter Target="PowerToysRunView.(Grid.Row)" Value="1" /> </VisualState>
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> </VisualStateGroup>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
<Setter Target="AboutTitle.Visibility" Value="Collapsed" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
</VisualStateManager.VisualStateGroups> </VisualStateManager.VisualStateGroups>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/> <ColumnDefinition Width="*"/>
@@ -51,7 +45,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" x:Name="PowerToysRunView"> <StackPanel Orientation="Vertical" x:Name="LauncherView">
<ToggleSwitch x:Uid="PowerLauncher_EnablePowerLauncher" <ToggleSwitch x:Uid="PowerLauncher_EnablePowerLauncher"
IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnablePowerLauncher}"/> IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.EnablePowerLauncher}"/>
@@ -182,6 +176,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerToysRun">

17
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
View File

@@ -7,29 +7,23 @@
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="PowerPreviewSettingsView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="PowerPreviewSettingsView.(Grid.Row)" Value="1" /> <Setter Target="PowerPreviewView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -48,7 +42,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
x:Name="PowerPreviewSettingsView"> x:Name="PowerPreviewView">
<ToggleSwitch x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG" <ToggleSwitch x:Uid="FileExplorerPreview_ToggleSwitch_Preview_SVG"
IsOn="{Binding Mode=TwoWay, Path=SVGRenderIsEnabled}" /> IsOn="{Binding Mode=TwoWay, Path=SVGRenderIsEnabled}" />
@@ -86,6 +80,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FileExplorerAddOns">

2
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml.cs
View File

@@ -18,7 +18,7 @@ namespace Microsoft.PowerToys.Settings.UI.Views
{ {
InitializeComponent(); InitializeComponent();
ViewModel = new PowerPreviewViewModel(); ViewModel = new PowerPreviewViewModel();
PowerPreviewSettingsView.DataContext = ViewModel; PowerPreviewView.DataContext = ViewModel;
} }
} }
} }

19
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
View File

@@ -8,30 +8,24 @@
xmlns:muxc="using:Microsoft.UI.Xaml.Controls" xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
mc:Ignorable="d" mc:Ignorable="d"
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"> Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="PowerRenameSettingsView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="PowerRenameSettingsView.(Grid.Row)" Value="1" /> <Setter Target="PowerRenameView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -49,7 +43,7 @@
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
x:Name="PowerRenameSettingsView"> x:Name="PowerRenameView">
<ToggleSwitch x:Uid="PowerRename_Toggle_Enable" <ToggleSwitch x:Uid="PowerRename_Toggle_Enable"
IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}" IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"
@@ -125,6 +119,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerRename"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_PowerRename">

19
src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@@ -14,30 +14,24 @@
<Page.Resources> <Page.Resources>
<converters:StringFormatConverter x:Key="StringFormatConverter"/> <converters:StringFormatConverter x:Key="StringFormatConverter"/>
</Page.Resources> </Page.Resources>
<Grid ColumnSpacing="{StaticResource DefaultColumnSpacing}" RowSpacing="{StaticResource DefaultRowSpacing}"> <Grid RowSpacing="{StaticResource DefaultRowSpacing}">
<VisualStateManager.VisualStateGroups> <VisualStateManager.VisualStateGroups>
<VisualStateGroup x:Name="LayoutVisualStates"> <VisualStateGroup x:Name="LayoutVisualStates">
<VisualState x:Name="WideLayout"> <VisualState x:Name="WideLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource WideLayoutMinWidth}" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="1"/>
<Setter Target="SidePanel.Width" Value="{StaticResource SidePanelWidth}"/>
<Setter Target="ShortCutGuideView.(Grid.Row)" Value="0" />
<Setter Target="LinksPanel.(RelativePanel.Below)" Value="AboutImage"/>
<Setter Target="AboutTitle.Visibility" Value="Visible" />
</VisualState.Setters>
</VisualState> </VisualState>
<VisualState x:Name="SmallLayout"> <VisualState x:Name="SmallLayout">
<VisualState.StateTriggers> <VisualState.StateTriggers>
<AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" /> <AdaptiveTrigger MinWindowWidth="{StaticResource SmallLayoutMinWidth}" />
<AdaptiveTrigger MinWindowWidth="0" />
</VisualState.StateTriggers> </VisualState.StateTriggers>
<VisualState.Setters> <VisualState.Setters>
<Setter Target="SidePanel.(Grid.Column)" Value="0"/> <Setter Target="SidePanel.(Grid.Column)" Value="0"/>
<Setter Target="SidePanel.Width" Value="500"/> <Setter Target="SidePanel.Width" Value="Auto"/>
<Setter Target="ShortCutGuideView.(Grid.Row)" Value="1" /> <Setter Target="ShortcutGuideView.(Grid.Row)" Value="1" />
<Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.RightOf)" Value="AboutImage"/>
<Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/> <Setter Target="LinksPanel.(RelativePanel.AlignTopWith)" Value="AboutImage"/>
<Setter Target="AboutImage.Margin" Value="0,12,12,0"/> <Setter Target="AboutImage.Margin" Value="0,12,12,0"/>
@@ -54,7 +48,7 @@
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Vertical" x:Name="ShortCutGuideView"> <StackPanel Orientation="Vertical" x:Name="ShortcutGuideView">
<ToggleSwitch x:Uid="ShortcutGuide_Enable" <ToggleSwitch x:Uid="ShortcutGuide_Enable"
IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/> IsOn="{x:Bind Mode=TwoWay, Path=ViewModel.IsEnabled}"/>
@@ -134,6 +128,7 @@
</Border> </Border>
<StackPanel x:Name="LinksPanel" <StackPanel x:Name="LinksPanel"
Margin="0,1,0,0"
RelativePanel.Below="AboutImage" RelativePanel.Below="AboutImage"
Orientation="Vertical" > Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide"> <HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_ShortcutGuide">