fix for event filters dialog

6 files changed, 31 insertions, 17 deletions

diff --git a/include/m_skin.h b/include/m_skin.h
index b7dc942ca8..19a9cc4436 100644
--- a/include/m_skin.h
+++ b/include/m_skin.h
@@ -90,6 +90,7 @@
 #define SKINICON_OTHER_POPUP         248

 #define SKINICON_OTHER_NOPOPUP       249

 #define SKINICON_OTHER_KEYS          250

+#define SKINICON_OTHER_SOUND         251

 

 /////////////////////////////////////////////////////////////////////////////////////////

 // Miranda skin

diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index e5a18d8fae..ca1294b5ca 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -798,10 +798,10 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     GROUPBOX        "Default settings for known event types",IDC_STATIC,7,5,293,153

     LTEXT           "Show when filter is active",IDC_STATIC,12,16,119,8,SS_CENTERIMAGE

-    CTEXT           "Log to file",IDC_STATIC,260,16,37,8,SS_CENTERIMAGE

-    CTEXT           "Popup",IDC_STATIC,142,16,31,8,SS_CENTERIMAGE

-    CTEXT           "Tray",IDC_STATIC,181,16,31,8,SS_CENTERIMAGE

-    CTEXT           "Sound",IDC_STATIC,221,16,31,8,SS_CENTERIMAGE

+    CONTROL         "Popup",IDC_ICON1,"MButtonClass",WS_TABSTOP,150,13,16,16,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Tray",IDC_ICON2,"MButtonClass",WS_TABSTOP,190,13,16,16,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Sound",IDC_ICON3,"MButtonClass",WS_TABSTOP,230,13,16,16,WS_EX_NOACTIVATE | 0x10000000L

+    CONTROL         "Log to file",IDC_ICON4,"MButtonClass",WS_TABSTOP,270,13,16,16,WS_EX_NOACTIVATE | 0x10000000L

     CONTROL         "Actions",IDC_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,28,120,10

     CONTROL         "Messages",IDC_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,38,120,10

     CONTROL         "Nick changes",IDC_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,48,120,10

@@ -849,17 +849,17 @@ BEGIN
     CONTROL         "",IDC_S10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,118,21,10

     CONTROL         "",IDC_S11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,128,21,10

     CONTROL         "",IDC_S12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,233,138,21,10

-    CONTROL         "",IDC_L1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,28,21,10

-    CONTROL         "",IDC_L2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,38,21,10

-    CONTROL         "",IDC_L3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,48,21,10

-    CONTROL         "",IDC_L4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,58,21,10

-    CONTROL         "",IDC_L5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,68,21,10

-    CONTROL         "",IDC_L6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,78,21,10

-    CONTROL         "",IDC_L7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,88,21,10

-    CONTROL         "",IDC_L8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,98,21,10

-    CONTROL         "",IDC_L9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,108,21,10

-    CONTROL         "",IDC_L10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,118,21,10

-    CONTROL         "",IDC_L11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,274,128,21,10

+    CONTROL         "",IDC_L1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,28,21,10

+    CONTROL         "",IDC_L2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,38,21,10

+    CONTROL         "",IDC_L3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,48,21,10

+    CONTROL         "",IDC_L4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,58,21,10

+    CONTROL         "",IDC_L5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,68,21,10

+    CONTROL         "",IDC_L6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,78,21,10

+    CONTROL         "",IDC_L7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,88,21,10

+    CONTROL         "",IDC_L8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,98,21,10

+    CONTROL         "",IDC_L9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,108,21,10

+    CONTROL         "",IDC_L10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,118,21,10

+    CONTROL         "",IDC_L11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,128,21,10

     CONTROL         "Show icons in tray only when the chat room is not active",IDC_TRAYONLYFORINACTIVE,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,164,279,8

     LTEXT           "Highlight event",IDC_STATIC,42,139,100,12

@@ -1319,6 +1319,7 @@ IDI_NOPOPUP             ICON                    "icon_popup_no.ico"
 

 IDI_PASSWORD            ICON                    "icon_password.ico"

 

+IDI_SOUND               ICON                    "sound.ico"

 

 /////////////////////////////////////////////////////////////////////////////

 //

