From c4f39c0773fc70c5ac1fbf483f14c8f9442e43f4 Mon Sep 17 00:00:00 2001
From: Alekhya <reddykalekhya@gmail.com>
Date: Wed, 22 Jan 2020 10:24:00 -0800
Subject: [PATCH] Localize C++ Projects of FancyZones (#1130)

* localized dllmain.cpp  of fancyzones project

* localized FancyZones.cpp

* format fancyzones.rc file

* Moved SuperFancyZones back to being a string instead of having it in the resource file as it is the window class name

* reverted changes for window name

* Formatted fancyzones rc file
---
 src/modules/fancyzones/dll/dllmain.cpp   |   5 +++-
 src/modules/fancyzones/lib/fancyzones.rc | Bin 5520 -> 6224 bytes
 src/modules/fancyzones/lib/resource.h    |  33 ++++++++++++-----------
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/modules/fancyzones/dll/dllmain.cpp b/src/modules/fancyzones/dll/dllmain.cpp
index 879ab5fbb7c..cf62122f975 100644
--- a/src/modules/fancyzones/dll/dllmain.cpp
+++ b/src/modules/fancyzones/dll/dllmain.cpp
@@ -7,6 +7,7 @@
 #include <lib/ZoneSet.h>
 #include <lib/RegistryHelpers.h>
 
+#include <lib/resource.h>
 #include <lib/trace.h>
 #include <lib/Settings.h>
 #include <lib/FancyZones.h>
@@ -108,7 +109,7 @@ class FancyZonesModule : public PowertoyModuleIface
     // Return the display name of the powertoy, this will be cached
     virtual PCWSTR get_name() override
     {
-        return L"FancyZones";
+        return app_name.c_str();
     }
 
     // Return array of the names of all events that this powertoy listens for, with
@@ -197,6 +198,7 @@ class FancyZonesModule : public PowertoyModuleIface
 
     FancyZonesModule()
     {
+        app_name = GET_RESOURCE_STRING(IDS_FANCYZONES);
         m_settings = MakeFancyZonesSettings(reinterpret_cast<HINSTANCE>(&__ImageBase), FancyZonesModule::get_name());
     }
 
@@ -257,6 +259,7 @@ class FancyZonesModule : public PowertoyModuleIface
     HANDLE m_movedWindow = nullptr;
     winrt::com_ptr<IFancyZones> m_app;
     winrt::com_ptr<IFancyZonesSettings> m_settings;
+    std::wstring app_name;
 };
 
 intptr_t FancyZonesModule::HandleKeyboardHookEvent(LowlevelKeyboardEvent* data) noexcept
diff --git a/src/modules/fancyzones/lib/fancyzones.rc b/src/modules/fancyzones/lib/fancyzones.rc
index f021414f3a526f04c34217ea2442ea8a35e9a783..18a17805c45f81164b403fdd8fe4225493037817 100644
GIT binary patch
delta 316
zcmbQBeZgQu0OMpAVX?^p!dz&WV{!oFJ~TOw&3sIJ5DfxCESqJRnLr$&$#N_oK=ful
zRy{^Wg~`$^@|z>rI6!hDlM~o4z)dOPQ`j89aS39A64y4k1kCztToo8%e%uAfVw?AI
zYd{QuXyTasjAtH_0*=Woydc-0`U&XV$t8RiK*xP#6BTx2aAfdfaAt^Ph+^;uvRoO0
eCp!vDqJ;o*h_EsGOx`aj&aA|suz5A#Q#Jt2Q&a!|

delta 86
zcmca$FhP4m0ORCojQcjXG4U~OUdPPDIQbCEhs{S=^*{`n%|h%PjFa^^E=-;xps?AF
q^Ah7^HSTSbg?P#)@8K!f9LB4`IC&Z0yvaHIAAl+>Hs=UFVFLh8wI65z

diff --git a/src/modules/fancyzones/lib/resource.h b/src/modules/fancyzones/lib/resource.h
index 158b68a3e04..8f29794f50b 100644
--- a/src/modules/fancyzones/lib/resource.h
+++ b/src/modules/fancyzones/lib/resource.h
@@ -1,16 +1,17 @@
-#define IDS_SETTING_DESCRIPTION_SHIFTDRAG 101
-#define IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS 102
-#define IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS 103
-#define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS 104
-#define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES 105
-#define IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS 106
-#define IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR 107
-#define IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS 108
-#define IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN 109
-#define IDS_SETTING_DESCRIPTION 110
-#define IDS_SETTING_LAUNCH_EDITOR_LABEL 111
-#define IDS_SETTING_LAUNCH_EDITOR_BUTTON 112
-#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION 113
-#define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL 114
-#define IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION 115
-#define IDS_SETTINGS_HIGHLIGHT_OPACITY 116
+#define IDS_SETTING_DESCRIPTION_SHIFTDRAG                           101
+#define IDS_SETTING_DESCRIPTION_OVERRIDE_SNAP_HOTKEYS               102
+#define IDS_SETTING_DESCRIPTION_DISPLAYCHANGE_MOVEWINDOWS           103
+#define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_MOVEWINDOWS           104
+#define IDS_SETTING_DESCRIPTION_ZONESETCHANGE_FLASHZONES            105
+#define IDS_SETTING_DESCRIPTION_VIRTUALDESKTOPCHANGE_MOVEWINDOWS    106
+#define IDS_SETTING_DESCRIPTION_ZONEHIGHLIGHTCOLOR                  107
+#define IDS_SETTING_DESCRIPTION_APPLASTZONE_MOVEWINDOWS             108
+#define IDS_SETTING_DESCRIPTION_USE_CURSORPOS_EDITOR_STARTUPSCREEN  109
+#define IDS_SETTING_DESCRIPTION                                     110
+#define IDS_SETTING_LAUNCH_EDITOR_LABEL                             111
+#define IDS_SETTING_LAUNCH_EDITOR_BUTTON                            112
+#define IDS_SETTING_LAUNCH_EDITOR_DESCRIPTION                       113
+#define IDS_SETTING_LAUNCH_EDITOR_HOTKEY_LABEL                      114
+#define IDS_SETTING_EXCLCUDED_APPS_DESCRIPTION                      115
+#define IDS_SETTINGS_HIGHLIGHT_OPACITY                              116
+#define IDS_FANCYZONES                                              117