fixes #2501 (Ability to disable incoming sounds in chats is lost)

1 files changed, 33 insertions, 82 deletions

diff --git a/plugins/TabSRMM/res/chat.rc b/plugins/TabSRMM/res/chat.rc
index 35c5f8db20..4c78a06712 100644
--- a/plugins/TabSRMM/res/chat.rc
+++ b/plugins/TabSRMM/res/chat.rc
@@ -1,16 +1,13 @@
 // Microsoft Visual C++ generated resource script.

 //

-#include "..\src\chat_resource.h"

 #include "..\src\resource.h"

-#include "..\..\include\chat_resource.h"

 

 #define APSTUDIO_READONLY_SYMBOLS

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

 //

 // Generated from the TEXTINCLUDE 2 resource.

 //

-#include "winres.h"

-#include "richedit.h"

+#include <winres.h>

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

 #undef APSTUDIO_READONLY_SYMBOLS

 

@@ -19,7 +16,7 @@
 

 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)

 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL

-#pragma code_page(1252)

+#pragma code_page(1251)

 

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

 //

@@ -32,8 +29,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN

     CONTROL         "",IDC_SPLITTERX,"Static",SS_ENHMETAFILE,172,23,10,73

     CONTROL         "",IDC_SPLITTERY,"Static",SS_ENHMETAFILE,0,132,251,6

-    CONTROL         "",IDC_SRMM_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_WANTRETURN,0,128,127,12,WS_EX_STATICEDGE

-    CONTROL         "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | ES_MULTILINE | ES_AUTOVSCROLL | ES_NOHIDESEL | ES_READONLY,8,23,164,72,WS_EX_STATICEDGE

+    CONTROL         "",IDC_SRMM_MESSAGE,"RichEdit50W",WS_VSCROLL | WS_TABSTOP | 0x1144,0,128,127,12,WS_EX_STATICEDGE

+    CONTROL         "",IDC_SRMM_LOG,"RichEdit50W",WS_VSCROLL | 0x944,8,23,164,72,WS_EX_STATICEDGE

     LISTBOX         IDC_SRMM_NICKLIST,182,23,69,73,LBS_MULTIPLESEL | LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NODATA | NOT WS_BORDER | WS_VSCROLL | WS_TABSTOP,WS_EX_STATICEDGE

     CONTROL         "",IDC_PANELSPLITTER,"Static",SS_ENHMETAFILE,0,32,252,1,WS_EX_TRANSPARENT

 END

@@ -92,7 +89,7 @@ BEGIN
     EDITTEXT        IDC_GROUP,152,208,142,14,ES_AUTOHSCROLL

 END

 

-IDD_OPTIONS2 DIALOGEX 0, 0, 306, 189

+IDD_OPTIONS2 DIALOGEX 0, 0, 306, 209

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 0, 0, 0x1

@@ -115,75 +112,14 @@ BEGIN
     LTEXT           "Timestamp (logfile)",IDC_STATIC,205,111,81,8

     EDITTEXT        IDC_LOGTIMESTAMP,205,121,81,14,ES_AUTOHSCROLL

     LTEXT           "Maximum number of events in the message window",IDC_STATIC,10,142,225,11

-    EDITTEXT        IDC_LOGLIMIT,248,139,38,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "Spin1",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,281,138,11,14

-    LTEXT           "Group chat nick list row height (pixels)",IDC_STATIC_ULIST,10,167,221,8

-    EDITTEXT        IDC_NICKROW2,247,164,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,167,11,14

+    EDITTEXT        IDC_LOGLIMIT,247,139,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "Spin1",IDC_CHAT_SPIN2,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,276,139,11,14

+    LTEXT           "Group chat nick list row height (pixels)",IDC_STATIC_ULIST,10,161,221,8

+    EDITTEXT        IDC_NICKROW2,247,158,29,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

+    CONTROL         "",IDC_CHAT_SPIN3,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,275,158,11,14

     PUSHBUTTON      "Open log file base folder",IDC_MUC_OPENLOGBASEDIR,16,76,155,14

-END

-

-IDD_OPTIONS3 DIALOGEX 0, 0, 306, 224

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-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,14,119,13,SS_CENTERIMAGE

-    CTEXT           "Log to file",IDC_TEXTO4,234,13,64,13,SS_CENTERIMAGE

-    CTEXT           "Show popup",IDC_TEXTO2,131,13,49,13,SS_CENTERIMAGE

-    CTEXT           "Notify in tray",IDC_TEXTO3,183,13,49,13,SS_CENTERIMAGE

