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

[Settings] NumberBox headers fixes (#6227)

Browse Source 
* Update from master

* Updated Numberbox headers
This commit is contained in:
Niels Laute
2020-09-09 00:28:57 +02:00
committed by GitHub
parent fdd7d6afa4
commit 305a04ce69
7 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@@ -185,7 +185,7 @@
<Version>6.1.1</Version> <Version>6.1.1</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.UI.Xaml"> <PackageReference Include="Microsoft.UI.Xaml">
<Version>2.5.0-prerelease.200708003</Version> <Version>2.5.0-prerelease.200812001</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed"> <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
<Version>2.0.1</Version> <Version>2.0.1</Version>

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

@@ -269,7 +269,7 @@
<data name="PowerLauncher_SearchTypePreference_ExecutableName" xml:space="preserve"> <data name="PowerLauncher_SearchTypePreference_ExecutableName" xml:space="preserve">
<value>Executable name</value> <value>Executable name</value>
</data> </data>
<data name="PowerLauncher_MaximumNumberOfResults.Text" xml:space="preserve"> <data name="PowerLauncher_MaximumNumberOfResults.Header" xml:space="preserve">
<value>Maximum number of results</value> <value>Maximum number of results</value>
</data> </data>
<data name="PowerLauncher_Shortcuts.Text" xml:space="preserve"> <data name="PowerLauncher_Shortcuts.Text" xml:space="preserve">
@@ -367,7 +367,7 @@
<value>Move newly created windows to their last known zone</value> <value>Move newly created windows to their last known zone</value>
</data> </data>
<data name="FancyZones_OpenWindowOnActiveMonitor.Content" xml:space="preserve"> <data name="FancyZones_OpenWindowOnActiveMonitor.Content" xml:space="preserve">
<value>Move newly created windows to the current active monitor [EXPERIMENTAL]</value> <value>Move newly created windows to the current active monitor (EXPERIMENTAL)</value>
</data> </data>
<data name="FancyZones_UseCursorPosEditorStartupScreen.Content" xml:space="preserve"> <data name="FancyZones_UseCursorPosEditorStartupScreen.Content" xml:space="preserve">
<value>Follow mouse cursor instead of focus when launching editor in a multi screen environment</value> <value>Follow mouse cursor instead of focus when launching editor in a multi screen environment</value>
@@ -441,7 +441,7 @@
<data name="PowerRename_Toggle_EnableOnExtendedContextMenu.Header" xml:space="preserve"> <data name="PowerRename_Toggle_EnableOnExtendedContextMenu.Header" xml:space="preserve">
<value>Appear only in extended context menu (Shift + Right-click)</value> <value>Appear only in extended context menu (Shift + Right-click)</value>
</data> </data>
<data name="PowerRename_Toggle_MaxDispListNum.Text" xml:space="preserve"> <data name="PowerRename_Toggle_MaxDispListNum.Header" xml:space="preserve">
<value>Maximum number of items</value> <value>Maximum number of items</value>
</data> </data>
<data name="PowerRename_Toggle_RestoreFlagsOnLaunch.Content" xml:space="preserve"> <data name="PowerRename_Toggle_RestoreFlagsOnLaunch.Content" xml:space="preserve">
@@ -477,7 +477,7 @@
<data name="ShortcutGuide_Description.Text" xml:space="preserve"> <data name="ShortcutGuide_Description.Text" xml:space="preserve">
<value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value> <value>Shows a help overlay with Windows shortcuts when the Windows key is pressed.</value>
</data> </data>
<data name="ShortcutGuide_PressTime.Text" xml:space="preserve"> <data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
<value>Press duration before showing (ms)</value> <value>Press duration before showing (ms)</value>
</data> </data>
<data name="ShortcutGuide_Appearance_Behavior.Text" xml:space="preserve"> <data name="ShortcutGuide_Appearance_Behavior.Text" xml:space="preserve">
@@ -537,7 +537,7 @@
<data name="ImageResizer_SaveSizeButton.Label" xml:space="preserve"> <data name="ImageResizer_SaveSizeButton.Label" xml:space="preserve">
<value>Save sizes</value> <value>Save sizes</value>
</data> </data>
<data name="ImageResizer_Encoding.Text" xml:space="preserve"> <data name="ImageResizer_Encoding.Header" xml:space="preserve">
<value>JPEG quality level</value> <value>JPEG quality level</value>
</data> </data>
<data name="ImageResizer_PNGInterlacing.Header" xml:space="preserve"> <data name="ImageResizer_PNGInterlacing.Header" xml:space="preserve">

3
src/core/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
View File

@@ -32,7 +32,4 @@
<!--Extra Extra Small size margins--> <!--Extra Extra Small size margins-->
<Thickness x:Key="XXSmallTopMargin">0, 4, 0, 0</Thickness> <Thickness x:Key="XXSmallTopMargin">0, 4, 0, 0</Thickness>
<Thickness x:Key="XXSmallTopRightBottomMargin">0, 4, 4, 4</Thickness> <Thickness x:Key="XXSmallTopRightBottomMargin">0, 4, 4, 4</Thickness>
<!--Control Header Text Margin-->
<Thickness x:Key="HeaderTextTopMargin">0, 4, 0, 0</Thickness>
</ResourceDictionary> </ResourceDictionary>

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

@@ -207,16 +207,12 @@
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" /> <ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
</ComboBox> </ComboBox>
<TextBlock Name="ImageResizer_Encoding" <muxc:NumberBox x:Uid="ImageResizer_Encoding"
x:Uid="ImageResizer_Encoding" Minimum="0"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox Minimum="0"
Maximum="100" Maximum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
Width="240" Width="240"
Margin="{StaticResource HeaderTextTopMargin}" Margin="{StaticResource SmallTopMargin}"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"

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

@@ -126,19 +126,14 @@
IsEnabled="False" IsEnabled="False"
/>--> />-->
<TextBlock x:Uid="PowerLauncher_MaximumNumberOfResults" <muxc:NumberBox x:Uid="PowerLauncher_MaximumNumberOfResults"
x:Name="PowerLauncher_MaximumNumberOfResults" Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
Width="240" Width="240"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Minimum="1" Minimum="1"
Margin="{StaticResource HeaderTextTopMargin}" Margin="{StaticResource SmallTopMargin}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"/>
AutomationProperties.LabeledBy="{Binding ElementName=PowerLauncher_MaximumNumberOfResults}"/>
<CheckBox x:Uid="PowerLauncher_ClearInputOnLaunch" <CheckBox x:Uid="PowerLauncher_ClearInputOnLaunch"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"

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

@@ -75,20 +75,15 @@
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
/> />
<TextBlock Name="PowerRename_Toggle_MaxDispListNum" <muxc:NumberBox x:Uid="PowerRename_Toggle_MaxDispListNum"
x:Uid="PowerRename_Toggle_MaxDispListNum" SpinButtonPlacementMode="Compact"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="{StaticResource HeaderTextTopMargin}" Margin="{StaticResource SmallTopMargin}"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}"
Minimum="0" Minimum="0"
Width="240" Width="240"
Maximum="20" Maximum="20"
IsEnabled="{ x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}"/>
AutomationProperties.LabeledBy="{Binding ElementName=PowerRename_Toggle_MaxDispListNum}"/>
<CheckBox x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch" <CheckBox x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
Margin="0, 17, 0, 0" Margin="0, 17, 0, 0"

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

