Compare commits
3 commits
main
...
users/niel
Author | SHA1 | Date | |
---|---|---|---|
c84ca94179 | |||
373ec11289 | |||
d06865390f |
|
@ -52,7 +52,7 @@
|
||||||
HorizontalAlignment="Center"
|
HorizontalAlignment="Center"
|
||||||
FontSize="20"
|
FontSize="20"
|
||||||
Margin="2,0,18,0"
|
Margin="2,0,18,0"
|
||||||
MaxWidth="26"
|
MaxWidth="20"
|
||||||
AutomationProperties.AccessibilityView="Raw"
|
AutomationProperties.AccessibilityView="Raw"
|
||||||
FontFamily="{ThemeResource SymbolThemeFontFamily}"
|
FontFamily="{ThemeResource SymbolThemeFontFamily}"
|
||||||
Foreground="{ThemeResource CardPrimaryForegroundBrush}"
|
Foreground="{ThemeResource CardPrimaryForegroundBrush}"
|
||||||
|
|
|
@ -18,7 +18,6 @@
|
||||||
Style="{ThemeResource OobeSubtitleStyle}" />
|
Style="{ThemeResource OobeSubtitleStyle}" />
|
||||||
|
|
||||||
<controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
|
<controls:ShortcutWithTextLabelControl x:Name="HotkeyControl" x:Uid="Oobe_ShortcutGuide_HowToLaunch" />
|
||||||
|
|
||||||
<StackPanel Orientation="Horizontal" Spacing="12" Margin="0,24,0,0">
|
<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="Launch_ShortcutGuide" Style="{StaticResource AccentButtonStyle}" Click="Start_ShortcutGuide_Click"/>
|
||||||
<Button x:Uid="OOBE_Settings"
|
<Button x:Uid="OOBE_Settings"
|
||||||
|
|
|
@ -2,6 +2,7 @@
|
||||||
// The Microsoft Corporation licenses this file to you under the MIT license.
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
|
@ -55,8 +56,16 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
|
||||||
protected override void OnNavigatedTo(NavigationEventArgs e)
|
protected override void OnNavigatedTo(NavigationEventArgs e)
|
||||||
{
|
{
|
||||||
ViewModel.LogOpeningModuleEvent();
|
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)
|
protected override void OnNavigatedFrom(NavigationEventArgs e)
|
||||||
|
|
|
@ -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>
|
<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>
|
||||||
<data name="Oobe_Awake_HowToUse.Text" xml:space="preserve">
|
<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>
|
||||||
<data name="Oobe_Awake_TipsAndTricks.Text" xml:space="preserve">
|
<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>
|
||||||
<data name="General_FailedToDownloadTheNewVersion.Title" xml:space="preserve">
|
<data name="General_FailedToDownloadTheNewVersion.Title" xml:space="preserve">
|
||||||
<value>An error occurred trying to install this update:</value>
|
<value>An error occurred trying to install this update:</value>
|
||||||
|
|
|
@ -188,6 +188,7 @@
|
||||||
<controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
|
<controls:Setting x:Uid="GeneralSettings_AlwaysRunAsAdminText" IsEnabled="{Binding Mode=OneWay, Path=IsElevated}" Style="{StaticResource ExpanderContentSettingStyle}">
|
||||||
<controls:Setting.Description>
|
<controls:Setting.Description>
|
||||||
<HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
|
<HyperlinkButton NavigateUri="https://aka.ms/powertoysDetectedElevatedHelp"
|
||||||
|
Visibility="{Binding Mode=OneWay, Path=IsElevated}"
|
||||||
x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
|
x:Uid="GeneralPage_ToggleSwitch_AlwaysRunElevated_Link"/>
|
||||||
</controls:Setting.Description>
|
</controls:Setting.Description>
|
||||||
<controls:Setting.ActionContent>
|
<controls:Setting.ActionContent>
|
||||||
|
@ -198,7 +199,12 @@
|
||||||
Severity="Warning"
|
Severity="Warning"
|
||||||
IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
|
IsTabStop="{Binding Mode=OneWay, Path=IsElevated, Converter={StaticResource NegationConverter}}"
|
||||||
IsClosable="False"
|
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>
|
</StackPanel>
|
||||||
</controls:SettingExpander.Content>
|
</controls:SettingExpander.Content>
|
||||||
</controls:SettingExpander>
|
</controls:SettingExpander>
|
||||||
|
|
Loading…
Reference in a new issue