diff --git a/src/mir_app/res/sound.ico b/src/mir_app/res/sound.ico
new file mode 100644
index 0000000000..da7a3a639e
--- /dev/null
+++ b/src/mir_app/res/sound.ico
diff --git a/src/mir_app/src/chat_ui.cpp b/src/mir_app/src/chat_ui.cpp
index db2fbeaeee..21e3cc66db 100644
--- a/src/mir_app/src/chat_ui.cpp
+++ b/src/mir_app/src/chat_ui.cpp
@@ -51,12 +51,17 @@ static UINT _eventorder[] =
 class CChatEventOptionDlg : public CDlgBase
 {
 	CCtrlCheck chkTray, chkPopup;
+	CCtrlMButton btn1, btn2, btn3, btn4;
 
 public:
 	CChatEventOptionDlg() :
 		CDlgBase(g_plugin, IDD_OPT_CHAT_EVENTS),
 		chkTray(this, IDC_TRAYONLYFORINACTIVE),
-		chkPopup(this, IDC_POPUPONLYFORINACTIVE)
+		chkPopup(this, IDC_POPUPONLYFORINACTIVE),
+		btn1(this, IDC_ICON1, SKINICON_OTHER_POPUP, LPGEN("Popup")),
+		btn2(this, IDC_ICON2, SKINICON_OTHER_MIRANDA, LPGEN("Tray")),
+		btn3(this, IDC_ICON3, SKINICON_OTHER_SOUND, LPGEN("Sound")),
+		btn4(this, IDC_ICON4, SKINICON_EVENT_FILE, LPGEN("Log to file"))
 	{
 		CreateLink(chkTray, g_bChatTrayInactive);
 		CreateLink(chkPopup, g_bChatPopupInactive);
@@ -64,6 +69,8 @@ public:
 
 	bool OnInitDialog() override
 	{
+		btn1.MakeFlat(); btn2.MakeFlat(); btn3.MakeFlat(); btn4.MakeFlat();
+
 		DWORD dwFilterFlags = db_get_dw(0, CHAT_MODULE, "FilterFlags", GC_EVENT_ALL);
 		DWORD dwTrayFlags = db_get_dw(0, CHAT_MODULE, "TrayIconFlags", GC_EVENT_HIGHLIGHT);
 		DWORD dwPopupFlags = db_get_dw(0, CHAT_MODULE, "PopupFlags", GC_EVENT_HIGHLIGHT);
diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 491cacf3d6..0975ff16fa 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -28,6 +28,7 @@
 #define IDD_OPT_CLIST                   119

 #define IDD_OPT_CHAT_EVENTS             120

 #define IDD_AUTHREQ                     121

+#define IDI_SOUND                       122

 #define IDD_DETAILS                     125

 #define IDD_HISTORY                     127

 #define IDI_AWAY                        128

@@ -280,6 +281,10 @@
 #define IDC_GENMENU_CUSTOMNAME          1086

 #define IDC_GENMENU_SET                 1087

 #define IDC_GENMENU_DEFAULT             1089

+#define IDC_ICON1                       1090

+#define IDC_ICON2                       1091

+#define IDC_ICON3                       1092

+#define IDC_ICON4                       1093

 #define IDC_CANVAS                      1094

 #define IDC_CANVAS2                     1095

 #define IDC_TXT_MULTILINE               1096

diff --git a/src/mir_app/src/skinicons.cpp b/src/mir_app/src/skinicons.cpp
index fee4e24838..4e22302464 100644
--- a/src/mir_app/src/skinicons.cpp
+++ b/src/mir_app/src/skinicons.cpp
@@ -83,7 +83,7 @@ static struct StandardIconDescription mainIcons[] =
 	{ SKINICON_OTHER_ON,              LPGEN("On"),                    -IDI_ON,             0, nullptr }, // 42

 	{ SKINICON_OTHER_OFF,             LPGEN("Off"),                   -IDI_OFF,            0, nullptr }, // 43

 	{ SKINICON_OTHER_KEYS,            LPGEN("Password"),              -IDI_PASSWORD,       0, nullptr }, // 44

-	{ -1,                             LPGEN("Unused"),                0,                   0, nullptr }, // 45

+	{ SKINICON_OTHER_SOUND,           LPGEN("Sound"),                 -IDI_SOUND,          0, nullptr }, // 45

 	{ SKINICON_OTHER_FRAME,           LPGEN("Frames"),                -IDI_FRAME,          0, nullptr }, // 46

 	{ SKINICON_OTHER_GROUPADD,        LPGEN("Add group"),             -IDI_ADDGROUP,       0, nullptr }, // 47

 	{ SKINICON_AUTH_ADD,              LPGEN("Add to list"),           -IDI_AUTH_ADD,       0, nullptr }, // 48