-    CONTROL         "Actions",IDC_1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,28,110,10

-    CONTROL         "Messages",IDC_2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,38,110,10

-    CONTROL         "Nick changes",IDC_3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,48,110,10

-    CONTROL         "Users joining",IDC_4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,58,110,10

-    CONTROL         "Users leaving",IDC_5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,68,110,10

-    CONTROL         "Topic changes",IDC_6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,78,110,10

-    CONTROL         "Status changes",IDC_7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,88,110,10

-    CONTROL         "Information",IDC_8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,98,110,10

-    CONTROL         "Disconnects",IDC_9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,108,110,10

-    CONTROL         "User kicks",IDC_10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,118,110,10

-    CONTROL         "Notices",IDC_11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,128,110,10

-    CONTROL         "",IDC_P1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,28,21,10

-    CONTROL         "",IDC_P2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,38,21,10

-    CONTROL         "",IDC_P3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,48,21,10

-    CONTROL         "",IDC_P4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,58,21,10

-    CONTROL         "",IDC_P5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,68,21,10

-    CONTROL         "",IDC_P6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,78,21,10

-    CONTROL         "",IDC_P7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,88,21,10

-    CONTROL         "",IDC_P8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,98,21,10

-    CONTROL         "",IDC_P9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,108,21,10

-    CONTROL         "",IDC_P10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,118,21,10

-    CONTROL         "",IDC_P11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,128,21,10

-    CONTROL         "",IDC_P12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,152,138,21,10

-    CONTROL         "",IDC_T1,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,28,21,10

-    CONTROL         "",IDC_T2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,38,21,10

-    CONTROL         "",IDC_T3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,48,21,10

-    CONTROL         "",IDC_T4,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,58,21,10

-    CONTROL         "",IDC_T5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,68,21,10

-    CONTROL         "",IDC_T6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,78,21,10

-    CONTROL         "",IDC_T7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,88,21,10

-    CONTROL         "",IDC_T8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,98,21,10

-    CONTROL         "",IDC_T9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,108,21,10

-    CONTROL         "",IDC_T10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,118,21,10

-    CONTROL         "",IDC_T11,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,128,21,10

-    CONTROL         "",IDC_T12,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,138,21,10

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

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

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

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

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

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

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

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

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

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

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

-    CONTROL         "Suppress tray notifications for focused channel windows",IDC_TRAYONLYFORINACTIVE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,164,279,10

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

-    COMBOBOX        IDC_LOGICONTYPE,12,204,171,38,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Line markers in the message log",IDC_STATIC,14,193,257,10

+    COMBOBOX        IDC_LOGICONTYPE,12,189,171,38,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

+    LTEXT           "Line markers in the message log",IDC_STATIC,10,178,276,10

 END

 

 IDD_OPTIONS4 DIALOGEX 0, 0, 306, 230

@@ -206,6 +142,7 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,211,278,11

 END

 

+

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

 //

 // DESIGNINFO

@@ -257,16 +194,16 @@ BEGIN
         VERTGUIDE, 60

         VERTGUIDE, 286

         TOPMARGIN, 1

+        BOTTOMMARGIN, 189

         HORZGUIDE, 107

         HORZGUIDE, 126

         HORZGUIDE, 146

         HORZGUIDE, 150

-        HORZGUIDE, 174

     END

 

     IDD_OPTIONS3, DIALOG

     BEGIN

-        VERTGUIDE, 32

+        VERTGUIDE, 22

         VERTGUIDE, 42

         VERTGUIDE, 142

     END

@@ -282,14 +219,12 @@ END
 

 1 TEXTINCLUDE 

 BEGIN

-	"..\\src\\chat_resource.h\r\n"

-	"..\\src\\resource.h\0"

+    "..\\src\\resource.h\0"

 END

 

 2 TEXTINCLUDE 

 BEGIN

-    "#include ""winres.h""\r\n"

-    "#include ""richedit.h""\0"

+    "#include <winres.h>\0"

 END

 

 3 TEXTINCLUDE 

@@ -300,6 +235,22 @@ END
 

 #endif    // APSTUDIO_INVOKED

 

+

+/////////////////////////////////////////////////////////////////////////////

+//

+// AFX_DIALOG_LAYOUT

+//

+

+IDD_OPTIONS3 AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

+IDD_OPTIONS2 AFX_DIALOG_LAYOUT

+BEGIN

+    0

+END

+

 #endif    // Neutral resources

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