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

Updates to various settings

Browse Source
This commit is contained in:
Niels Laute
2021-08-16 11:43:15 +02:00
parent 78f07eb64f
commit ee4cfca394
6 changed files with 34 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -22,7 +22,7 @@
<Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness> <Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>
<Thickness x:Key="InfoBarContentRootPadding">16,0,0,0</Thickness> <Thickness x:Key="InfoBarContentRootPadding">16,0,0,0</Thickness>
<x:Double x:Key="SettingActionControlMinWidth">240</x:Double>
<Style TargetType="ListViewItem" > <Style TargetType="ListViewItem" >

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeOverview.xaml
View File

@@ -13,7 +13,7 @@
<controls:OOBEPageControl.ModuleContent> <controls:OOBEPageControl.ModuleContent>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<TextBlock Margin="0,4,0,0" <TextBlock Margin="0,4,0,8"
x:Uid="Oobe_Overview_Description" x:Uid="Oobe_Overview_Description"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource HyperlinkButtonStyle}"> <HyperlinkButton NavigateUri="{x:Bind ViewModel.DescriptionLink}" Style="{StaticResource HyperlinkButtonStyle}">

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

@@ -1030,8 +1030,11 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<data name="MoveDown.Text" xml:space="preserve"> <data name="MoveDown.Text" xml:space="preserve">
<value>Move down</value> <value>Move down</value>
</data> </data>
<data name="ColorPicker_ShowColorName.Content" xml:space="preserve"> <data name="ColorPicker_ShowColorName.Header" xml:space="preserve">
<value>Show color name when color picking</value> <value>Show color name</value>
</data>
<data name="ColorPicker_ShowColorName.Description" xml:space="preserve">
<value>This will show the name of the color when picking a color</value>
</data> </data>
<data name="ImageResizer_DefaultSize_Large" xml:space="preserve"> <data name="ImageResizer_DefaultSize_Large" xml:space="preserve">
<value>Large</value> <value>Large</value>
@@ -1077,7 +1080,7 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<value>Plugins</value> <value>Plugins</value>
</data> </data>
<data name="PowerLauncher_ActionKeyword.Header" xml:space="preserve"> <data name="PowerLauncher_ActionKeyword.Header" xml:space="preserve">
<value>Direct activation phrase</value> <value>Direct activation command</value>
</data> </data>
<data name="PowerLauncher_AuthoredBy.Text" xml:space="preserve"> <data name="PowerLauncher_AuthoredBy.Text" xml:space="preserve">
<value>Authored by</value> <value>Authored by</value>

17
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View File

@@ -81,9 +81,7 @@
<controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="ColorFormats" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:SettingExpander IsExpanded="True"> <controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;">
<controls:SettingExpander.Header>
<controls:Setting x:Uid="ColorPicker_CopiedColorRepresentation" Icon="&#xEF3C;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}" <ComboBox MinWidth="{StaticResource SettingActionControlMinWidth}"
x:Name="ColorPicker_ComboBox" x:Name="ColorPicker_ComboBox"
@@ -95,14 +93,13 @@
SelectedValuePath="Key" /> SelectedValuePath="Key" />
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
</controls:SettingExpander.Header>
<controls:SettingExpander.Content>
<CheckBox x:Uid="ColorPicker_ShowColorName"
IsChecked="{Binding ShowColorName, Mode=TwoWay}"
Margin="{StaticResource ExpanderSettingMargin}" />
</controls:SettingExpander.Content>
</controls:SettingExpander>
<controls:Setting x:Uid="ColorPicker_ShowColorName">
<controls:Setting.ActionContent>
<ToggleSwitch IsOn="{Binding ShowColorName, Mode=TwoWay}" FlowDirection="RightToLeft" />
</controls:Setting.ActionContent>
</controls:Setting>
<!-- <!--
Disabling this until we have a safer way to reset cursor as Disabling this until we have a safer way to reset cursor as
we can hit a state where the cursor doesn't reset we can hit a state where the cursor doesn't reset

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

@@ -215,10 +215,8 @@
<controls:SettingsGroup IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior"> <controls:SettingsGroup IsEnabled="True" x:Uid="ShortcutGuide_Appearance_Behavior">
<controls:SettingExpander IsExpanded="True"> <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;">
<controls:SettingExpander.Header>
<controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.Description> <controls:Setting.Description>
<HyperlinkButton Click="OpenColorsSettings_Click" <HyperlinkButton Click="OpenColorsSettings_Click"
x:Uid="Windows_Color_Settings"/> x:Uid="Windows_Color_Settings"/>
@@ -231,17 +229,11 @@
</ComboBox> </ComboBox>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
</controls:SettingExpander.Header> <controls:Setting x:Uid="GeneralPage_RunAtStartUp">
<controls:SettingExpander.Content> <controls:Setting.ActionContent>
<StackPanel Orientation="Vertical"> <ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=Startup}" FlowDirection="RightToLeft"/>
<controls:Setting x:Uid="GeneralPage_RunAtStartUp" Style="{StaticResource ExpanderContentSettingStyle}"> </controls:Setting.ActionContent>
<controls:Setting.ActionContent> </controls:Setting>
<ToggleSwitch IsOn="{Binding Mode=TwoWay, Path=Startup}" FlowDirection="RightToLeft"/>
</controls:Setting.ActionContent>
</controls:Setting>
</StackPanel>
</controls:SettingExpander.Content>
</controls:SettingExpander>
</controls:SettingsGroup> </controls:SettingsGroup>
</StackPanel> </StackPanel>

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

@@ -50,9 +50,8 @@
</controls:Setting> </controls:Setting>
<controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="ShortcutGuide_Appearance_Behavior" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<controls:SettingExpander IsExpanded="True">
<controls:SettingExpander.Header> <controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;">
<controls:Setting x:Uid="ColorModeHeader" Icon="&#xE771;" Style="{StaticResource ExpanderHeaderSettingStyle}">
<controls:Setting.Description> <controls:Setting.Description>
<HyperlinkButton Click="OpenColorsSettings_Click" <HyperlinkButton Click="OpenColorsSettings_Click"
x:Uid="Windows_Color_Settings"/> x:Uid="Windows_Color_Settings"/>
@@ -65,20 +64,16 @@
</ComboBox> </ComboBox>
</controls:Setting.ActionContent> </controls:Setting.ActionContent>
</controls:Setting> </controls:Setting>
</controls:SettingExpander.Header>
<controls:SettingExpander.Content>
<StackPanel Orientation="Vertical"> <controls:Setting x:Uid="ShortcutGuide_OverlayOpacity">
<controls:Setting x:Uid="ShortcutGuide_OverlayOpacity" Style="{StaticResource ExpanderContentSettingStyle}"> <controls:Setting.ActionContent>
<controls:Setting.ActionContent> <Slider Minimum="0"
<Slider Minimum="0" Maximum="100"
Maximum="100" MinWidth="{StaticResource SettingActionControlMinWidth}"
MinWidth="{StaticResource SettingActionControlMinWidth}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/>
Value="{x:Bind Mode=TwoWay, Path=ViewModel.OverlayOpacity}"/> </controls:Setting.ActionContent>
</controls:Setting.ActionContent> </controls:Setting>
</controls:Setting>
</StackPanel>
</controls:SettingExpander.Content>
</controls:SettingExpander>
</controls:SettingsGroup> </controls:SettingsGroup>
<controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"> <controls:SettingsGroup x:Uid="ExcludedApps" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">