From 9c743acd2d88a0832bd6602fd2fd4c0c7625ae49 Mon Sep 17 00:00:00 2001
From: Alekhya Kommuru <alkommur@microsoft.com>
Date: Mon, 20 Jan 2020 11:52:46 -0800
Subject: [PATCH] Removed some IDs from resource file. Changed SHIFT to Shift

---
 src/modules/powerrename/dll/PowerRenameExt.rc | Bin 8006 -> 6596 bytes
 src/modules/powerrename/dll/dllmain.cpp       |  22 +++++++++---------
 src/modules/powerrename/dll/resource.h        |  18 +++++---------
 3 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/src/modules/powerrename/dll/PowerRenameExt.rc b/src/modules/powerrename/dll/PowerRenameExt.rc
index e85b27e058f34d44774b133835ad3c4ca4892e2e..57c3116be9f2b1f5caff1f655a64db57d410ae87 100644
GIT binary patch
delta 44
zcmV+{0Mq}*KEyMy;1QEV63mlo6U38(6!4SC708q97LJoR8<q!X0BHbb0Ccm}8*u~B
C^Ag_x

delta 758
zcmX?Ne9Ugc1HsA11cY=w8JrpX8T=R&(4Y^45<>w)34<<>%x5TPNM$Hu(4E{aq&oS5
z;2B3JpdNn)ABK2_00vivAckNDPaqBfngP<61k{nwkOP!00P8De$Ydx6niUVE^MGQd
z3?-B8MI<M$5jtY+3)CG7lyL>R!I8lUsNa>r1;d<NpzWnVRjEMzi9qvnfUFd-83n>0
zjA3SgToDD-4{-&^E|8tMKphoe8e#^>HC2-*3Q13n5V_zS%-{j^NjOj*5fZ3=C}zk2
zhXBa+$v{>fP%VVa1-qwoGQa3@Q*@srbfp4qF9EAe0l6CN5|BSi8I&ep<QAX&fSY3!
jQyd0tlMjh@v3mex(TyQwa<G`@<Q~xjF#hIXu|j45AvM^7

diff --git a/src/modules/powerrename/dll/dllmain.cpp b/src/modules/powerrename/dll/dllmain.cpp
index 0bfa4459af..14f37fd56e 100644
--- a/src/modules/powerrename/dll/dllmain.cpp
+++ b/src/modules/powerrename/dll/dllmain.cpp
@@ -206,23 +206,23 @@ public:
         // Create a Settings object.
         PowerToysSettings::Settings settings(hinstance, get_name());
         settings.set_description(GET_RESOURCE_STRING(IDS_SETTINGS_DESCRIPTION));
-        settings.set_icon_key(GET_RESOURCE_STRING(IDS_SETTINGS_ICON));
+        settings.set_icon_key(L"pt-power-rename");
 
         // Link to the GitHub PowerRename sub-page
         settings.set_overview_link(GET_RESOURCE_STRING(IDS_OVERVIEW_LINK));
 
         settings.add_bool_toogle(
-            GET_RESOURCE_STRING(IDS_BOOL_PERSIST),
+            L"bool_persist_input",
             GET_RESOURCE_STRING(IDS_RESTORE_SEARCH),
             CSettings::GetPersistState());
 
         settings.add_bool_toogle(
-            GET_RESOURCE_STRING(IDS_MRU_ENABLED),
+            L"bool_mru_enabled",
             GET_RESOURCE_STRING(IDS_ENABLE_AUTO),
             CSettings::GetMRUEnabled());
 
         settings.add_int_spinner(
-            GET_RESOURCE_STRING(IDS_MAX_MRU_SIZE),
+            L"int_max_mru_size",
             GET_RESOURCE_STRING(IDS_MAX_ITEMS),
             CSettings::GetMaxMRUSize(),
             0,
@@ -230,12 +230,12 @@ public:
             1);
 
         settings.add_bool_toogle(
-            GET_RESOURCE_STRING(IDS_SHOW_ICON),
+            L"bool_show_icon_on_menu",
             GET_RESOURCE_STRING(IDS_ICON_CONTEXT_MENU),
             CSettings::GetShowIconOnMenu());
 
         settings.add_bool_toogle(
-            GET_RESOURCE_STRING(IDS_EXTENDED_MENU),
+            L"bool_show_extended_menu",
             GET_RESOURCE_STRING(IDS_EXTENDED_MENU_INFO),
             CSettings::GetExtendedContextMenuOnly());
 
@@ -252,11 +252,11 @@ public:
             PowerToysSettings::PowerToyValues values =
                 PowerToysSettings::PowerToyValues::from_json_string(config);
 
-            CSettings::SetPersistState(values.get_bool_value(GET_RESOURCE_STRING(IDS_BOOL_PERSIST)).value());
-            CSettings::SetMRUEnabled(values.get_bool_value(GET_RESOURCE_STRING(IDS_MRU_ENABLED)).value());
-            CSettings::SetMaxMRUSize(values.get_int_value(GET_RESOURCE_STRING(IDS_MAX_MRU_SIZE)).value());
-            CSettings::SetShowIconOnMenu(values.get_bool_value(GET_RESOURCE_STRING(IDS_SHOW_ICON)).value());
-            CSettings::SetExtendedContextMenuOnly(values.get_bool_value(GET_RESOURCE_STRING(IDS_EXTENDED_MENU)).value());
+            CSettings::SetPersistState(values.get_bool_value(L"bool_persist_input").value());
+            CSettings::SetMRUEnabled(values.get_bool_value(L"bool_mru_enabled").value());
+            CSettings::SetMaxMRUSize(values.get_int_value(L"int_max_mru_size").value());
+            CSettings::SetShowIconOnMenu(values.get_bool_value(L"bool_show_icon_on_menu").value());
+            CSettings::SetExtendedContextMenuOnly(values.get_bool_value(L"bool_show_extended_menu").value());
         }
         catch (std::exception)
         {
diff --git a/src/modules/powerrename/dll/resource.h b/src/modules/powerrename/dll/resource.h
index 6d2c78ffb3..cf00d79cce 100644
--- a/src/modules/powerrename/dll/resource.h
+++ b/src/modules/powerrename/dll/resource.h
@@ -1,18 +1,12 @@
 #define IDS_POWERRENAME                 801
 #define IDI_RENAME                      132
 #define IDS_SETTINGS_DESCRIPTION        2101
-#define IDS_SETTINGS_ICON               2102
-#define IDS_OVERVIEW_LINK               2103
-#define IDS_BOOL_PERSIST                2104
-#define IDS_RESTORE_SEARCH              2105
-#define IDS_MRU_ENABLED                 2106
-#define IDS_ENABLE_AUTO                 2107
-#define IDS_MAX_MRU_SIZE                2108   
-#define IDS_MAX_ITEMS                   2109
-#define IDS_SHOW_ICON                   2110
-#define IDS_ICON_CONTEXT_MENU           2111
-#define IDS_EXTENDED_MENU               2112
-#define IDS_EXTENDED_MENU_INFO          2113
+#define IDS_OVERVIEW_LINK               2102
+#define IDS_RESTORE_SEARCH              2103
+#define IDS_ENABLE_AUTO                 2104
+#define IDS_MAX_ITEMS                   2105
+#define IDS_ICON_CONTEXT_MENU           2106
+#define IDS_EXTENDED_MENU_INFO          2107
 
 // Next default values for new objects