From 2afa653effca20da422b48ca31e081e0853c0f56 Mon Sep 17 00:00:00 2001
From: Den Delimarsky <1389609+dend@users.noreply.github.com>
Date: Wed, 7 Apr 2021 20:58:53 -0700
Subject: [PATCH] Latest round of changes Now that I figured out why the
 settings were not propagated, I started working on integrating the proper
 modules in the stack.

---
 src/runner/main.cpp                           |  3 +-
 .../Microsoft.PowerToys.Settings.UI.csproj    |  2 +-
 .../Strings/en-us/Resources.resw              | 33 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/runner/main.cpp b/src/runner/main.cpp
index 89843c420b..cf9245c239 100644
--- a/src/runner/main.cpp
+++ b/src/runner/main.cpp
@@ -148,7 +148,7 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe)
         chdir_current_executable();
         // Load Powertoys DLLs
 
-        const std::array<std::wstring_view, 8> knownModules = {
+        const std::array<std::wstring_view, 9> knownModules = {
             L"modules/FancyZones/fancyzones.dll",
             L"modules/FileExplorerPreview/powerpreview.dll",
             L"modules/ImageResizer/ImageResizerExt.dll",
@@ -157,6 +157,7 @@ int runner(bool isProcessElevated, bool openSettings, bool openOobe)
             L"modules/PowerRename/PowerRenameExt.dll",
             L"modules/ShortcutGuide/ShortcutGuide.dll",
             L"modules/ColorPicker/ColorPicker.dll",
+            L"modules/Espresso/Espresso.dll",
         };
 
         for (const auto& moduleSubdir : knownModules)
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 c0112d522d..34d706754a 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
@@ -278,7 +278,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PRIResource Include="Strings\*\Resources.resw" />
+    <PRIResource Include="Strings\en-us\Resources.resw" />
   </ItemGroup>
   <ItemGroup>
     <Page Include="Controls\HotkeySettingsControl.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 4cf8e2c668..e0bfadc2b2 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
@@ -1166,6 +1166,37 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
   <data name="SettingsWindow_Title" xml:space="preserve">
     <value>PowerToys Settings</value>
   </data>
-
+  <data name="About_Espresso.Text" xml:space="preserve">
+    <value>About Espresso</value>
+  </data>
+  <data name="Espresso_Description.Text" xml:space="preserve">
+    <value>A convenient way to keep your computer awake on-demand.</value>
+  </data>
+  <data name="Espresso_EnableEspresso.Header" xml:space="preserve">
+    <value>Enable Espresso</value>
+  </data>
+  <data name="Espresso_IndefiniteKeepAwakeContent.Text" xml:space="preserve">
+    <value>Keep awake indefinitely</value>
+  </data>
+  <data name="Espresso_TemporaryKeepAwakeContent.Text" xml:space="preserve">
+    <value>Keep awake temporarily</value>
+  </data>
+  <data name="Espresso_IndefiniteKeepAwakeDescription.Text" xml:space="preserve">
+    <value>Keeps the computer awake until the setting is disabled.</value>
+  </data>
+  <data name="Espresso_TemporaryKeepAwakeDescription.Text" xml:space="preserve">
+    <value>Keeps the computer awake until the set time elapses.</value>
+  </data>
+  <data name="Espresso_EnableDisplayKeepAwake.Header" xml:space="preserve">
+    <value>Keep display on</value>
+  </data>
+  <data name="Espresso_Behavior_GroupSettings.Text" xml:space="preserve">
+    <value>Behavior</value>
+  </data>
+  <data name="Espresso_TemporaryKeepAwake_Hours.Header" xml:space="preserve">
+    <value>Hours</value>
+  </data>
+  <data name="Espresso_TemporaryKeepAwake_Minutes.Header" xml:space="preserve">
+    <value>Minutes</value>
   </data>
 </root>