@@ -56,21 +56,16 @@
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<TextBlock Name="ShortcutGuide_PressTime" <muxc:NumberBox x:Uid="ShortcutGuide_PressTime"
x:Uid="ShortcutGuide_PressTime" Minimum="100"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox Minimum="100"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="{StaticResource HeaderTextTopMargin}" Margin="{StaticResource SmallTopMargin}"
Width="240" Width="240"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}" Value="{x:Bind Mode=TwoWay, Path=ViewModel.PressTime}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
SmallChange="50" SmallChange="50"
LargeChange="100" LargeChange="100"/>
AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_PressTime}"/>
<StackPanel Orientation="Horizontal" Margin="{StaticResource MediumTopMargin}" Spacing="12"> <StackPanel Orientation="Horizontal" Margin="{StaticResource MediumTopMargin}" Spacing="12">
<Slider x:Uid="ShortcutGuide_OverlayOpacity" <Slider x:Uid="ShortcutGuide_OverlayOpacity"
@@ -100,7 +95,7 @@
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}" <muxc:RadioButtons IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}"
SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}" SelectedIndex="{x:Bind Mode=TwoWay, Path=ViewModel.ThemeIndex}"
Margin="{StaticResource HeaderTextTopMargin}" Margin="{StaticResource XXSmallTopMargin}"
AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_Theme}"> AutomationProperties.LabeledBy="{Binding ElementName=ShortcutGuide_Theme}">
<RadioButton x:Uid="GeneralPage_Radio_Theme_Dark" /> <RadioButton x:Uid="GeneralPage_Radio_Theme_Dark" />
<RadioButton x:Uid="GeneralPage_Radio_Theme_Light" /> <RadioButton x:Uid="GeneralPage_Radio_Theme_Light" />