fixes #3050 (TabSRMM: remove built-in NEN options dialog)

2 files changed, 0 insertions, 81 deletions

diff --git a/plugins/TabSRMM/res/resource.rc b/plugins/TabSRMM/res/resource.rc
index e6ca587c63..2b64a58a9e 100644
--- a/plugins/TabSRMM/res/resource.rc
+++ b/plugins/TabSRMM/res/resource.rc
@@ -69,51 +69,6 @@ BEGIN
     PUSHBUTTON      "Revert to (safe) defaults",IDC_PLUS_REVERT,180,207,111,14

 END

 

-IDD_POPUP_OPT DIALOGEX 0, 0, 314, 257

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    GROUPBOX        "Event notify options",IDC_STATIC,3,0,310,157

-    CONTROL         "Limit message preview to",IDC_LIMITPREVIEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,123,138,12

-    EDITTEXT        IDC_MESSAGEPREVIEWLIMIT,153,123,37,13,ES_AUTOHSCROLL

-    CONTROL         "",IDC_MESSAGEPREVIEWLIMITSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,196,123,9,13

-    LTEXT           "characters",IDC_STATIC,210,124,89,10

-    PUSHBUTTON      "Only show event notifications when my status is...",IDC_POPUPSTATUSMODES,11,139,292,15

-    GROUPBOX        "Popup options",IDC_STATIC,3,158,310,97

-    LTEXT           "Text",IDC_STATIC,60,167,23,8

-    LTEXT           "Background",IDC_STATIC,86,167,47,8

-    CTEXT           "Timeout (seconds, 0 = default, -1 = no timeout)",IDC_STATIC,134,167,168,8

-    LTEXT           "Message",IDC_STATIC,11,180,44,10

-    CONTROL         "",IDC_COLTEXT_MESSAGE,"ColourPicker",WS_TABSTOP,56,179,24,12

-    CONTROL         "",IDC_COLBACK_MESSAGE,"ColourPicker",WS_TABSTOP,92,179,24,12

-    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,179,72,12

-    LTEXT           "Others",IDC_STATIC,12,197,44,9

-    CONTROL         "",IDC_COLTEXT_OTHERS,"ColourPicker",WS_TABSTOP,56,195,24,12

-    CONTROL         "",IDC_COLBACK_OTHERS,"ColourPicker",WS_TABSTOP,92,195,24,12

-    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_OTHERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,195,72,12

-    EDITTEXT        IDC_DELAY_MESSAGE,210,179,46,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_DELAY_MESSAGE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,254,178,9,13

-    EDITTEXT        IDC_DELAY_OTHERS,210,195,46,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_DELAY_OTHERS_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,253,195,11,13

-    PUSHBUTTON      "Preview",IDC_PREVIEW,261,178,48,61

-    CONTROL         "",IDC_EVENTOPTIONS,"SysTreeView32",TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP,6,8,303,110

-    CONTROL         "",IDC_COLTEXT_MUC,"ColourPicker",WS_TABSTOP,56,211,24,12

-    CONTROL         "",IDC_COLBACK_MUC,"ColourPicker",WS_TABSTOP,92,211,24,12

-    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_MUC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,211,72,12

-    LTEXT           "Group chats",IDC_STATIC,12,212,44,10

-    EDITTEXT        IDC_DELAY_MUC,210,211,46,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_DELAY_MUC_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,253,211,9,13

-    LTEXT           "Errors",IDC_STATIC,12,228,44,10

-    CONTROL         "",IDC_COLTEXT_ERR,"ColourPicker",WS_TABSTOP,56,227,24,12

-    CONTROL         "",IDC_COLBACK_ERR,"ColourPicker",WS_TABSTOP,92,227,24,12

-    CONTROL         "Use default colors",IDC_CHKDEFAULTCOL_ERR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,123,227,72,12

-    EDITTEXT        IDC_DELAY_ERR,210,227,46,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_DELAY_ERR_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,253,227,9,13

-    CONTROL         "Use the message log color theme for group chat popups",IDC_MUC_LOGCOLORS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,240,263,12

-END

-

 IDD_CHOOSESTATUSMODES DIALOGEX 0, 0, 226, 154

 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

 CAPTION "Dialog"

@@ -819,10 +774,6 @@ BEGIN
     BEGIN

     END

 

-    IDD_POPUP_OPT, DIALOG

-    BEGIN

-    END

-

     IDD_USERPREFS, DIALOG

     BEGIN

         BOTTOMMARGIN, 166

@@ -917,11 +868,6 @@ BEGIN
     0

 END

 

-IDD_POPUP_OPT AFX_DIALOG_LAYOUT

-BEGIN

-    0

-END

-

 #endif    // Neutral resources

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

 

diff --git a/plugins/TabSRMM/src/resource.h b/plugins/TabSRMM/src/resource.h
index 139650fe6c..56973c5a32 100644
--- a/plugins/TabSRMM/src/resource.h
+++ b/plugins/TabSRMM/src/resource.h
@@ -46,7 +46,6 @@
 #define IDD_OPT_MSGTYPE                 275

 #define IDD_MSGCONTAINER                276

 #define IDD_OPT_TABBEDMSG               277

