mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[Settings] Various bugfixes (#14611)

Browse Source 
* Set maxwidth

* Correct shortcut

* Update GeneralPage.xaml
This commit is contained in:
Niels Laute 2021-11-29 12:59:38 +01:00 committed by GitHub
parent 72ea4ff8b3
commit 7974a9f43b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@
HorizontalAlignment="Center"
FontSize="20"
Margin="2,0,18,0"
MaxWidth="26"
MaxWidth="20"
AutomationProperties.AccessibilityView="Raw"
FontFamily="{ThemeResource SymbolThemeFontFamily}"
Foreground="{ThemeResource CardPrimaryForegroundBrush}"

1
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml
View File

@ -18,7 +18,6 @@
Style="{ThemeResource OobeSubtitleStyle}" />
<controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
<StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
<Button x:Uid="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
<Button x:Uid="OOBE_Settings"

11
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShortcutGuide.xaml.cs
View File

@ -2,6 +2,7 @@
// The Microsoft Corporation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Collections.Generic;
using System.Diagnostics;
using System.Globalization;
using System.IO;
@ -55,8 +56,16 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
protected override void OnNavigatedTo(NavigationEventArgs e)
{
ViewModel.LogOpeningModuleEvent();
var settingsProperties = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties;
HotkeyControl.Keys = SettingsRepository<ShortcutGuideSettings>.GetInstance(new SettingsUtils()).SettingsConfig.Properties.OpenShortcutGuide.GetKeysList();
if ((bool)settingsProperties.UseLegacyPressWinKeyBehavior.Value)
{
HotkeyControl.Keys = new List<object> { 92 };
}
else
{
HotkeyControl.Keys = settingsProperties.OpenShortcutGuide.GetKeysList();
}
}
protected override void OnNavigatedFrom(NavigationEventArgs e)

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

@ -1481,10 +1481,10 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
<value>Awake is a Windows tool designed to keep your PC awake on-demand without having to manage its power settings. This behavior can be helpful when running time-consuming tasks while ensuring that your PC does not go to sleep or turn off its screens.</value>
</data>
<data name="Oobe_Awake_HowToUse.Text" xml:space="preserve">
<value>Open {PowerToys Settings} and enable Awake</value>
<value>Open **PowerToys Settings** and enable Awake</value>
</data>
<data name="Oobe_Awake_TipsAndTricks.Text" xml:space="preserve">
<value>You can always change modes quickly by {right-clicking the Awake icon} in the system tray.</value>
<value>You can always change modes quickly by **right-clicking the Awake icon** in the system tray.</value>
</data>
<data name="General_FailedToDownloadTheNewVersion.Title" xml:space="preserve">
<value>An error occurred trying to install this update:</value>

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

@ -188,6 +188,7 @@
<controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
<controls:Setting.Description>
<HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
Visibility="{Binding Mode=OneWay, Path=IsElevated}"
x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
</controls:Setting.Description>
<controls:Setting.ActionContent>
@ -198,7 +199,12 @@
Severity="Warning"
IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
IsClosable="False"
IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"/>
IsOpen="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}">
<muxc:InfoBar.ActionButton>
<HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
</muxc:InfoBar.ActionButton>
</muxc:InfoBar>
</StackPanel>
</controls:SettingExpander.Content>
</controls:SettingExpander>