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

[Settings] UI fixes (#9949)

Browse Source 
* Adding period to warnings

* Increased font size to default

* Fixes

* PowerLauncher display setting fix

* Added the correct brush

Co-authored-by: Niels Laute <niels9001@hotmail.com>
This commit is contained in:
Niels Laute
2021-03-01 14:56:30 +01:00
committed by GitHub
parent 4a9e920a1c
commit bb228c73ab
4 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,7 +711,7 @@
<value>Administrator mode</value> <value>Administrator mode</value>
</data> </data>
<data name="General_RunAsAdminRequired.Text" xml:space="preserve"> <data name="General_RunAsAdminRequired.Text" xml:space="preserve">
<value>You need to run as administrator to use this setting</value> <value>You need to run as administrator to use this setting.</value>
</data> </data>
<data name="ShortcutWarningLabel.Text" xml:space="preserve"> <data name="ShortcutWarningLabel.Text" xml:space="preserve">
<value>Only shortcuts with the following hotkeys are valid:</value> <value>Only shortcuts with the following hotkeys are valid:</value>
@@ -783,7 +783,7 @@
<value>Preview Pane</value> <value>Preview Pane</value>
</data> </data>
<data name="FileExplorerPreview_RunAsAdminRequired.Text" xml:space="preserve"> <data name="FileExplorerPreview_RunAsAdminRequired.Text" xml:space="preserve">
<value>You need to run as administrator to modify these settings</value> <value>You need to run as administrator to modify these settings.</value>
</data> </data>
<data name="FileExplorerPreview_AffectsAllUsers.Text" xml:space="preserve"> <data name="FileExplorerPreview_AffectsAllUsers.Text" xml:space="preserve">
<value>The settings on this page affect all users on the system</value> <value>The settings on this page affect all users on the system</value>

37
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@@ -170,7 +170,8 @@
<RadioButton x:Uid="Radio_Theme_Default" <RadioButton x:Uid="Radio_Theme_Default"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}" IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" /> IsChecked="{Binding Mode=TwoWay, Path=IsSystemThemeRadioButtonChecked}" />
<HyperlinkButton Click="OpenColorsSettings_Click"> <HyperlinkButton Click="OpenColorsSettings_Click"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}">
<TextBlock x:Uid="Windows_Color_Settings" /> <TextBlock x:Uid="Windows_Color_Settings" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>
@@ -180,12 +181,11 @@
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/> Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"/>
<TextBlock x:Uid="Run_PluginUseDescription" <TextBlock x:Uid="Run_PluginUseDescription"
FontSize="12" Margin="{StaticResource SmallTopMargin}"
Foreground="{ThemeResource SystemBaseMediumColor}" Foreground="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock x:Uid="Run_AllPluginsDisabled" <TextBlock x:Uid="Run_AllPluginsDisabled"
FontSize="12"
Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}" Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
Visibility="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}" Visibility="{x:Bind ViewModel.ShowAllPluginsDisabledWarning, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"
TextWrapping="Wrap" TextWrapping="Wrap"
@@ -218,7 +218,7 @@
<ListView.ItemTemplate> <ListView.ItemTemplate>
<DataTemplate x:DataType="ViewModels:PowerLauncherPluginViewModel" x:DefaultBindMode="OneWay"> <DataTemplate x:DataType="ViewModels:PowerLauncherPluginViewModel" x:DefaultBindMode="OneWay">
<StackPanel Orientation="Vertical" Background="Transparent" <StackPanel Orientation="Vertical" Background="Transparent"
Padding="0,12,0,12"> Padding="0,12,12,12">
<Grid ColumnSpacing="0"> <Grid ColumnSpacing="0">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="60" /> <ColumnDefinition Width="60" />
@@ -235,25 +235,23 @@
Height="36" /> Height="36" />
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
Grid.Column="1" Margin="0,0,12,0"> Grid.Column="1" Margin="0,0,16,0">
<TextBlock FontSize="18" <TextBlock FontSize="18"
Text="{x:Bind Path=Name}" Text="{x:Bind Path=Name}"
Opacity="{x:Bind DisabledOpacity}"/> Opacity="{x:Bind DisabledOpacity}"/>
<TextBlock FontSize="12" <TextBlock
Opacity="{x:Bind DisabledOpacity}" Opacity="{x:Bind DisabledOpacity}"
Foreground="{ThemeResource SystemBaseMediumColor}" Foreground="{ThemeResource SystemBaseMediumColor}"
Text="{x:Bind Description}" Text="{x:Bind Description}"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock <TextBlock
x:Uid="Run_NotAccessibleWarning" x:Uid="Run_NotAccessibleWarning"
FontSize="12"
Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}" Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
Visibility="{x:Bind ShowNotAccessibleWarning, Converter={StaticResource BoolToVisibilityConverter}}" Visibility="{x:Bind ShowNotAccessibleWarning, Converter={StaticResource BoolToVisibilityConverter}}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<TextBlock <TextBlock
x:Uid="Run_NotAllowedActionKeyword" x:Uid="Run_NotAllowedActionKeyword"
FontSize="12"
Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}" Foreground="{ThemeResource SystemControlErrorTextForegroundBrush}"
Visibility="{x:Bind ShowNotAllowedKeywordWarning, Converter={StaticResource BoolToVisibilityConverter}}" Visibility="{x:Bind ShowNotAllowedKeywordWarning, Converter={StaticResource BoolToVisibilityConverter}}"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
@@ -266,24 +264,28 @@
Grid.Column="2" /> Grid.Column="2" />
</Grid> </Grid>
<StackPanel Margin="60,24,0,24" <StackPanel Margin="60,0,0,0"
x:Name="AdditionalInfoPanel" x:Name="AdditionalInfoPanel"
Visibility="{x:Bind ShowAdditionalInfoPanel, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}"> Visibility="{x:Bind ShowAdditionalInfoPanel, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
<CheckBox x:Uid="PowerLauncher_IncludeInGlobalResult"
IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
IsEnabled="{x:Bind Enabled, Mode=OneWay}"/>
<TextBlock x:Uid="PowerLauncher_ActionKeyword" <TextBlock x:Uid="PowerLauncher_ActionKeyword"
x:Name="ActionKeywordHeaderTextBlock" x:Name="ActionKeywordHeaderTextBlock"
Margin="{StaticResource SmallTopMargin}" Margin="{StaticResource SmallTopMargin}"
Opacity="{x:Bind DisabledOpacity}"/> Opacity="{x:Bind DisabledOpacity}" />
<TextBox x:Uid="PowerLauncher_ActionKeyword" <TextBox x:Uid="PowerLauncher_ActionKeyword"
Text="{x:Bind Path=ActionKeyword, Mode=TwoWay}" Text="{x:Bind Path=ActionKeyword, Mode=TwoWay}"
Width="86" Width="86"
Margin="0,6,0,0" Margin="0,6,0,0"
AutomationProperties.LabeledBy="{Binding ElementName=ActionKeywordHeaderTextBlock}" AutomationProperties.LabeledBy="{Binding ElementName=ActionKeywordHeaderTextBlock}"
HorizontalAlignment="Left" HorizontalAlignment="Left"
IsEnabled="{x:Bind Enabled, Mode=OneWay}"/> IsEnabled="{x:Bind Enabled, Mode=OneWay}" />
<CheckBox x:Uid="PowerLauncher_IncludeInGlobalResult"
IsChecked="{x:Bind Path=IsGlobal, Mode=TwoWay}"
IsEnabled="{x:Bind Enabled, Mode=OneWay}"
Margin="{StaticResource SmallTopMargin}"/>
<TextBlock x:Name="AdditionalOptionsTextBlock" <TextBlock x:Name="AdditionalOptionsTextBlock"
x:Uid="Run_AdditionalOptions" x:Uid="Run_AdditionalOptions"
@@ -313,8 +315,7 @@
</ListView.ItemTemplate> </ListView.ItemTemplate>
</ListView> </ListView>
<TextBlock FontSize="12" <TextBlock Opacity="{x:Bind DisabledOpacity}"
Opacity="{x:Bind DisabledOpacity}"
Foreground="{ThemeResource SystemBaseMediumColor}" Foreground="{ThemeResource SystemBaseMediumColor}"
HorizontalAlignment="Right" HorizontalAlignment="Right"
Margin="0,0,12,0"> Margin="0,0,12,0">

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

