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

Replace radiobuttons with combobox

Browse Source
This commit is contained in:
Laute
2021-09-30 17:12:06 +02:00
parent 4a49eed913
commit 4e57795409
3 changed files with 47 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1095,11 +1095,29 @@ Made with 💗 by Microsoft and the PowerToys community.</value>
<value>Small</value> <value>Small</value>
<comment>The size of the image</comment> <comment>The size of the image</comment>
</data> </data>
<data name="FancyZones_MoveWindowBasedOnRelativePosition.Content" xml:space="preserve"> <data name="FancyZones_MoveWindowBasedOnRelativePosition_Accesible.AutomationProperties.Name" xml:space="preserve">
<value>Win + Up/Down/Left/Right to move windows based on relative position</value> <value>Windows key + Up, down, left or right arrow key to move windows based on relative position</value>
</data> </data>
<data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex.Content" xml:space="preserve"> <data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accesible.AutomationProperties.Name" xml:space="preserve">
<value>Win + Left/Right to move windows based on zone index</value> <value>Windows key + Left or right arrow keys to move windows based on zone index</value>
</data>
<data name="FancyZones_MoveWindowBasedOnRelativePosition_Description.Text" xml:space="preserve">
<value>Windows key + &#xE010; &#xE011; &#xE012; or &#xE013;</value>
<comment>Do not loc the icons (hex numbers)</comment>
</data>
<data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description.Text" xml:space="preserve">
<value>Windows key + &#xE00E; or &#xE00F;</value>
<comment>Do not loc the icons (hex numbers)</comment>
</data>
<data name="FancyZones_MoveWindowBasedOnRelativePosition.Text" xml:space="preserve">
<value>Based on relative position</value>
</data>
<data name="FancyZones_MoveWindow.Header" xml:space="preserve">
<value>Move windows</value>
</data>
<data name="FancyZones_MoveWindowLeftRightBasedOnZoneIndex.Text" xml:space="preserve">
<value>Based on zone index</value>
</data> </data>
<data name="ColorPicker_Editor.Header" xml:space="preserve"> <data name="ColorPicker_Editor.Header" xml:space="preserve">
<value>Editor</value> <value>Editor</value>

34
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@@ -11,6 +11,7 @@
AutomationProperties.LandmarkType="Main"> AutomationProperties.LandmarkType="Main">
<Page.Resources> <Page.Resources>
<converters:BoolToObjectConverter x:Key="BoolToComboBoxIndexConverter" TrueValue="1" FalseValue="0"/>
<converters:StringFormatConverter x:Key="StringFormatConverter"/> <converters:StringFormatConverter x:Key="StringFormatConverter"/>
</Page.Resources> </Page.Resources>
@@ -226,16 +227,29 @@
<controls:SettingExpander.Content> <controls:SettingExpander.Content>
<StackPanel> <StackPanel>
<RadioButton x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex" <controls:Setting x:Uid="FancyZones_MoveWindow" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}" Style="{StaticResource ExpanderContentSettingStyle}">
IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnZoneIndex}" <controls:Setting.ActionContent>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}" <ComboBox SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition, Converter={StaticResource BoolToComboBoxIndexConverter}}" MinHeight="56" MinWidth="{StaticResource SettingActionControlMinWidth}">
GroupName="OverrideSnapGroup" <ComboBoxItem x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Accesible">
Margin="{StaticResource ExpanderSettingMargin}"/> <StackPanel Orientation="Vertical">
<RadioButton x:Uid="FancyZones_MoveWindowBasedOnRelativePosition" <TextBlock x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex"/>
IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.MoveWindowsBasedOnPosition}" <TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.SnapHotkeysCategoryEnabled}" <Run x:Uid="FancyZones_MoveWindowLeftRightBasedOnZoneIndex_Description" />
GroupName="OverrideSnapGroup" </TextBlock>
Margin="{StaticResource ExpanderSettingMargin}"/> </StackPanel>
</ComboBoxItem>
<ComboBoxItem x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Accesible">
<StackPanel Orientation="Vertical">
<TextBlock x:Uid="FancyZones_MoveWindowBasedOnRelativePosition"/>
<TextBlock FontFamily="{ThemeResource SymbolThemeFontFamily}" Style="{StaticResource SecondaryTextStyle}">
<Run x:Uid="FancyZones_MoveWindowBasedOnRelativePosition_Description" />
</TextBlock>
</StackPanel>
</ComboBoxItem>
</ComboBox>
</controls:Setting.ActionContent>
</controls:Setting>
<Rectangle Style="{StaticResource ExpanderSeparatorStyle}" /> <Rectangle Style="{StaticResource ExpanderSeparatorStyle}" />
<CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl" <CheckBox x:Uid="FancyZones_MoveWindowsAcrossAllMonitorsCheckBoxControl"
Margin="56,8,16,8" Margin="56,8,16,8"

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

@@ -179,12 +179,11 @@
<controls:Setting x:Uid="ImageResizer_Encoding"> <controls:Setting x:Uid="ImageResizer_Encoding">
<controls:Setting.ActionContent> <controls:Setting.ActionContent>
<muxc:NumberBox <Slider
Minimum="0" Minimum="0"
Maximum="100" Maximum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
MinWidth="{StaticResource SettingActionControlMinWidth}" MinWidth="{StaticResource SettingActionControlMinWidth}"
SpinButtonPlacementMode="Compact"
HorizontalAlignment="Right" HorizontalAlignment="Right"
/> />
</controls:Setting.ActionContent> </controls:Setting.ActionContent>