diff --git a/.github/actions/spell-check/expect.txt b/.github/actions/spell-check/expect.txt index acd28e1621..1e1236cb7b 100644 --- a/.github/actions/spell-check/expect.txt +++ b/.github/actions/spell-check/expect.txt @@ -142,6 +142,7 @@ autoplay Autorun AUTOSIZECOLUMNS autoupdate +awakeversion AValid AWAYMODE azurecr @@ -628,7 +629,6 @@ errorlevel ERRORMESSAGE ERRORTITLE esize -espressoversion estdir etcore etl diff --git a/.pipelines/pipeline.user.windows.yml b/.pipelines/pipeline.user.windows.yml index 715a45dacb..a87d40cf91 100644 --- a/.pipelines/pipeline.user.windows.yml +++ b/.pipelines/pipeline.user.windows.yml @@ -81,13 +81,14 @@ build: - 'modules\ColorPicker\Microsoft.PowerToys.Settings.UI.Lib.dll' - 'modules\ColorPicker\PowerToysInterop.dll' - 'modules\ColorPicker\Telemetry.dll' - - 'modules\Espresso\EspressoModuleInterface.dll' - - 'modules\Espresso\ManagedCommon.dll' - - 'modules\Espresso\ManagedTelemetry.dll' - - 'modules\Espresso\Microsoft.PowerToys.Settings.UI.Lib.dll' - - 'modules\Espresso\PowerToys.Espresso.exe' - - 'modules\Espresso\PowerToys.Espresso.dll' - - 'modules\Espresso\PowerToysInterop.dll' + - '**\*.resources.dll' + - 'modules\Awake\AwakeModuleInterface.dll' + - 'modules\Awake\ManagedCommon.dll' + - 'modules\Awake\ManagedTelemetry.dll' + - 'modules\Awake\Microsoft.PowerToys.Settings.UI.Lib.dll' + - 'modules\Awake\PowerToys.Awake.exe' + - 'modules\Awake\PowerToys.Awake.dll' + - 'modules\Awake\PowerToysInterop.dll' - 'modules\FancyZones\fancyzones.dll' - 'modules\FancyZones\FancyZonesEditor.exe' - 'modules\FancyZones\FancyZonesEditor.dll' diff --git a/COMMUNITY.md b/COMMUNITY.md index 3c0210cb1f..8503166ba6 100644 --- a/COMMUNITY.md +++ b/COMMUNITY.md @@ -63,7 +63,7 @@ PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Expl ### [@dend](https://github.com/dend/) - Den Delimarsky -PowerToys Espresso is a tool to keep your computer awake +PowerToys Awake is a tool to keep your computer awake. ### [@martinchrzan](https://github.com/martinchrzan/) - Martin Chrzan diff --git a/PowerToys.sln b/PowerToys.sln index 7d5e30a471..e0de0cf8eb 100644 --- a/PowerToys.sln +++ b/PowerToys.sln @@ -102,7 +102,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ImageResizerExt", "src\modu EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageResizerUITest", "src\modules\imageresizer\tests\ImageResizerUITest.csproj", "{E0CC7526-D85E-43AC-844F-D5DF0D2F5AB8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PowerToys.ActionRunner", "src\ActionRunner\ActionRunner.vcxproj", "{D29DDD63-E2CF-4657-9FD5-2AEDE4257E5D}" ProjectSection(ProjectDependencies) = postProject {17DA04DF-E393-4397-9CF0-84DABE11032E} = {17DA04DF-E393-4397-9CF0-84DABE11032E} EndProjectSection @@ -328,15 +328,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorLibrar EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "KeyboardManagerEditorTest", "src\modules\keyboardmanager\KeyboardManagerEditorTest\KeyboardManagerEditorTest.vcxproj", "{62173D9A-6724-4C00-A1C8-FB646480A9EC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "espresso", "espresso", "{127F38E0-40AA-4594-B955-5616BF206882}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "awake", "awake", "{127F38E0-40AA-4594-B955-5616BF206882}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AwakeModuleInterface", "src\modules\awake\AwakeModuleInterface\AwakeModuleInterface.vcxproj", "{5E7360A8-D048-4ED3-8F09-0BFD64C5529A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Awake", "src\modules\awake\Awake\Awake.csproj", "{D940E07F-532C-4FF3-883F-790DA014F19A}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.UnitConverter", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.UnitConverter\Community.PowerToys.Run.Plugin.UnitConverter.csproj", "{BB23A474-5058-4F75-8FA3-5FE3DE53CDF4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EspressoModuleInterface", "src\modules\espresso\EspressoModuleInterface\EspressoModuleInterface.vcxproj", "{5E7360A8-D048-4ED3-8F09-0BFD64C5529A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Community.PowerToys.Run.Plugin.UnitConverter.UnitTest", "src\modules\launcher\Plugins\Community.PowerToys.Run.Plugin.UnitConverter.UnitTest\Community.PowerToys.Run.Plugin.UnitConverter.UnitTest.csproj", "{3E424AD2-19E5-4AE6-B833-F53963EB5FC1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Espresso", "src\modules\espresso\Espresso\Espresso.csproj", "{D940E07F-532C-4FF3-883F-790DA014F19A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "shortcutguide", "shortcutguide", "{106CBECA-0701-4FC3-838C-9DF816A19AE2}" EndProject diff --git a/README.md b/README.md index 8cdd3bdeea..869c05a279 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline | [Color Picker](https://aka.ms/PowerToysOverview_ColorPicker) | [FancyZones](https://aka.ms/PowerToysOverview_FancyZones) | [File Explorer Add-ons](https://aka.ms/PowerToysOverview_FileExplorerAddOns) | | [Image Resizer](https://aka.ms/PowerToysOverview_ImageResizer) | [Keyboard Manager](https://aka.ms/PowerToysOverview_KeyboardManager) | [PowerRename](https://aka.ms/PowerToysOverview_PowerRename) | | [PowerToys Run](https://aka.ms/PowerToysOverview_PowerToysRun) | [Shortcut Guide](https://aka.ms/PowerToysOverview_ShortcutGuide) | [Video Conference Mute (Experimental)](https://aka.ms/PowerToysOverview_VideoConference) | -| Espresso (Coming soon in 0.39) | | | +| Awake (Coming soon in 0.39) | | | ## Installing and running Microsoft PowerToys ### Requirements diff --git a/doc/images/icons/Espresso.png b/doc/images/icons/Awake.png similarity index 100% rename from doc/images/icons/Espresso.png rename to doc/images/icons/Awake.png diff --git a/doc/images/overview/Espresso_large.png b/doc/images/overview/Awake_large.png similarity index 100% rename from doc/images/overview/Espresso_large.png rename to doc/images/overview/Awake_large.png diff --git a/doc/images/overview/Espresso_small.png b/doc/images/overview/Awake_small.png similarity index 100% rename from doc/images/overview/Espresso_small.png rename to doc/images/overview/Awake_small.png diff --git a/doc/images/overview/Original/Espresso.png b/doc/images/overview/Original/Awake.png similarity index 100% rename from doc/images/overview/Original/Espresso.png rename to doc/images/overview/Original/Awake.png diff --git a/installer/PowerToysSetup/Product.wxs b/installer/PowerToysSetup/Product.wxs index 26568891fe..9a7cbf205d 100644 --- a/installer/PowerToysSetup/Product.wxs +++ b/installer/PowerToysSetup/Product.wxs @@ -8,7 +8,7 @@ - + @@ -220,13 +220,13 @@ - - - - - - - + + + + + + + @@ -678,35 +678,35 @@ - - - - - + + + + + - - - - - - + + + + + + - - - - - + + + + + - - - + + + @@ -787,21 +787,21 @@ - + - + - + @@ -889,10 +889,10 @@ - - - - + + + + diff --git a/src/common/logger/logger_settings.h b/src/common/logger/logger_settings.h index c7268fb088..995c50ee8a 100644 --- a/src/common/logger/logger_settings.h +++ b/src/common/logger/logger_settings.h @@ -13,7 +13,7 @@ struct LogSettings inline const static std::wstring actionRunnerLogPath = L"RunnerLogs\\action-runner-log.txt"; inline const static std::string launcherLoggerName = "launcher"; inline const static std::wstring launcherLogPath = L"LogsModuleInterface\\launcher-log.txt"; - inline const static std::wstring espressoLogPath = L"Logs\\espresso-log.txt"; + inline const static std::wstring awakeLogPath = L"Logs\\awake-log.txt"; inline const static std::string fancyZonesLoggerName = "fancyzones"; inline const static std::wstring fancyZonesLogPath = L"fancyzones-log.txt"; inline const static std::wstring fancyZonesOldLogPath = L"FancyZonesLogs\\"; // needed to clean up old logs diff --git a/src/modules/espresso/Espresso/Espresso.csproj b/src/modules/awake/Awake/Awake.csproj similarity index 94% rename from src/modules/espresso/Espresso/Espresso.csproj rename to src/modules/awake/Awake/Awake.csproj index eeb421c4d5..a947af1296 100644 --- a/src/modules/espresso/Espresso/Espresso.csproj +++ b/src/modules/awake/Awake/Awake.csproj @@ -3,7 +3,7 @@ WinExe netcoreapp3.1 - $(SolutionDir)$(Platform)\$(Configuration)\modules\Espresso + $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake enable x64 false @@ -11,9 +11,9 @@ true true - PowerToys.Espresso + PowerToys.Awake $(Version).0 - Images\Espresso.ico + Images\Awake.ico @@ -78,6 +78,6 @@ - + diff --git a/src/modules/espresso/Espresso/Core/APIHelper.cs b/src/modules/awake/Awake/Core/APIHelper.cs similarity index 99% rename from src/modules/espresso/Espresso/Core/APIHelper.cs rename to src/modules/awake/Awake/Core/APIHelper.cs index 0c0fb85fe5..ffa242a864 100644 --- a/src/modules/espresso/Espresso/Core/APIHelper.cs +++ b/src/modules/awake/Awake/Core/APIHelper.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Microsoft.Win32; using NLog; -namespace Espresso.Shell.Core +namespace Awake.Core { [Flags] public enum EXECUTION_STATE : uint diff --git a/src/modules/espresso/Espresso/Core/TrayHelper.cs b/src/modules/awake/Awake/Core/TrayHelper.cs similarity index 87% rename from src/modules/espresso/Espresso/Core/TrayHelper.cs rename to src/modules/awake/Awake/Core/TrayHelper.cs index f0ff727137..ec44ae49ea 100644 --- a/src/modules/espresso/Espresso/Core/TrayHelper.cs +++ b/src/modules/awake/Awake/Core/TrayHelper.cs @@ -12,7 +12,7 @@ using Microsoft.PowerToys.Settings.UI.Library; #pragma warning disable CS8602 // Dereference of a possibly null reference. #pragma warning disable CS8603 // Possible null reference return. -namespace Espresso.Shell.Core +namespace Awake.Core { internal static class TrayHelper { @@ -44,7 +44,7 @@ namespace Espresso.Shell.Core }, TrayIcon); } - internal static void SetTray(string text, EspressoSettings settings) + internal static void SetTray(string text, AwakeSettings settings) { SetTray( text, @@ -69,15 +69,15 @@ namespace Espresso.Shell.Core { return () => { - EspressoSettings currentSettings; + AwakeSettings currentSettings; try { - currentSettings = ModuleSettings.GetSettings(moduleName); + currentSettings = ModuleSettings.GetSettings(moduleName); } catch (FileNotFoundException) { - currentSettings = new EspressoSettings(); + currentSettings = new AwakeSettings(); } currentSettings.Properties.KeepDisplayOn = !currentSettings.Properties.KeepDisplayOn; @@ -90,18 +90,18 @@ namespace Espresso.Shell.Core { return (hours, minutes) => { - EspressoSettings currentSettings; + AwakeSettings currentSettings; try { - currentSettings = ModuleSettings.GetSettings(moduleName); + currentSettings = ModuleSettings.GetSettings(moduleName); } catch (FileNotFoundException) { - currentSettings = new EspressoSettings(); + currentSettings = new AwakeSettings(); } - currentSettings.Properties.Mode = EspressoMode.TIMED; + currentSettings.Properties.Mode = AwakeMode.TIMED; currentSettings.Properties.Hours = hours; currentSettings.Properties.Minutes = minutes; @@ -113,18 +113,18 @@ namespace Espresso.Shell.Core { return () => { - EspressoSettings currentSettings; + AwakeSettings currentSettings; try { - currentSettings = ModuleSettings.GetSettings(moduleName); + currentSettings = ModuleSettings.GetSettings(moduleName); } catch (FileNotFoundException) { - currentSettings = new EspressoSettings(); + currentSettings = new AwakeSettings(); } - currentSettings.Properties.Mode = EspressoMode.PASSIVE; + currentSettings.Properties.Mode = AwakeMode.PASSIVE; ModuleSettings.SaveSettings(JsonSerializer.Serialize(currentSettings), moduleName); }; @@ -134,24 +134,24 @@ namespace Espresso.Shell.Core { return () => { - EspressoSettings currentSettings; + AwakeSettings currentSettings; try { - currentSettings = ModuleSettings.GetSettings(moduleName); + currentSettings = ModuleSettings.GetSettings(moduleName); } catch (FileNotFoundException) { - currentSettings = new EspressoSettings(); + currentSettings = new AwakeSettings(); } - currentSettings.Properties.Mode = EspressoMode.INDEFINITE; + currentSettings.Properties.Mode = AwakeMode.INDEFINITE; ModuleSettings.SaveSettings(JsonSerializer.Serialize(currentSettings), moduleName); }; } - public static void SetTray(string text, bool keepDisplayOn, EspressoMode mode, Action passiveKeepAwakeCallback, Action indefiniteKeepAwakeCallback, Action timedKeepAwakeCallback, Action keepDisplayOnCallback, Action exitCallback) + public static void SetTray(string text, bool keepDisplayOn, AwakeMode mode, Action passiveKeepAwakeCallback, Action indefiniteKeepAwakeCallback, Action timedKeepAwakeCallback, Action keepDisplayOnCallback, Action exitCallback) { var contextMenuStrip = new ContextMenuStrip(); @@ -167,7 +167,7 @@ namespace Espresso.Shell.Core Text = "Off (Passive)", }; - if (mode == EspressoMode.PASSIVE) + if (mode == AwakeMode.PASSIVE) { passiveMenuItem.Checked = true; } @@ -188,7 +188,7 @@ namespace Espresso.Shell.Core Text = "Keep awake indefinitely", }; - if (mode == EspressoMode.INDEFINITE) + if (mode == AwakeMode.INDEFINITE) { indefiniteMenuItem.Checked = true; } @@ -227,7 +227,7 @@ namespace Espresso.Shell.Core { Text = "Keep awake temporarily", }; - if (mode == EspressoMode.TIMED) + if (mode == AwakeMode.TIMED) { timedMenuItem.Checked = true; } diff --git a/src/modules/espresso/Espresso/Images/Espresso.ico b/src/modules/awake/Awake/Images/Awake.ico similarity index 100% rename from src/modules/espresso/Espresso/Images/Espresso.ico rename to src/modules/awake/Awake/Images/Awake.ico diff --git a/src/modules/espresso/Espresso/NLog.config b/src/modules/awake/Awake/NLog.config similarity index 69% rename from src/modules/espresso/Espresso/NLog.config rename to src/modules/awake/Awake/NLog.config index 6448e4cf0c..5d19f72d81 100644 --- a/src/modules/espresso/Espresso/NLog.config +++ b/src/modules/awake/Awake/NLog.config @@ -2,21 +2,23 @@ - + - + - \ No newline at end of file + diff --git a/src/modules/espresso/Espresso/Program.cs b/src/modules/awake/Awake/Program.cs similarity index 91% rename from src/modules/espresso/Espresso/Program.cs rename to src/modules/awake/Awake/Program.cs index 0e6e4bfeb8..9087ad848e 100644 --- a/src/modules/espresso/Espresso/Program.cs +++ b/src/modules/awake/Awake/Program.cs @@ -14,7 +14,7 @@ using System.Reactive.Linq; using System.Reflection; using System.Threading; using System.Windows; -using Espresso.Shell.Core; +using Awake.Core; using ManagedCommon; using Microsoft.PowerToys.Settings.UI.Library; using NLog; @@ -22,12 +22,12 @@ using NLog; #pragma warning disable CS8602 // Dereference of a possibly null reference. #pragma warning disable CS8603 // Possible null reference return. -namespace Espresso.Shell +namespace Awake { internal class Program { private static Mutex? _mutex = null; - private const string AppName = "Espresso"; + private const string AppName = "Awake"; private static FileSystemWatcher? _watcher = null; private static SettingsUtils? _settingsUtils = null; @@ -48,7 +48,7 @@ namespace Espresso.Shell _log = LogManager.GetCurrentClassLogger(); _settingsUtils = new SettingsUtils(); - _log.Info("Launching Espresso..."); + _log.Info("Launching PowerToys Awake..."); _log.Info(FileVersionInfo.GetVersionInfo(Assembly.GetExecutingAssembly().Location).FileVersion); _log.Info($"OS: {Environment.OSVersion}"); _log.Info($"OS Build: {APIHelper.GetOperatingSystemBuild()}"); @@ -58,7 +58,7 @@ namespace Espresso.Shell var configOption = new Option( aliases: new[] { "--use-pt-config", "-c" }, getDefaultValue: () => false, - description: "Specifies whether Espresso will be using the PowerToys configuration file for managing the state.") + description: "Specifies whether PowerToys Awake will be using the PowerToys configuration file for managing the state.") { Argument = new Argument(() => false) { @@ -97,7 +97,7 @@ namespace Espresso.Shell var pidOption = new Option( aliases: new[] { "--pid", "-p" }, getDefaultValue: () => 0, - description: "Bind the execution of Espresso to another process.") + description: "Bind the execution of PowerToys Awake to another process.") { Argument = new Argument(() => 0) { @@ -151,7 +151,7 @@ namespace Espresso.Shell try { #pragma warning disable CS8604 // Possible null reference argument. - TrayHelper.InitializeTray(AppName, new Icon(Application.GetResourceStream(new Uri("/Images/Espresso.ico", UriKind.Relative)).Stream)); + TrayHelper.InitializeTray(AppName, new Icon(Application.GetResourceStream(new Uri("/Images/Awake.ico", UriKind.Relative)).Stream)); #pragma warning restore CS8604 // Possible null reference argument. var settingsPath = _settingsUtils.GetSettingsFilePath(AppName); @@ -178,9 +178,9 @@ namespace Espresso.Shell mergedObservable.Throttle(TimeSpan.FromMilliseconds(25)) .SubscribeOn(TaskPoolScheduler.Default) .Select(e => e.EventArgs) - .Subscribe(HandleEspressoConfigChange); + .Subscribe(HandleAwakeConfigChange); - TrayHelper.SetTray(AppName, new EspressoSettings()); + TrayHelper.SetTray(AppName, new AwakeSettings()); // Initially the file might not be updated, so we need to start processing // settings right away. @@ -195,9 +195,9 @@ namespace Espresso.Shell } else { - var mode = timeLimit <= 0 ? EspressoMode.INDEFINITE : EspressoMode.TIMED; + var mode = timeLimit <= 0 ? AwakeMode.INDEFINITE : AwakeMode.TIMED; - if (mode == EspressoMode.INDEFINITE) + if (mode == AwakeMode.INDEFINITE) { SetupIndefiniteKeepAwake(displayOn); } @@ -226,7 +226,7 @@ namespace Espresso.Shell APIHelper.SetIndefiniteKeepAwake(LogCompletedKeepAwakeThread, LogUnexpectedOrCancelledKeepAwakeThreadCompletion, displayOn); } - private static void HandleEspressoConfigChange(FileSystemEventArgs fileEvent) + private static void HandleAwakeConfigChange(FileSystemEventArgs fileEvent) { _log.Info("Detected a settings file change. Updating configuration..."); _log.Info("Resetting keep-awake to normal state due to settings change."); @@ -237,26 +237,26 @@ namespace Espresso.Shell { try { - EspressoSettings settings = _settingsUtils.GetSettings(AppName); + AwakeSettings settings = _settingsUtils.GetSettings(AppName); if (settings != null) { switch (settings.Properties.Mode) { - case EspressoMode.PASSIVE: + case AwakeMode.PASSIVE: { SetupNoKeepAwake(); break; } - case EspressoMode.INDEFINITE: + case AwakeMode.INDEFINITE: { // Indefinite keep awake. SetupIndefiniteKeepAwake(settings.Properties.KeepDisplayOn); break; } - case EspressoMode.TIMED: + case AwakeMode.TIMED: { // Timed keep-awake. uint computedTime = (settings.Properties.Hours * 60 * 60) + (settings.Properties.Minutes * 60); diff --git a/src/modules/awake/AwakeModuleInterface/AwakeConstants.h b/src/modules/awake/AwakeModuleInterface/AwakeConstants.h new file mode 100644 index 0000000000..135e52365c --- /dev/null +++ b/src/modules/awake/AwakeModuleInterface/AwakeConstants.h @@ -0,0 +1,7 @@ +#include + +namespace AwakeConstants +{ + // Name of the powertoy module. + inline const std::wstring ModuleKey = L"Awake"; +} \ No newline at end of file diff --git a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.rc b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.rc similarity index 97% rename from src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.rc rename to src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.rc index 91d08ea09e..2826312fc2 100644 --- a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.rc +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.rc @@ -52,7 +52,7 @@ END STRINGTABLE BEGIN - IDS_ESPRESSO_NAME "Espresso" + IDS_AWAKE_NAME "Awake" END #endif // English (United States) resources diff --git a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj similarity index 94% rename from src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj rename to src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj index 5f880d835a..89852b24d8 100644 --- a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj @@ -15,8 +15,8 @@ 15.0 {5e7360a8-d048-4ed3-8f09-0bfd64c5529a} Win32Proj - Espresso - EspressoModuleInterface + Awake + AwakeModuleInterface 10.0.17134.0 @@ -36,7 +36,7 @@ - $(SolutionDir)$(Platform)\$(Configuration)\modules\Espresso\ + $(SolutionDir)$(Platform)\$(Configuration)\modules\Awake\ @@ -48,7 +48,7 @@ - + @@ -72,7 +72,7 @@ - + diff --git a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters similarity index 93% rename from src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters rename to src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters index 2dd5624a53..eeb4aece12 100644 --- a/src/modules/espresso/EspressoModuleInterface/EspressoModuleInterface.vcxproj.filters +++ b/src/modules/awake/AwakeModuleInterface/AwakeModuleInterface.vcxproj.filters @@ -15,7 +15,7 @@ Header Files - + Header Files @@ -43,7 +43,7 @@ - + Resource Files diff --git a/src/modules/espresso/EspressoModuleInterface/dllmain.cpp b/src/modules/awake/AwakeModuleInterface/dllmain.cpp similarity index 85% rename from src/modules/espresso/EspressoModuleInterface/dllmain.cpp rename to src/modules/awake/AwakeModuleInterface/dllmain.cpp index e86c7c5b86..cd9e89cad7 100644 --- a/src/modules/espresso/EspressoModuleInterface/dllmain.cpp +++ b/src/modules/awake/AwakeModuleInterface/dllmain.cpp @@ -4,7 +4,7 @@ #include #include "trace.h" #include "resource.h" -#include "EspressoConstants.h" +#include "AwakeConstants.h" #include #include @@ -34,13 +34,13 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv } // The PowerToy name that will be shown in the settings. -const static wchar_t* MODULE_NAME = L"Espresso"; +const static wchar_t* MODULE_NAME = L"Awake"; // Add a description that will we shown in the module settings page. -const static wchar_t* MODULE_DESC = L""; +const static wchar_t* MODULE_DESC = L"A module that keeps your computer awake on-demand."; // Implement the PowerToy Module Interface and all the required methods. -class Espresso : public PowertoyModuleIface +class Awake : public PowertoyModuleIface { std::wstring app_name; @@ -55,7 +55,7 @@ private: HANDLE send_telemetry_event; - // Handle to event used to invoke Espresso + // Handle to event used to invoke PowerToys Awake HANDLE m_hInvokeEvent; bool is_process_running() @@ -65,21 +65,21 @@ private: void launch_process() { - Logger::trace(L"Launching Espresso process"); + Logger::trace(L"Launching PowerToys Awake process"); unsigned long powertoys_pid = GetCurrentProcessId(); std::wstring executable_args = L"--use-pt-config --pid " + std::to_wstring(powertoys_pid); - Logger::trace(L"Espresso launching with parameters: " + executable_args); + Logger::trace(L"PowerToys Awake launching with parameters: " + executable_args); SHELLEXECUTEINFOW sei{ sizeof(sei) }; sei.fMask = { SEE_MASK_NOCLOSEPROCESS | SEE_MASK_FLAG_NO_UI }; - sei.lpFile = L"modules\\Espresso\\PowerToys.Espresso.exe"; + sei.lpFile = L"modules\\Awake\\PowerToys.Awake.exe"; sei.nShow = SW_SHOWNORMAL; sei.lpParameters = executable_args.data(); if (!ShellExecuteExW(&sei)) { DWORD error = GetLastError(); - std::wstring message = L"Espresso failed to start with error = "; + std::wstring message = L"PowerToys Awake failed to start with error = "; message += std::to_wstring(error); Logger::error(message); } @@ -89,12 +89,12 @@ private: public: // Constructor - Espresso() + Awake() { - app_name = GET_RESOURCE_STRING(IDS_ESPRESSO_NAME); - app_key = EspressoConstants::ModuleKey; + app_name = GET_RESOURCE_STRING(IDS_AWAKE_NAME); + app_key = AwakeConstants::ModuleKey; std::filesystem::path logFilePath(PTSettingsHelper::get_module_save_folder_location(this->app_key)); - logFilePath.append(LogSettings::espressoLogPath); + logFilePath.append(LogSettings::awakeLogPath); Logger::init(LogSettings::launcherLoggerName, logFilePath.wstring(), PTSettingsHelper::get_log_settings_file_location()); Logger::info("Launcher object is constructing"); }; @@ -177,5 +177,5 @@ public: extern "C" __declspec(dllexport) PowertoyModuleIface* __cdecl powertoy_create() { - return new Espresso(); + return new Awake(); } \ No newline at end of file diff --git a/src/modules/espresso/EspressoModuleInterface/packages.config b/src/modules/awake/AwakeModuleInterface/packages.config similarity index 100% rename from src/modules/espresso/EspressoModuleInterface/packages.config rename to src/modules/awake/AwakeModuleInterface/packages.config diff --git a/src/modules/espresso/EspressoModuleInterface/pch.cpp b/src/modules/awake/AwakeModuleInterface/pch.cpp similarity index 100% rename from src/modules/espresso/EspressoModuleInterface/pch.cpp rename to src/modules/awake/AwakeModuleInterface/pch.cpp diff --git a/src/modules/espresso/EspressoModuleInterface/pch.h b/src/modules/awake/AwakeModuleInterface/pch.h similarity index 100% rename from src/modules/espresso/EspressoModuleInterface/pch.h rename to src/modules/awake/AwakeModuleInterface/pch.h diff --git a/src/modules/espresso/EspressoModuleInterface/resource.h b/src/modules/awake/AwakeModuleInterface/resource.h similarity index 84% rename from src/modules/espresso/EspressoModuleInterface/resource.h rename to src/modules/awake/AwakeModuleInterface/resource.h index 53fc0ecf48..ad20cfcf42 100644 --- a/src/modules/espresso/EspressoModuleInterface/resource.h +++ b/src/modules/awake/AwakeModuleInterface/resource.h @@ -1,8 +1,8 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by Espresso.rc +// Used by Awake.rc // -#define IDS_ESPRESSO_NAME 101 +#define IDS_AWAKE_NAME 101 // Next default values for new objects // diff --git a/src/modules/espresso/EspressoModuleInterface/trace.cpp b/src/modules/awake/AwakeModuleInterface/trace.cpp similarity index 100% rename from src/modules/espresso/EspressoModuleInterface/trace.cpp rename to src/modules/awake/AwakeModuleInterface/trace.cpp diff --git a/src/modules/espresso/EspressoModuleInterface/trace.h b/src/modules/awake/AwakeModuleInterface/trace.h similarity index 100% rename from src/modules/espresso/EspressoModuleInterface/trace.h rename to src/modules/awake/AwakeModuleInterface/trace.h diff --git a/src/modules/espresso/EspressoModuleInterface/EspressoConstants.h b/src/modules/espresso/EspressoModuleInterface/EspressoConstants.h deleted file mode 100644 index 6b97fe7021..0000000000 --- a/src/modules/espresso/EspressoModuleInterface/EspressoConstants.h +++ /dev/null @@ -1,7 +0,0 @@ -#include - -namespace EspressoConstants -{ - // Name of the powertoy module. - inline const std::wstring ModuleKey = L"Espresso"; -} \ No newline at end of file diff --git a/src/runner/main.cpp b/src/runner/main.cpp index da6c35582a..27702354bf 100644 --- a/src/runner/main.cpp +++ b/src/runner/main.cpp @@ -153,7 +153,7 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe) L"modules/PowerRename/PowerRenameExt.dll", L"modules/ShortcutGuide/ShortcutGuideModuleInterface/ShortcutGuideModuleInterface.dll", L"modules/ColorPicker/ColorPicker.dll", - L"modules/Espresso/EspressoModuleInterface.dll", + L"modules/Awake/AwakeModuleInterface.dll", }; for (const auto& moduleSubdir : knownModules) diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoProperties.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeProperties.cs similarity index 61% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoProperties.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeProperties.cs index 8b81deb574..d7e2354c43 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoProperties.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeProperties.cs @@ -6,30 +6,30 @@ using System.Text.Json.Serialization; namespace Microsoft.PowerToys.Settings.UI.Library { - public class EspressoProperties + public class AwakeProperties { - public EspressoProperties() + public AwakeProperties() { KeepDisplayOn = false; - Mode = EspressoMode.PASSIVE; + Mode = AwakeMode.PASSIVE; Hours = 0; Minutes = 0; } - [JsonPropertyName("espresso_keep_display_on")] + [JsonPropertyName("awake_keep_display_on")] public bool KeepDisplayOn { get; set; } - [JsonPropertyName("espresso_mode")] - public EspressoMode Mode { get; set; } + [JsonPropertyName("awake_mode")] + public AwakeMode Mode { get; set; } - [JsonPropertyName("espresso_hours")] + [JsonPropertyName("awake_hours")] public uint Hours { get; set; } - [JsonPropertyName("espresso_minutes")] + [JsonPropertyName("awake_minutes")] public uint Minutes { get; set; } } - public enum EspressoMode + public enum AwakeMode { PASSIVE = 0, INDEFINITE = 1, diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoSettings.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeSettings.cs similarity index 72% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoSettings.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeSettings.cs index a79a433ec5..b14c532ff5 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EspressoSettings.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/AwakeSettings.cs @@ -7,20 +7,20 @@ using Microsoft.PowerToys.Settings.UI.Library.Interfaces; namespace Microsoft.PowerToys.Settings.UI.Library { - public class EspressoSettings : BasePTModuleSettings, ISettingsConfig + public class AwakeSettings : BasePTModuleSettings, ISettingsConfig { - public const string ModuleName = "Espresso"; + public const string ModuleName = "Awake"; public const string ModuleVersion = "0.0.1"; - public EspressoSettings() + public AwakeSettings() { Name = ModuleName; Version = ModuleVersion; - Properties = new EspressoProperties(); + Properties = new AwakeProperties(); } [JsonPropertyName("properties")] - public EspressoProperties Properties { get; set; } + public AwakeProperties Properties { get; set; } public string GetModuleName() { diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs index d1689bee87..05039c6392 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/EnabledModules.cs @@ -143,18 +143,18 @@ namespace Microsoft.PowerToys.Settings.UI.Library } } - private bool espresso; + private bool awake; - [JsonPropertyName("Espresso")] - public bool Espresso + [JsonPropertyName("Awake")] + public bool Awake { - get => espresso; + get => awake; set { - if (espresso != value) + if (awake != value) { LogTelemetryEvent(value); - espresso = value; + awake = value; } } } diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndEspressoSettings.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndAwakeSettings.cs similarity index 62% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndEspressoSettings.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndAwakeSettings.cs index e9ccea662c..57bf6a51cc 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndEspressoSettings.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndAwakeSettings.cs @@ -2,24 +2,21 @@ // 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 System.Collections.Generic; -using System.Text; using System.Text.Json; using System.Text.Json.Serialization; namespace Microsoft.PowerToys.Settings.UI.Library { - public class SndEspressoSettings + public class SndAwakeSettings { - [JsonPropertyName("Espresso")] - public EspressoSettings Settings { get; set; } + [JsonPropertyName("Awake")] + public AwakeSettings Settings { get; set; } - public SndEspressoSettings() + public SndAwakeSettings() { } - public SndEspressoSettings(EspressoSettings settings) + public SndAwakeSettings(AwakeSettings settings) { Settings = settings; } diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/EspressoViewModel.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/AwakeViewModel.cs similarity index 84% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/EspressoViewModel.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/AwakeViewModel.cs index 94dd1db8a8..357631b5ac 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/EspressoViewModel.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/AwakeViewModel.cs @@ -9,15 +9,15 @@ using Microsoft.PowerToys.Settings.UI.Library.Interfaces; namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels { - public class EspressoViewModel : Observable + public class AwakeViewModel : Observable { private GeneralSettings GeneralSettingsConfig { get; set; } - private EspressoSettings Settings { get; set; } + private AwakeSettings Settings { get; set; } private Func SendConfigMSG { get; } - public EspressoViewModel(ISettingsRepository settingsRepository, ISettingsRepository moduleSettingsRepository, Func ipcMSGCallBackFunc) + public AwakeViewModel(ISettingsRepository settingsRepository, ISettingsRepository moduleSettingsRepository, Func ipcMSGCallBackFunc) { // To obtain the general settings configurations of PowerToys Settings. if (settingsRepository == null) @@ -35,7 +35,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels Settings = moduleSettingsRepository.SettingsConfig; - _isEnabled = GeneralSettingsConfig.Enabled.Espresso; + _isEnabled = GeneralSettingsConfig.Enabled.Awake; _keepDisplayOn = Settings.Properties.KeepDisplayOn; _mode = Settings.Properties.Mode; _hours = Settings.Properties.Hours; @@ -54,7 +54,7 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels { _isEnabled = value; - GeneralSettingsConfig.Enabled.Espresso = value; + GeneralSettingsConfig.Enabled.Awake = value; OnPropertyChanged(nameof(IsEnabled)); OnPropertyChanged(nameof(IsTimeConfigurationEnabled)); @@ -67,10 +67,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels public bool IsTimeConfigurationEnabled { - get => _mode == EspressoMode.TIMED && _isEnabled; + get => _mode == AwakeMode.TIMED && _isEnabled; } - public EspressoMode Mode + public AwakeMode Mode { get => _mode; set @@ -140,8 +140,8 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels OnPropertyChanged(propertyName); if (SendConfigMSG != null) { - SndEspressoSettings outsettings = new SndEspressoSettings(Settings); - SndModuleSettings ipcMessage = new SndModuleSettings(outsettings); + SndAwakeSettings outsettings = new SndAwakeSettings(Settings); + SndModuleSettings ipcMessage = new SndModuleSettings(outsettings); var targetMessage = ipcMessage.ToJsonString(); SendConfigMSG(targetMessage); @@ -152,6 +152,6 @@ namespace Microsoft.PowerToys.Settings.UI.Library.ViewModels private uint _hours; private uint _minutes; private bool _keepDisplayOn; - private EspressoMode _mode; + private AwakeMode _mode; } } diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsEspresso.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsAwake.png similarity index 100% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsEspresso.png rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/FluentIcons/FluentIconsAwake.png diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Espresso.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png similarity index 100% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Espresso.png rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/Awake.png diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Espresso.png b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png similarity index 100% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Espresso.png rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Assets/Modules/OOBE/Awake.png diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/EspressoModeToBoolConverter.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs similarity index 71% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/EspressoModeToBoolConverter.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs index 09f237c26f..f9481922ed 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/EspressoModeToBoolConverter.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Converters/AwakeModeToBoolConverter.cs @@ -8,7 +8,7 @@ using Windows.UI.Xaml.Data; namespace Microsoft.PowerToys.Settings.UI.Converters { - public sealed class EspressoModeToBoolConverter : IValueConverter + public sealed class AwakeModeToBoolConverter : IValueConverter { public object Convert(object value, Type targetType, object parameter, string language) { @@ -19,11 +19,11 @@ namespace Microsoft.PowerToys.Settings.UI.Converters if (parameter == null) { - throw new NullReferenceException("Parameter cannot be null for the Espresso mode to bool converter."); + throw new NullReferenceException("Parameter cannot be null for the PowerToys Awake mode to bool converter."); } - var expectedMode = (EspressoMode)Enum.Parse(typeof(EspressoMode), parameter.ToString()); - var currentMode = (EspressoMode)value; + var expectedMode = (AwakeMode)Enum.Parse(typeof(AwakeMode), parameter.ToString()); + var currentMode = (AwakeMode)value; return currentMode.Equals(expectedMode); } @@ -32,10 +32,10 @@ namespace Microsoft.PowerToys.Settings.UI.Converters { if (parameter == null) { - throw new NullReferenceException("Parameter cannot be null for the Espresso mode to bool converter."); + throw new NullReferenceException("Parameter cannot be null for the PowerToys Awake mode to bool converter."); } - return (EspressoMode)Enum.Parse(typeof(EspressoMode), parameter.ToString()); + return (AwakeMode)Enum.Parse(typeof(AwakeMode), parameter.ToString()); } } } 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 ed5163ff5f..650008eb1a 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 @@ -105,7 +105,7 @@ ShortcutVisualControl.xaml - + @@ -126,8 +126,8 @@ - - OobeEspresso.xaml + + OobeAwake.xaml OobeColorPicker.xaml @@ -166,8 +166,8 @@ - - EspressoPage.xaml + + AwakePage.xaml ColorPickerPage.xaml @@ -208,7 +208,7 @@ - + @@ -220,12 +220,12 @@ - + - + @@ -308,7 +308,7 @@ Designer MSBuild:Compile - + MSBuild:Compile Designer @@ -384,7 +384,7 @@ MSBuild:Compile Designer - + MSBuild:Compile Designer @@ -466,4 +466,4 @@ --> - + \ No newline at end of file diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs index 3a5c7aa1b5..8c6bc6fd7a 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Enums/PowerToysModulesEnum.cs @@ -8,7 +8,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Enums { Overview = 0, ColorPicker, - Espresso, + Awake, FancyZones, FileExplorer, ImageResizer, diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeEspresso.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml similarity index 94% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeEspresso.xaml rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml index c6581b629b..782573cd2c 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeEspresso.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeAwake.xaml @@ -1,4 +1,4 @@ - - + - + /// An empty page that can be used on its own or navigated to within a Frame. /// - public sealed partial class OobeEspresso : Page + public sealed partial class OobeAwake : Page { public OobePowerToysModule ViewModel { get; set; } - public OobeEspresso() + public OobeAwake() { - this.InitializeComponent(); - ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModulesEnum.Espresso]); + InitializeComponent(); + ViewModel = new OobePowerToysModule(OobeShellPage.OobeShellHandler.Modules[(int)PowerToysModulesEnum.Awake]); DataContext = ViewModel; } @@ -29,7 +28,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views { if (OobeShellPage.OpenMainWindowCallback != null) { - OobeShellPage.OpenMainWindowCallback(typeof(EspressoPage)); + OobeShellPage.OpenMainWindowCallback(typeof(AwakePage)); } ViewModel.LogOpeningSettingsEvent(); diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs index 170005ac2c..8d02266936 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs @@ -81,17 +81,17 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views Description = loader.GetString("Oobe_ColorPicker_Description"), Link = "https://aka.ms/PowerToysOverview_ColorPicker", }); - Modules.Insert((int)PowerToysModulesEnum.Espresso, new OobePowerToysModule() + Modules.Insert((int)PowerToysModulesEnum.Awake, new OobePowerToysModule() { - ModuleName = loader.GetString("Oobe_Espresso"), - Tag = "Espresso", + ModuleName = loader.GetString("Oobe_Awake"), + Tag = "Awake", IsNew = false, Icon = "\uEC32", - Image = "ms-appx:///Assets/Modules/Espresso.png", - FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsEspresso.png", - PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/Espresso.png", - Description = loader.GetString("Oobe_Espresso_Description"), - Link = "https://aka.ms/PowerToysOverview_Espresso", + Image = "ms-appx:///Assets/Modules/Awake.png", + FluentIcon = "ms-appx:///Assets/FluentIcons/FluentIconsAwake.png", + PreviewImageSource = "ms-appx:///Assets/Modules/OOBE/Awake.png", + Description = loader.GetString("Oobe_Awake_Description"), + Link = "https://aka.ms/PowerToysOverview_Awake", }); Modules.Insert((int)PowerToysModulesEnum.FancyZones, new OobePowerToysModule() { @@ -216,7 +216,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views { case "Overview": NavigationFrame.Navigate(typeof(OobeOverview)); break; case "ColorPicker": NavigationFrame.Navigate(typeof(OobeColorPicker)); break; - case "Espresso": NavigationFrame.Navigate(typeof(OobeEspresso)); break; + case "Awake": NavigationFrame.Navigate(typeof(OobeAwake)); break; case "FancyZones": NavigationFrame.Navigate(typeof(OobeFancyZones)); break; case "Run": NavigationFrame.Navigate(typeof(OobeRun)); break; case "ImageResizer": NavigationFrame.Navigate(typeof(OobeImageResizer)); break; 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 a7b48f8a37..8a6757843a 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 @@ -121,9 +121,9 @@ General Navigation view item name for General - - Espresso - Product name: Navigation view item name for Espresso + + Awake + Product name: Navigation view item name for Awake PowerToys Run @@ -912,8 +912,8 @@ https://aka.ms/PowerToysOverview_ColorPicker URL. Do not loc - - https://aka.ms/PowerToysOverview_Espresso + + https://aka.ms/PowerToysOverview_Awake URL. Do not loc @@ -1209,67 +1209,67 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and PowerToys Settings - - About Espresso + + About Awake - + A convenient way to keep your PC awake on-demand. - - Enable Espresso + + Enable Awake - + Off (Passive) - + 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 - + Mode - + Behavior - + Hours - + Minutes - - Den Delimarsky's Espresso + + Den Delimarsky's Awake - - https://espresso.den.dev + + https://Awake.den.dev URL. Do not loc - - Espresso + + Awake Module name, do not loc - - Espresso 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. + + 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. - - Open {PowerToys Settings} and enable Espresso + + Open {PowerToys Settings} and enable Awake - - You can always change modes quickly by {right-clicking the Espresso icon} in the system tray. + + You can always change modes quickly by {right-clicking the Awake icon} in the system tray. An error occurred trying to update to diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml similarity index 78% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml index 4286bcf757..aff267678d 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml @@ -1,5 +1,5 @@  - + @@ -50,68 +50,70 @@ - + - - - - - + + IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=0}"> - + + x:Uid="Awake_NoKeepAwakeDescription"/> - + IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=1}"> - + + x:Uid="Awake_IndefiniteKeepAwakeDescription"/> - + IsChecked="{x:Bind Path=ViewModel.Mode, Mode=TwoWay, Converter={StaticResource AwakeModeToBoolConverter}, ConverterParameter=2}"> - + + x:Uid="Awake_TemporaryKeepAwakeDescription"/> - - - - @@ -156,15 +158,15 @@ HorizontalAlignment="Left" Margin="{StaticResource SmallTopBottomMargin}" RelativePanel.Below="DescriptionPanel"> - - + + - + @@ -176,11 +178,11 @@ Style="{StaticResource SettingsGroupTitleStyle}" /> - + - \ No newline at end of file + diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml.cs similarity index 60% rename from src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml.cs rename to src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml.cs index 5a47c6165b..54e6abe5fa 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml.cs +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/AwakePage.xaml.cs @@ -8,14 +8,14 @@ using Windows.UI.Xaml.Controls; namespace Microsoft.PowerToys.Settings.UI.Views { - public sealed partial class EspressoPage : Page + public sealed partial class AwakePage : Page { - private EspressoViewModel ViewModel { get; set; } + private AwakeViewModel ViewModel { get; set; } - public EspressoPage() + public AwakePage() { var settingsUtils = new SettingsUtils(); - ViewModel = new EspressoViewModel(SettingsRepository.GetInstance(settingsUtils), SettingsRepository.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage); + ViewModel = new AwakeViewModel(SettingsRepository.GetInstance(settingsUtils), SettingsRepository.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage); DataContext = ViewModel; InitializeComponent(); } diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml index 46cd11f4db..1c414e9991 100644 --- a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml +++ b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/ShellPage.xaml @@ -42,7 +42,7 @@ - + diff --git a/tools/BugReportTool/BugReportTool/EventViewer.cpp b/tools/BugReportTool/BugReportTool/EventViewer.cpp index 878f0296f4..5b35224234 100644 --- a/tools/BugReportTool/BugReportTool/EventViewer.cpp +++ b/tools/BugReportTool/BugReportTool/EventViewer.cpp @@ -16,7 +16,7 @@ namespace { L"PowerToys.exe", L"ColorPickerUI.exe", - L"PowerToys.Espresso.exe" + L"PowerToys.Awake.exe" L"FancyZonesEditor.exe", L"PowerToys.KeyboardManagerEngine.exe", L"PowerToys.KeyboardManagerEditor.exe",