maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Correct shortcut

Browse source
This commit is contained in:
niels9001 2021-11-23 17:23:17 +01:00
parent d06865390f
commit 373ec11289
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1478,10 +1478,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>