Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 12:18:50 +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

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

@@ -207,16 +207,12 @@
<ComboBoxItem x:Uid="ImageResizer_FallbackEncoder_GIF" />
</ComboBox>
<TextBlock Name="ImageResizer_Encoding"
x:Uid="ImageResizer_Encoding"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox Minimum="0"
<muxc:NumberBox x:Uid="ImageResizer_Encoding"
Minimum="0"
Maximum="100"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.JPEGQualityLevel}"
Width="240"
Margin="{StaticResource HeaderTextTopMargin}"
Margin="{StaticResource SmallTopMargin}"
SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left"
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"
/>-->
<TextBlock x:Uid="PowerLauncher_MaximumNumberOfResults"
x:Name="PowerLauncher_MaximumNumberOfResults"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
<muxc:NumberBox x:Uid="PowerLauncher_MaximumNumberOfResults"
Value="{Binding Mode=TwoWay, Path=MaximumNumberOfResults}"
Width="240"
SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left"
Minimum="1"
Margin="{StaticResource HeaderTextTopMargin}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
AutomationProperties.LabeledBy="{Binding ElementName=PowerLauncher_MaximumNumberOfResults}"/>
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"/>
<CheckBox x:Uid="PowerLauncher_ClearInputOnLaunch"
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}"
/>
<TextBlock Name="PowerRename_Toggle_MaxDispListNum"
x:Uid="PowerRename_Toggle_MaxDispListNum"
Margin="{StaticResource SmallTopMargin}"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<muxc:NumberBox SpinButtonPlacementMode="Compact"
<muxc:NumberBox x:Uid="PowerRename_Toggle_MaxDispListNum"
SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left"
Margin="{StaticResource HeaderTextTopMargin}"
Margin="{StaticResource SmallTopMargin}"
Value="{x:Bind Mode=TwoWay, Path=ViewModel.MaxDispListNum}"
Minimum="0"
Width="240"
Maximum="20"
IsEnabled="{ x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}"
AutomationProperties.LabeledBy="{Binding ElementName=PowerRename_Toggle_MaxDispListNum}"/>
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.GlobalAndMruEnabled}"/>
<CheckBox x:Uid="PowerRename_Toggle_RestoreFlagsOnLaunch"
Margin="0, 17, 0, 0"

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

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