-#define IDD_POPUP_OPT                   278

 #define IDR_TABCONTEXT                  286

 #define IDD_SELECTCONTAINER             299

 #define IDD_CONTAINEROPTIONS            300

@@ -114,27 +113,15 @@
 #define IDC_CHKPREVIEW                  1034

 #define IDC_CHKINFINITE                 1035

 #define IDC_PANELSTATUS                 1036

-#define IDC_CHKDEFAULTCOL_MESSAGE       1038

-#define IDC_CHKDEFAULTCOL_MUC           1039

-#define IDC_CHKDEFAULTCOL_ERR           1040

 #define IDC_INSTAMP                     1041

-#define IDC_COLBACK_MESSAGE             1041

-#define IDC_COLTEXT_MESSAGE             1042

-#define IDC_COLTEXT_MUC                 1043

 #define IDC_OUTSTAMP                    1043

-#define IDC_COLBACK_MUC                 1044

-#define IDC_COLTEXT_ERR                 1045

-#define IDC_COLBACK_ERR                 1046

 #define IDC_TIMESTAMP                   1046

 #define IDC_SHOWNAMES                   1047

 #define IDC_FONTCHOOSE                  1047

 #define IDC_LOGDIRECTORY                1048

-#define IDC_CHKDEFAULTCOL_OTHERS        1050

 #define IDC_LIMIT                       1050

-#define IDC_COLBACK_OTHERS              1051

 #define IDC_LOGTIMESTAMP                1051

 #define IDC_CLOSEONREPLY                1052

-#define IDC_COLTEXT_OTHERS              1053

 #define IDC_SHOWFILES                   1054

 #define IDC_MERGEPOPUP                  1056

 #define IDC_CHKINFINITE_MESSAGE         1057

@@ -143,7 +130,6 @@
 #define IDC_IMGTAG                      1058

 #define IDC_SHOWURLS                    1059

 #define IDC_ANIAVATAR                   1059

-#define IDC_DELAY_MESSAGE               1060

 #define IDC_SCROLLFIX                   1060

 #define IDC_CLIENTINSTATBAR             1061

 #define IDC_TYPINGSOUNDS                1062

@@ -156,9 +142,7 @@
 #define IDC_TEXT                        1064

 #define IDC_RESTART                     1065

 #define IDC_BKG                         1065

-#define IDC_DELAY_OTHERS                1066

 #define IDC_CLIST                       1067

-#define IDC_DELAY_MUC                   1067

 #define IDC_TIMEOUT                     1067

 #define IDC_NUMBERMSG                   1068

 #define IDC_MULTISPLITTER               1069

@@ -214,7 +198,6 @@
 #define IDC_NORSS                       1099

 #define IDC_DETAILS                     1100

 #define IDC_ADD                         1101

-#define IDC_DELAY_ERR                   1102

 #define IDC_RTL                         1103

 #define IDC_PIC                         1104

 #define IDC_CANCELADD                   1112

@@ -282,9 +265,7 @@
 #define IDC_DRAWGRID                    1188

 #define IDC_LIMITTABS                   1189

 #define IDC_WANTVERTICALGRID            1190

-#define IDC_LIMITPREVIEW                1191

 #define IDC_AUTOLOCALE                  1192

-#define IDC_MUC_LOGCOLORS               1192

 #define IDC_DONTREPORTUNFOCUSED2        1193

 #define IDC_GCHECK                      1194

 #define IDC_HIDETAB                     1195

@@ -323,7 +304,6 @@
 #define IDC_SENDLATER                   1226

 #define IDC_RETRY                       1227

 #define IDC_SETUPAUTOCREATEMODES        1228

-#define IDC_POPUPSTATUSMODES            1229

 #define IDC_DELETECONTAINER             1230

 #define IDC_CANCELSEND                  1231

 #define IDC_O_FLASHALWAYS               1232

@@ -441,13 +421,7 @@
 #define IDC_SAVETEMPLATE                1344

 #define IDC_SELECTICONDLL               1345

 #define IDC_RTLDEFAULT                  1346

-#define IDC_MESSAGEPREVIEWLIMIT         1349

-#define IDC_MESSAGEPREVIEWLIMITSPIN     1350

-#define IDC_DELAY_MESSAGE_SPIN          1351

-#define IDC_DELAY_MUC_SPIN              1352

-#define IDC_DELAY_ERR_SPIN              1353

 #define IDC_MESSAGEPREVIEWLIMITSPIN2    1354

-#define IDC_DELAY_OTHERS_SPIN           1354

 #define IDC_TEMPLATELIST                1361

 #define IDC_EDITTEMPLATE                1362

 #define IDC_REVERT                      1363

@@ -465,7 +439,6 @@
 #define IDC_LOGOPTIONS                  1377

 #define IDC_WINDOWOPTIONS               1378

 #define IDC_TRAYCONTAINER               1379

-#define IDC_EVENTOPTIONS                1380

 #define IDC_VARIABLESHELP               1381

 #define IDC_TABMSGOPTIONS               1384

 #define IDC_HELPTEXT                    1392