From 4dfac020650989c598bf4eb529bfe5e136047889 Mon Sep 17 00:00:00 2001
From: Tomas Agustin Raies <tomas.raies@gmail.com>
Date: Mon, 11 May 2020 20:13:07 -0700
Subject: [PATCH] KeyboardManager icon (#2875)

---
 src/modules/keyboardmanager/dll/Keyboard.ico     | Bin 0 -> 9662 bytes
 .../keyboardmanager/dll/KeyboardManager.rc       |   1 +
 .../keyboardmanager/dll/KeyboardManager.vcxproj  |   3 +++
 src/modules/keyboardmanager/dll/resource.h       |   1 +
 .../keyboardmanager/ui/EditKeyboardWindow.cpp    |   9 ++++++++-
 .../keyboardmanager/ui/EditShortcutsWindow.cpp   |   9 ++++++++-
 6 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/keyboardmanager/dll/Keyboard.ico

diff --git a/src/modules/keyboardmanager/dll/Keyboard.ico b/src/modules/keyboardmanager/dll/Keyboard.ico
new file mode 100644
index 0000000000000000000000000000000000000000..cc9c2753ee1449b2c3bd8f04d2e10c75c9d6da5c
GIT binary patch
literal 9662
zcmeHKu}T9`5ZoZfMocF*LJCF8v$yjP1O<^`A{P1=X|%Ud(P&O=)E}@F(&Q`r1xq{Q
z>>V#ImmADsH1FW8%<bN|_cCw1TQ4FN{6vx9SeM6Dkwp<%2S7;^P(Fzjk={azlnBS*
zKyV;95F7{&1P6ixzj9y$S2ux{r)WS|9mtC_ke|T7bG$>}4q#&oC%)^p`aYm{*=*q4
z=<lPx0d74*2YTKBw~u|)F78n{e$SB}<}0J~$mqK>{Gs7}E16ElZ(;*^vk2dihQWIB
zuFG=ctYdqaPR2h&rMs_eJ|3zUc_KZwpVi~6b7DS=>12G__3Pg|2J9@-bG>I=Xipcg
zJ>%3duK8&lUDx(7pBazKy$Yt2@m`6C7^ai)Y_`~$V0$LT+c{;|WI7pN^!a7;q$qFa
z)ql>PqB>dsr1Te=KQZo4J1g8=D$3j073L32^(feL%J{#SEq0z1U7zV>yq!OG4or(@
zIvGDLo$Pa&PR6_Wlbr+8;+amyd-UigQkc#dzjgmJc6}3V^jsR9_WNVU@DHf<{_qif
zqqBk9#Q_TEe_8UH6OUX4UP`owQ={FLvncd^>Kf4J#J-34P<Nr}0@wyZ1P6ix!GYjF
zaG>-K43fYL(1i1=I#UyAYo5~sVkS+RYx;S;?>t|XN*m`akM=LM(*FEB(jWEaBVC{5
SY=2g7a*lnpwZOh6<<}RLRsksh

literal 0
HcmV?d00001

diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.rc b/src/modules/keyboardmanager/dll/KeyboardManager.rc
index 468391622c..3713d392d1 100644
--- a/src/modules/keyboardmanager/dll/KeyboardManager.rc
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.rc
@@ -9,6 +9,7 @@ BEGIN
     IDS_KEYBOARDMANAGER                                         L"Keyboard Manager" 
 END
 
+IDS_KEYBOARDMANAGER_ICON    ICON    L"Keyboard.ico"
 
 1 VERSIONINFO
  FILEVERSION 0,1,0,0
diff --git a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
index b307667d50..2983cf7199 100644
--- a/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
+++ b/src/modules/keyboardmanager/dll/KeyboardManager.vcxproj
@@ -132,6 +132,9 @@
   <ItemGroup>
     <ResourceCompile Include="KeyboardManager.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <Image Include="Keyboard.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/modules/keyboardmanager/dll/resource.h b/src/modules/keyboardmanager/dll/resource.h
index 6fc1962b38..9052e0d098 100644
--- a/src/modules/keyboardmanager/dll/resource.h
+++ b/src/modules/keyboardmanager/dll/resource.h
@@ -1,2 +1,3 @@
 #define IDS_SETTINGS_DESCRIPTION 101
 #define IDS_KEYBOARDMANAGER 102
+#define IDS_KEYBOARDMANAGER_ICON    103
diff --git a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
index c53ef0cb73..ca9a573e3e 100644
--- a/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
+++ b/src/modules/keyboardmanager/ui/EditKeyboardWindow.cpp
@@ -9,6 +9,7 @@
 #include <common/windows_colors.h>
 #include "Styles.h"
 #include "Dialog.h"
+#include <keyboardmanager/dll/resource.h>
 
 using namespace winrt::Windows::Foundation;
 
@@ -145,7 +146,13 @@ void createEditKeyboardWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMan
         windowClass.hInstance = hInst;
         windowClass.lpszClassName = szWindowClass;
         windowClass.hbrBackground = (HBRUSH)(COLOR_WINDOW);
-        windowClass.hIconSm = LoadIcon(windowClass.hInstance, IDI_APPLICATION);
+        windowClass.hIcon = (HICON) LoadImageW(
+            windowClass.hInstance, 
+            MAKEINTRESOURCE(IDS_KEYBOARDMANAGER_ICON), 
+            IMAGE_ICON, 
+            48, 
+            48, 
+            LR_DEFAULTCOLOR);
         if (RegisterClassEx(&windowClass) == NULL)
         {
             MessageBox(NULL, L"Windows registration failed!", L"Error", NULL);
diff --git a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
index 921c588a7e..7afa56617d 100644
--- a/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
+++ b/src/modules/keyboardmanager/ui/EditShortcutsWindow.cpp
@@ -8,6 +8,7 @@
 #include <common/windows_colors.h>
 #include "Styles.h"
 #include "Dialog.h"
+#include <keyboardmanager/dll/resource.h>
 
 using namespace winrt::Windows::Foundation;
 
@@ -57,7 +58,13 @@ void createEditShortcutsWindow(HINSTANCE hInst, KeyboardManagerState& keyboardMa
         windowClass.hInstance = hInst;
         windowClass.lpszClassName = szWindowClass;
         windowClass.hbrBackground = (HBRUSH)(COLOR_WINDOW);
-        windowClass.hIconSm = LoadIcon(windowClass.hInstance, IDI_APPLICATION);
+        windowClass.hIcon = (HICON)LoadImageW(
+            windowClass.hInstance,
+            MAKEINTRESOURCE(IDS_KEYBOARDMANAGER_ICON), 
+            IMAGE_ICON, 
+            48, 
+            48, 
+            LR_DEFAULTCOLOR);
         if (RegisterClassEx(&windowClass) == NULL)
         {
             MessageBox(NULL, L"Windows registration failed!", L"Error", NULL);