@@ -62,7 +62,6 @@
<TextBlock x:Uid="FileExplorerPreview_AffectsAllUsers" <TextBlock x:Uid="FileExplorerPreview_AffectsAllUsers"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}" Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
Margin="{StaticResource SmallBottomMargin}" Margin="{StaticResource SmallBottomMargin}"
FontWeight="SemiBold"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<TextBlock x:Uid="FileExplorerPreview_PreviewPane_GroupSettings" <TextBlock x:Uid="FileExplorerPreview_PreviewPane_GroupSettings"
@@ -86,11 +85,9 @@
<TextBlock x:Uid="FileExplorerPreview_RebootRequired" <TextBlock x:Uid="FileExplorerPreview_RebootRequired"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}" Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsElevated, Converter={StaticResource ModuleEnabledToForegroundConverter}}"
Margin="{StaticResource SmallTopBottomMargin}" Margin="{StaticResource SmallTopBottomMargin}"
FontWeight="SemiBold"
TextWrapping="Wrap"/> TextWrapping="Wrap"/>
<ToggleSwitch x:Uid="FileExplorerPreview_ToggleSwitch_SVG_Thumbnail" <ToggleSwitch x:Uid="FileExplorerPreview_ToggleSwitch_SVG_Thumbnail"
Margin="{StaticResource SmallTopMargin}"
IsOn="{Binding Mode=TwoWay, Path=SVGThumbnailIsEnabled}" IsOn="{Binding Mode=TwoWay, Path=SVGThumbnailIsEnabled}"
IsEnabled="{Binding Mode=OneWay, Path=IsElevated}"/> IsEnabled="{Binding Mode=OneWay, Path=IsElevated}"/>
</StackPanel> </StackPanel>

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

@@ -107,7 +107,8 @@
<RadioButton x:Uid="Radio_Theme_Light" /> <RadioButton x:Uid="Radio_Theme_Light" />
<RadioButton x:Uid="Radio_Theme_Default"/> <RadioButton x:Uid="Radio_Theme_Default"/>
</muxc:RadioButtons> </muxc:RadioButtons>
<HyperlinkButton Click="OpenColorsSettings_Click"> <HyperlinkButton Click="OpenColorsSettings_Click"
IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled}">
<TextBlock x:Uid="Windows_Color_Settings" /> <TextBlock x:Uid="Windows_Color_Settings" />
</HyperlinkButton> </HyperlinkButton>
</StackPanel> </StackPanel>