diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt
index 2711033404..ae62af06c2 100644
--- a/.github/actions/spell-check/expect.txt
+++ b/.github/actions/spell-check/expect.txt
@@ -128,6 +128,7 @@ AUTOSIZECOLUMNS
AUTOUPDATE
available
AValid
+awakeness
awakeversion
AWAYMODE
AYUV
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
index 5e2bd39660..ba4a756734 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/ColorPickerViewModel.cs
@@ -148,43 +148,19 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels
}
}
- public bool ActivationOpensEditor
+ public int ActivationBehavior
{
- get => _colorPickerSettings.Properties.ActivationAction == ColorPickerActivationAction.OpenEditor;
- set
+ get
{
- if (value && _colorPickerSettings.Properties.ActivationAction != ColorPickerActivationAction.OpenEditor)
- {
- _colorPickerSettings.Properties.ActivationAction = ColorPickerActivationAction.OpenEditor;
- OnPropertyChanged(nameof(ActivationOpensEditor));
- NotifySettingsChanged();
- }
+ return (int)_colorPickerSettings.Properties.ActivationAction;
}
- }
- public bool ActivationOpensColorPickerOnly
- {
- get => _colorPickerSettings.Properties.ActivationAction == ColorPickerActivationAction.OpenOnlyColorPicker;
set
{
- if (value && _colorPickerSettings.Properties.ActivationAction != ColorPickerActivationAction.OpenOnlyColorPicker)
+ if (value != (int)_colorPickerSettings.Properties.ActivationAction)
{
- _colorPickerSettings.Properties.ActivationAction = ColorPickerActivationAction.OpenOnlyColorPicker;
- OnPropertyChanged(nameof(ActivationOpensColorPickerOnly));
- NotifySettingsChanged();
- }
- }
- }
-
- public bool ActivationOpensColorPickerAndEditor
- {
- get => _colorPickerSettings.Properties.ActivationAction == ColorPickerActivationAction.OpenColorPickerAndThenEditor;
- set
- {
- if (value && _colorPickerSettings.Properties.ActivationAction != ColorPickerActivationAction.OpenColorPickerAndThenEditor)
- {
- _colorPickerSettings.Properties.ActivationAction = ColorPickerActivationAction.OpenColorPickerAndThenEditor;
- OnPropertyChanged(nameof(ActivationOpensEditor));
+ _colorPickerSettings.Properties.ActivationAction = (ColorPickerActivationAction)value;
+ OnPropertyChanged(nameof(ActivationBehavior));
NotifySettingsChanged();
}
}
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs
deleted file mode 100644
index f9481922ed..0000000000
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright (c) Microsoft Corporation
-// 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;
-using Microsoft.PowerToys.Settings.UI.Library;
-using Windows.UI.Xaml.Data;
-
-namespace Microsoft.PowerToys.Settings.UI.Converters
-{
- public sealed class AwakeModeToBoolConverter : IValueConverter
- {
- public object Convert(object value, Type targetType, object parameter, string language)
- {
- if (targetType != typeof(bool?))
- {
- throw new InvalidOperationException("The target type needs to be a boolean.");
- }
-
- if (parameter == null)
- {
- throw new NullReferenceException("Parameter cannot be null for the PowerToys Awake mode to bool converter.");
- }
-
- var expectedMode = (AwakeMode)Enum.Parse(typeof(AwakeMode), parameter.ToString());
- var currentMode = (AwakeMode)value;
-
- return currentMode.Equals(expectedMode);
- }
-
- public object ConvertBack(object value, Type targetType, object parameter, string language)
- {
- if (parameter == null)
- {
- throw new NullReferenceException("Parameter cannot be null for the PowerToys Awake mode to bool converter.");
- }
-
- return (AwakeMode)Enum.Parse(typeof(AwakeMode), parameter.ToString());
- }
- }
-}
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToIntConverter.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToIntConverter.cs
new file mode 100644
index 0000000000..ee73f03016
--- /dev/null
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToIntConverter.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft Corporation
+// 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;
+using Microsoft.PowerToys.Settings.UI.Library;
+using Windows.UI.Xaml.Data;
+
+namespace Microsoft.PowerToys.Settings.UI.Converters
+{
+ public sealed class AwakeModeToIntConverter : IValueConverter
+ {
+ public object Convert(object value, Type targetType, object parameter, string language)
+ {
+ var mode = (AwakeMode)value;
+ return (int)mode;
+ }
+
+ public object ConvertBack(object value, Type targetType, object parameter, string language)
+ {
+ return (AwakeMode)Enum.ToObject(typeof(AwakeMode), (int)value);
+ }
+ }
+}
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
index 4d035f4108..b798b3f676 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
@@ -119,7 +119,7 @@
TextBlockControl.xaml
-
+
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
index 20b1e2d44f..05481e4593 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
@@ -991,23 +991,14 @@ Made with 💗 by Microsoft and the PowerToys community.
Default color format
-
- Color Picker with editor mode enabled
- do not loc the product name
+
+ Pick a color and open editor
-
- Color Picker with editor mode enabled
- do not loc the product name
+
+ Open editor
-
- Pick a color from the screen, copy formatted value to clipboard, then to the editor
- do not loc the product name
-
-
- Editor
-
-
- Editor
+
+ Only pick a color
Activation behavior
@@ -1050,20 +1041,6 @@ Made with 💗 by Microsoft and the PowerToys community.
Made with 💗 by Microsoft and the PowerToys community.
-
- Color Picker only
- do not loc the product name
-
-
- Color Picker only
- do not loc the product name
-
-
- Pick a color from the screen and copy formatted value to clipboard
-
-
- Open directly into the editor mode
-
Color formats
@@ -1098,11 +1075,28 @@ Made with 💗 by Microsoft and the PowerToys community.
Small
The size of the image
-
- Win + Up/Down/Left/Right to move windows based on relative position
+
+ Windows key + Up, down, left or right arrow key to move windows based on relative position
-
- Win + Left/Right to move windows based on zone index
+
+ Windows key + Left or right arrow keys to move windows based on zone index
+
+
+ Windows key + or
+ Do not loc the icons (hex numbers)
+
+
+ Windows key + or
+ Do not loc the icons (hex numbers)
+
+
+ Relative position
+
+
+ Move windows based on
+
+
+ Zone index
Editor
@@ -1403,25 +1397,17 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
Enable Awake
+ Awake is a product name, do not loc
-
- Inactive
+
+ Keep using the selected power plan
-
+
Keep awake indefinitely
-
+
Keep awake temporarily
-
- Your PC operates according to its current power plan
-
-
- Keeps your PC awake until the setting is disabled
-
-
- Keeps your PC awake until the set time elapses
-
Keep screen on
@@ -1519,7 +1505,7 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
See what's new
- Set the preferred behaviour of Awake
+ Manage the state of your device when Awake is active
Excluded apps
@@ -1648,4 +1634,7 @@ From there, simply click on a Markdown file, PDF file or SVG icon in the File Ex
New size
First part of the default name of new sizes that can be added in PT's settings ui.
+
+ Time before returning to the previous awakeness state
+
\ No newline at end of file
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
index 345cdee9c9..507e271533 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml
@@ -4,14 +4,14 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
- xmlns:c="using:Microsoft.PowerToys.Settings.UI.Converters"
+ xmlns:converters="using:Microsoft.PowerToys.Settings.UI.Converters"
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
xmlns:controls="using:Microsoft.PowerToys.Settings.UI.Controls"
mc:Ignorable="d"
AutomationProperties.LandmarkType="Main">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
index f562d8cd32..b9cd640285 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
@@ -34,50 +34,16 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
index 172a33f151..0f46c4d8a0 100644
--- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
+++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
@@ -11,6 +11,7 @@
AutomationProperties.LandmarkType="Main">
+
@@ -226,16 +227,29 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-