remove ModernOpt support completely

9 files changed, 1 insertions, 441 deletions

diff --git a/src/core/stdaway/res/resource.rc b/src/core/stdaway/res/resource.rc
index f064664603..d1034fcbe2 100644
--- a/src/core/stdaway/res/resource.rc
+++ b/src/core/stdaway/res/resource.rc
@@ -54,25 +54,6 @@ BEGIN
     LTEXT           "Use %time% for the current time, %date% for the current date",IDC_STATIC,33,131,219,8

 END

 

-IDD_MODERNOPT_STATUS DIALOGEX 0, 0, 369, 113

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    COMBOBOX        IDC_STATUS,2,54,16,97,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Do not reply to requests for this message",IDC_DONTREPLY,

-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,0,33,10,10

-    CONTROL         "Do not pop up dialog asking for new message",IDC_NODIALOG,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,105,93,264,10

-    CONTROL         "By default, use the same message as last time",IDC_USEPREVIOUS,

-                    "Button",BS_AUTORADIOBUTTON,105,13,227,10

-    CONTROL         "By default, use this message:",IDC_USESPECIFIC,"Button",BS_AUTORADIOBUTTON,105,26,227,10

-    EDITTEXT        IDC_MSG,125,39,244,38,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL

-    CTEXT           "Use %time% for the current time, %date% for the current date",IDC_STATIC,125,78,244,8,SS_CENTERIMAGE

-    LTEXT           "Status messages:",IDC_TXT_TITLE1,0,0,246,8

-    LISTBOX         IDC_LST_STATUS,10,13,90,95,LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

-END

-

 IDD_SETAWAYMSG DIALOGEX 0, 0, 187, 72

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

 EXSTYLE WS_EX_CONTROLPARENT

@@ -108,17 +89,6 @@ BEGIN
         BOTTOMMARGIN, 147

     END

 

-    IDD_MODERNOPT_STATUS, DIALOG

-    BEGIN

-        VERTGUIDE, 10

-        VERTGUIDE, 100

-        VERTGUIDE, 105

-        VERTGUIDE, 218

-        BOTTOMMARGIN, 103

-        HORZGUIDE, 8

-        HORZGUIDE, 13

-    END

-

     IDD_SETAWAYMSG, DIALOG

     BEGIN

         LEFTMARGIN, 5

diff --git a/src/core/stdclist/res/resource.rc b/src/core/stdclist/res/resource.rc
index 6d32d6bf7d..4e32d4bcf2 100644
--- a/src/core/stdclist/res/resource.rc
+++ b/src/core/stdclist/res/resource.rc
@@ -215,118 +215,6 @@ BEGIN
     CONTROL         "Show resize grip indicator",IDC_SHOWGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,22,110,166,10

 END

 

-IDD_MODERNOPT_CLIST DIALOGEX 0, 0, 369, 51

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "Hide offline users",IDC_HIDEOFFLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,124,10

-    CONTROL         "Hide empty groups",IDC_HIDEEMPTYGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,124,10

-    CONTROL         "Disable groups",IDC_DISABLEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,124,10

-    CONTROL         "Sort contacts by name",IDC_SORTBYNAME,"Button",BS_AUTORADIOBUTTON | WS_GROUP,194,13,144,10

-    CONTROL         "Sort contacts by status",IDC_SORTBYSTATUS,"Button",BS_AUTORADIOBUTTON,194,25,149,10

-    CONTROL         "Sort contacts by protocol",IDC_SORTBYPROTO,"Button",BS_AUTORADIOBUTTON,194,37,151,10

-    LTEXT           "Ordering:",IDC_TXT_TITLE2,184,0,185,8

-    LTEXT           "Contact list:",IDC_TXT_TITLE1,1,0,182,8

-    CONTROL         "Ask before deleting contacts",IDC_CONFIRMDELETE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,21,75,124,10

-    CONTROL         "Single click interface",IDC_ONECLK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,163,76,150,10

-    CONTROL         "Always show status in tooltip",IDC_ALWAYSSTATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | NOT WS_VISIBLE | WS_TABSTOP,163,89,151,11

-    CONTROL         "Disable icon blinking",IDC_DISABLEBLINK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,163,103,86,9

-    EDITTEXT        IDC_BLINKTIME,165,117,35,12,ES_NUMBER | NOT WS_VISIBLE

-    LTEXT           "ms delay",IDC_STMSDELAY,203,118,113,8,NOT WS_VISIBLE

-    CONTROL         "Show",IDC_DONTCYCLE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE | WS_GROUP,21,151,97,10

-    COMBOBOX        IDC_PRIMARYSTATUS,119,150,78,70,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "icon when statuses differ",IDC_STATIC,201,152,116,8,NOT WS_VISIBLE | NOT WS_GROUP

-    CONTROL         "Cycle icons every",IDC_CYCLE,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,21,168,97,10

-    EDITTEXT        IDC_CYCLETIME,119,167,30,12,ES_RIGHT | ES_NUMBER | NOT WS_VISIBLE

-    CONTROL         "",IDC_CYCLETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | NOT WS_VISIBLE,139,166,11,14

-    LTEXT           "seconds, when statuses differ",IDC_STATIC,151,169,165,8,NOT WS_VISIBLE | NOT WS_GROUP

-    CONTROL         "Show multiple icons",IDC_MULTITRAY,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,21,185,98,10

-    CONTROL         "Only when statuses differ",IDC_ALWAYSMULTI,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,119,185,198,10

-    CONTROL         "",IDC_BLINKSPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK | NOT WS_VISIBLE,185,105,11,21

-    CONTROL         "Disable icon blinking",IDC_ICONBLINK,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,21,92,97,10

-END

-

-IDD_MODERNOPT_CLUI DIALOGEX 0, 0, 369, 100

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "Always on top",IDC_ONTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,128,10

-    CONTROL         "Tool style main window",IDC_TOOLWND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,128,10

-    CONTROL         "Minimize to tray",IDC_MIN2TRAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,128,10

-    CONTROL         "Hide contact list after it has been idle for",IDC_AUTOHIDE,

-                    "Button",BS_AUTOCHECKBOX | BS_TOP | BS_MULTILINE | WS_TABSTOP,194,13,162,10

-    EDITTEXT        IDC_HIDETIME,204,25,30,12,ES_RIGHT | ES_NUMBER

-    CONTROL         "",IDC_HIDETIMESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,224,22,11,14

-    LTEXT           "seconds",IDC_STATIC01,238,27,56,8

-    CONTROL         "Automatically resize window to height of list",IDC_AUTOSIZE,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,42,162,10

-    LTEXT           "maximum",IDC_STATIC21,204,57,45,8

-    EDITTEXT        IDC_MAXSIZEHEIGHT,250,54,31,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_MAXSIZESPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_HOTTRACK,270,54,11,14

-    LTEXT           "% of screen",IDC_STATIC22,282,57,69,8

-    CONTROL         "Size upwards",IDC_AUTOSIZEUPWARD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,204,70,147,10

-    LTEXT           "Title bar text:",IDC_STATIC,37,158,51,8,NOT WS_VISIBLE

-    CONTROL         "Show menu bar",IDC_SHOWMAINMENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,128,10

-    CONTROL         "Easy move",IDC_CLIENTDRAG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,61,128,10

-    CONTROL         "Show title bar",IDC_SHOWCAPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,73,128,10

-    CONTROL         "If window is partially covered, bring it to front",IDC_BRINGTOFRONT,

-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,194,85,175,10

-    EDITTEXT        IDC_TITLETEXT,91,156,72,12,ES_AUTOHSCROLL | NOT WS_VISIBLE

-    CONTROL         "Show drop shadow (restart required)",IDC_DROPSHADOW,

-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,41,174,138,10

-    CONTROL         "Pin to desktop",IDC_ONDESKTOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,85,128,10

-    LTEXT           "Window:",IDC_TXT_TITLE1,1,0,368,8

-    CONTROL         "Fade contact list in/out",IDC_FADEINOUT,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,13,174,163,10

-    CONTROL         "Transparent contact list",IDC_TRANSPARENT,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,13,191,151,9

-    LTEXT           "Inactive opacity:",IDC_STATIC11,23,206,89,8,NOT WS_VISIBLE

-    CONTROL         "",IDC_TRANSINACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,112,205,130,11

-    LTEXT           "Active opacity:",IDC_STATIC12,23,221,89,8,NOT WS_VISIBLE

-    CONTROL         "",IDC_TRANSACTIVE,"msctls_trackbar32",TBS_TOP | TBS_NOTICKS | NOT WS_VISIBLE | WS_TABSTOP,112,221,130,11

-    LTEXT           "000%",IDC_INACTIVEPERC,246,206,29,8,SS_NOPREFIX | NOT WS_VISIBLE

-    LTEXT           "000%",IDC_ACTIVEPERC,246,222,29,8,SS_NOPREFIX | NOT WS_VISIBLE

-END

-

-IDD_MODERNOPT_SBAR DIALOGEX 0, 0, 369, 53

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "Show status bar",IDC_SHOWSBAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,0,0,369,10

-    CONTROL         "Show icons",IDC_SHOWICON,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,15,142,10

-    CONTROL         "Show protocol names",IDC_SHOWPROTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,27,142,10

-    CONTROL         "Show status text",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,39,142,10

-    CONTROL         "Make sections equal width",IDC_EQUALSECTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,15,142,10

-    CONTROL         "Show bevels on panels",IDC_SBPANELBEVEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,27,107,10

-    CONTROL         "Show resize grip indicator",IDC_SHOWGRIP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,194,39,96,10

-    CONTROL         "Right click opens status menu",IDC_RIGHTSTATUS,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,22,160,142,10

-    CONTROL         "Right click opens Miranda NG menu",IDC_RIGHTMIRANDA,

-                    "Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,22,147,142,10

-END

-

-IDD_MODERNOPT_CLCBKG DIALOGEX 0, 0, 232, 143

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    LTEXT           "Background color",IDC_STATIC,57,28,72,8,NOT WS_GROUP

-    CONTROL         "",IDC_BKGCOLOUR,"ColourPicker",WS_TABSTOP,20,28,32,10

-    LTEXT           "Selection color",IDC_STATIC,57,44,72,8

-    CONTROL         "",IDC_SELCOLOUR,"ColourPicker",WS_TABSTOP,20,44,32,10

-    CONTROL         "Use background image",IDC_BITMAP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,63,161,10

-    EDITTEXT        IDC_FILENAME,20,79,184,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "...",IDC_BROWSE,206,79,15,12

-    CONTROL         "Stretch to width",IDC_STRETCHH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,96,100,10

-    CONTROL         "Stretch to height",IDC_STRETCHV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,96,101,10

-    CONTROL         "Tile horizontally",IDC_TILEH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,109,100,10

-    CONTROL         "Tile vertically",IDC_TILEV,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,109,101,10

-    CONTROL         "Scroll with text",IDC_SCROLL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,122,100,10

-    CONTROL         "Stretch proportionally",IDC_PROPORTIONAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,120,122,101,10

-    CONTROL         "Use Windows colors",IDC_WINCOLOUR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,156,10

-    LTEXT           "Contact list background:",IDC_TXT_TITLE1,1,0,230,8

-END

-

 

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

 //

diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 75caafbfd1..4bd2f23e92 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -37,11 +37,8 @@ void InitCustomMenus( void );
 void PaintClc(HWND hwnd, struct ClcData *dat, HDC hdc, RECT * rcPaint);

 

 int ClcOptInit(WPARAM wParam, LPARAM lParam);

-int ClcModernOptInit(WPARAM wParam, LPARAM lParam);

 int CluiOptInit(WPARAM wParam, LPARAM lParam);

-int CluiModernOptInit(WPARAM wParam, LPARAM lParam);

 int CListOptInit(WPARAM wParam, LPARAM lParam);

-int CListModernOptInit(WPARAM wParam, LPARAM lParam);

 

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

 // dll stub

diff --git a/src/core/stdclist/src/resource.h b/src/core/stdclist/src/resource.h
index 0a90d6898f..f9c37606a3 100644
--- a/src/core/stdclist/src/resource.h
+++ b/src/core/stdclist/src/resource.h
@@ -14,10 +14,6 @@
 #define IDD_OPT_SBAR                    234

 #define IDD_OPT_CLCTEXTSIMPLE           239

 #define IDD_DELETECONTACT               254

-#define IDD_MODERNOPT_CLIST             288

-#define IDD_MODERNOPT_CLUI              289

-#define IDD_MODERNOPT_SBAR              290

-#define IDD_MODERNOPT_CLCBKG            291

 #define IDC_MIN2TRAY                    1073

 #define IDC_ONTOP                       1074

 #define IDC_SHOWMAINMENU                1075

@@ -129,8 +125,6 @@
 #define IDC_DROPSHADOW                  1612

 #define IDC_SHOWGRIP                    1612

 #define IDC_NOSCROLLBAR                 1613

-#define IDC_TXT_TITLE1                  1617

-#define IDC_TXT_TITLE2                  1618

 #define IDC_ONDESKTOP                   1657

 #define IDC_DISABLEDOCKING              1658

 #define IDC_WINCOLOUR                   1659

diff --git a/src/core/stdidle/res/resource.rc b/src/core/stdidle/res/resource.rc
index a87378990a..ebecfa7b37 100644
--- a/src/core/stdidle/res/resource.rc
+++ b/src/core/stdidle/res/resource.rc
@@ -56,33 +56,6 @@ BEGIN
     CONTROL         "Disable sounds on idle",IDC_IDLESOUNDSOFF,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,25,177,265,9

 END

 

-IDD_MODERNOPT_IDLE DIALOGEX 0, 0, 369, 64

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "Become idle if computer is left unattended for:",IDC_IDLESHORT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,13,171,9

-    CONTROL         "Windows",IDC_IDLEONWINDOWS,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,325,25,26,9

-    CONTROL         "Miranda",IDC_IDLEONMIRANDA,"Button",BS_AUTORADIOBUTTON | NOT WS_VISIBLE,287,37,15,9

-    EDITTEXT        IDC_IDLE1STTIME,181,11,27,12,ES_AUTOHSCROLL | ES_NUMBER

-    CONTROL         "",IDC_IDLESPIN,"msctls_updown32",UDS_WRAP | UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_NOTHOUSANDS | UDS_HOTTRACK,193,7,11,23

-    CONTROL         "Become idle if the screen saver is active",IDC_SCREENSAVER,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,25,268,9

-    CONTROL         "Become idle if the computer is locked",IDC_LOCKED,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,37,249,9

-    CONTROL         "Become idle if a terminal session is disconnected",IDC_IDLETERMINAL,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,265,10

-    CONTROL         "Do not let protocols report any idle information",IDC_IDLEPRIVATE,

-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,303,13,22,9

-    LTEXT           "minute(s)",IDC_STATIC,213,13,76,9,SS_CENTERIMAGE

-    COMBOBOX        IDC_AASTATUS,325,46,23,50,CBS_DROPDOWNLIST | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Change my status mode to:",IDC_AASHORTIDLE,"Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,334,11,23,11

-    CONTROL         "Do not set status back to online when returning from idle",IDC_IDLESTATUSLOCK,

-                    "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,299,24,16,10

-    LTEXT           "Idle (auto-away):",IDC_TXT_TITLE1,0,0,246,8

-END

-

 #endif    // APSTUDIO_INVOKED

 

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

@@ -91,23 +64,6 @@ END
 //

 

 #ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_MODERNOPT_IDLE, DIALOG

-    BEGIN

-        VERTGUIDE, 10

-        VERTGUIDE, 181

-        HORZGUIDE, 8

-        HORZGUIDE, 22

-        HORZGUIDE, 34

-        HORZGUIDE, 46

-    END

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-#ifdef APSTUDIO_INVOKED

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

 //

 // TEXTINCLUDE

diff --git a/src/core/stdmsg/src/resource.h b/src/core/stdmsg/src/resource.h
index 9e2e278ba6..fda43c6d1e 100644
--- a/src/core/stdmsg/src/resource.h
+++ b/src/core/stdmsg/src/resource.h
@@ -154,9 +154,6 @@
 #define IDC_AVATARHEIGHT                1613

 #define IDC_SHOWSECS                    1614

 #define IDC_POPLIST                     1616

-#define IDC_TXT_TITLE1                  1617

-#define IDC_TXT_TITLE2                  1618

-#define IDC_TXT_TITLE3                  1619

 #define IDC_USETABS                     1620

 #define IDC_CLOSETABS                   1621

 #define IDC_RESTORETABS                 1622

diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index f95f0b5666..53ba52832b 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -579,72 +579,6 @@ BEGIN
     CONTROL         "",IDC_LV_ERRORS,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,4,10,306,235

 END

 

-IDD_MODERNOPT_FONTS DIALOGEX 0, 0, 260, 210

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    LTEXT           "Headers:",IDC_TXT_TITLE1,0,0,259,8

-    PUSHBUTTON      "...",IDC_CHOOSEFONTHEADER,244,30,16,14

-    LTEXT           "This font is used to display main section titles or text elements.",IDC_STATIC,10,11,249,16,SS_CENTERIMAGE

-    LTEXT           "Normal text:",IDC_TXT_TITLE2,0,55,259,8

-    PUSHBUTTON      "...",IDC_CHOOSEFONTGENERAL,244,84,16,14

-    LTEXT           "This font is used to display most text elements or section bodies.",IDC_STATIC,10,66,249,16,SS_CENTERIMAGE

-    LTEXT           "Minor notes:",IDC_TXT_TITLE3,0,109,259,8

-    PUSHBUTTON      "...",IDC_CHOOSEFONTSMALL,244,139,16,14

-    LTEXT           "This font is used to display various additional notes.",IDC_STATIC,10,120,249,16,SS_CENTERIMAGE

-    CONTROL         "",IDC_PREVIEWSMALL,"Static",SS_OWNERDRAW,10,139,229,15,WS_EX_STATICEDGE

-    CONTROL         "",IDC_PREVIEWGENERAL,"Static",SS_OWNERDRAW,10,84,229,15,WS_EX_STATICEDGE

-    CONTROL         "",IDC_PREVIEWHEADER,"Static",SS_OWNERDRAW,10,30,229,15,WS_EX_STATICEDGE

-END

-

-IDD_MODERNOPT_ACCOUNTS DIALOGEX 0, 0, 368, 210

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    LISTBOX         IDC_ACCLIST,0,0,162,192,LBS_SORT | LBS_OWNERDRAWVARIABLE | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP

-    LTEXT           "Account information:",IDC_TXT_ACCOUNT,167,0,201,8

-    LTEXT           "Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.",IDC_TXT_INFO,182,13,186,134

-    CONTROL         "&Add...",IDC_ADD,"MButtonClass",WS_TABSTOP,0,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&Edit",IDC_EDIT,"MButtonClass",WS_TABSTOP,22,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&Options",IDC_OPTIONS,"MButtonClass",WS_TABSTOP,38,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&Upgrade",IDC_UPGRADE,"MButtonClass",WS_TABSTOP,54,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    CONTROL         "&Remove...",IDC_REMOVE,"MButtonClass",WS_TABSTOP,76,196,16,14,WS_EX_NOACTIVATE | 0x10000000L

-    LTEXT           "Additional:",IDC_TXT_ADDITIONAL,167,157,201,8

-    CONTROL         "Configure network...",IDC_LNK_NETWORK,"Hyperlink",WS_TABSTOP,183,170,186,11

-    CONTROL         "Get more protocols...",IDC_LNK_ADDONS,"Hyperlink",WS_TABSTOP,183,181,186,11

-END

-

-IDD_MODERNOPT_MODULES DIALOGEX 0, 0, 369, 210

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    EDITTEXT        IDC_PLUGINLONGINFO,68,133,307,25,ES_MULTILINE | ES_AUTOVSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER

-    EDITTEXT        IDC_PLUGINAUTHOR,68,160,307,12,ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER

-    CONTROL         "",IDC_PLUGINEMAIL,"Hyperlink",WS_TABSTOP,68,172,307,10

-    CONTROL         "",IDC_PLUGINURL,"Hyperlink",WS_TABSTOP,68,184,307,10

-    EDITTEXT        IDC_PLUGINCPYR,68,197,307,12,ES_AUTOHSCROLL | ES_READONLY | ES_WANTRETURN | NOT WS_BORDER

-    RTEXT           "Description:",IDC_TXT_TITLE1,-1,133,63,10

-    RTEXT           "Author(s):",IDC_TXT_TITLE2,0,160,63,10

-    RTEXT           "E-mail:",IDC_TXT_TITLE3,0,172,63,10

-    RTEXT           "Homepage:",IDC_TXT_TITLE4,0,184,63,9

-    RTEXT           "Copyright:",IDC_TXT_TITLE6,0,197,63,10

-    CONTROL         "",IDC_PLUGLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_SORTASCENDING | LVS_AUTOARRANGE | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,0,0,369,128

-END

-

-IDD_MODERNOPT_IGNORE DIALOGEX 0, 0, 369, 210

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

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

-BEGIN

-    CONTROL         "",IDC_LIST,"CListControl",WS_TABSTOP | 0x3da,10,13,358,135,WS_EX_CLIENTEDGE

-    LTEXT           "Event icon legend:",IDC_TXT_TITLE2,0,153,119,8

-    LTEXT           "Choose events you wish to ignore:",IDC_TXT_TITLE1,0,0,246,8

-    CONTROL         "",IDC_LV_LEGEND,"SysListView32",LVS_LIST | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,10,166,358,43

-END

-

 IDD_CHOOSE_FONT_EFFECT DIALOGEX 13, 54, 226, 103

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

 CAPTION "Font effect"

@@ -1020,38 +954,6 @@ BEGIN
         HORZGUIDE, 49

     END

 

-    IDD_MODERNOPT_FONTS, DIALOG

-    BEGIN

-        VERTGUIDE, 10

-        VERTGUIDE, 239

-        VERTGUIDE, 244

-        HORZGUIDE, 30

-        HORZGUIDE, 45

-        HORZGUIDE, 84

-        HORZGUIDE, 99

-        HORZGUIDE, 139

-        HORZGUIDE, 154

-    END

-

-    IDD_MODERNOPT_ACCOUNTS, DIALOG

-    BEGIN

-        VERTGUIDE, 70

-        VERTGUIDE, 162

-        VERTGUIDE, 167

-        VERTGUIDE, 182

-        VERTGUIDE, 274

-        HORZGUIDE, 147

-        HORZGUIDE, 192

-        HORZGUIDE, 196

-    END

-

-    IDD_MODERNOPT_MODULES, DIALOG

-    BEGIN

-        RIGHTMARGIN, 260

-        VERTGUIDE, 60

-        VERTGUIDE, 65

-    END

-

     IDD_CHOOSE_FONT_EFFECT, DIALOG

     BEGIN

         HORZGUIDE, 18

diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp
index de970855bb..3f06d57471 100644
--- a/src/mir_app/src/FontOptions.cpp
+++ b/src/mir_app/src/FontOptions.cpp
@@ -1213,127 +1213,4 @@ static FontInternal* sttFindFont(OBJLIST<FontInternal> &fonts, char *module, cha
 

 static FontInternal fntHeader, fntGeneral, fntSmall;

 

-static INT_PTR CALLBACK DlgProcModernOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)

-{

-	int i;

-	LOGFONT lf;

-

-	switch (msg) {

-	case WM_INITDIALOG:

-		TranslateDialogDefault(hwndDlg);

-

-		fntHeader = *sttFindFont(font_id_list, "Fonts", "Header");

-		UpdateFontSettings(&fntHeader, &fntHeader.value);

-		fntGeneral = *sttFindFont(font_id_list, "Fonts", "Generic");

-		UpdateFontSettings(&fntGeneral, &fntGeneral.value);

-		fntSmall = *sttFindFont(font_id_list, "Fonts", "Small");

-		UpdateFontSettings(&fntSmall, &fntSmall.value);

-		return TRUE;

-

-	case WM_DRAWITEM:

-		{

-			FontInternal *pf = 0;

-			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

-			switch (dis->CtlID) {

-			case IDC_PREVIEWHEADER:

-				pf = &fntHeader;

-				break;

-			case IDC_PREVIEWGENERAL:

-				pf = &fntGeneral;

-				break;

-			case IDC_PREVIEWSMALL:

-				pf = &fntSmall;

-				break;

-			}

-

-			if (!pf)

-				break;

-

-			HFONT hFont = nullptr, hoFont = nullptr;

-			CreateFromFontSettings(&pf->value, &lf);

-			hFont = CreateFontIndirect(&lf);

-			hoFont = (HFONT)SelectObject(dis->hDC, hFont);

-			SetBkMode(dis->hDC, TRANSPARENT);

-			SetTextColor(dis->hDC, GetSysColor(COLOR_BTNTEXT));

-			FillRect(dis->hDC, &dis->rcItem, GetSysColorBrush(COLOR_BTNFACE));

-			DrawText(dis->hDC, TranslateT("Sample text"), -1, &dis->rcItem, DT_LEFT | DT_NOPREFIX | DT_SINGLELINE | DT_VCENTER | DT_WORD_ELLIPSIS | DT_CENTER);

-			if (hoFont)

-				SelectObject(dis->hDC, hoFont);

-			return TRUE;

-		}

-

-	case WM_COMMAND:

-		switch (LOWORD(wParam)) {

-		case IDC_CHOOSEFONTHEADER:

-		case IDC_CHOOSEFONTGENERAL:

-		case IDC_CHOOSEFONTSMALL:

-			{

-				FontInternal *pf = nullptr;

-				switch (LOWORD(wParam)) {

-				case IDC_CHOOSEFONTHEADER:

-					pf = &fntHeader;

-					break;

-				case IDC_CHOOSEFONTGENERAL:

-					pf = &fntGeneral;

-					break;

-				case IDC_CHOOSEFONTSMALL:

-					pf = &fntSmall;

-					break;

-				};

-

-				CreateFromFontSettings(&pf->value, &lf);

-

-				CHOOSEFONT cf = { 0 };

-				cf.lStructSize = sizeof(cf);

-				cf.hwndOwner = hwndDlg;

-				cf.lpLogFont = &lf;

-				cf.lCustData = pf->flags;

-				cf.Flags = CF_FORCEFONTEXIST | CF_INITTOLOGFONTSTRUCT | CF_SCREENFONTS;

-				if (pf->flags & FIDF_ALLOWEFFECTS) {

-					cf.Flags |= CF_EFFECTS | CF_ENABLEHOOK;

-					cf.lpfnHook = CFHookProc;

-				}

-

-				if (ChooseFont(&cf)) {

-					pf->value.size = (char)lf.lfHeight;

-					pf->value.style = (lf.lfWeight >= FW_BOLD ? DBFONTF_BOLD : 0) | (lf.lfItalic ? DBFONTF_ITALIC : 0) | (lf.lfUnderline ? DBFONTF_UNDERLINE : 0) | (lf.lfStrikeOut ? DBFONTF_STRIKEOUT : 0);

-					pf->value.charset = lf.lfCharSet;

-					wcsncpy_s(pf->value.szFace, lf.lfFaceName, _TRUNCATE);

-

-					InvalidateRect(GetDlgItem(hwndDlg, IDC_PREVIEWHEADER), nullptr, TRUE);

-					InvalidateRect(GetDlgItem(hwndDlg, IDC_PREVIEWGENERAL), nullptr, TRUE);

-					InvalidateRect(GetDlgItem(hwndDlg, IDC_PREVIEWSMALL), nullptr, TRUE);

-					SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

-				}

-			}

-			return TRUE;

-		}

-		break;

-

-	case WM_NOTIFY:

-		if (((LPNMHDR)lParam)->idFrom == 0 && ((LPNMHDR)lParam)->code == PSN_APPLY) {

-			for (i = 0; i < font_id_list.getCount(); i++) {

-				FontInternal &F = font_id_list[i];

-				if (F.deffontsettings.charset == SYMBOL_CHARSET)

-					continue;

-

-				COLORREF cl = F.value.colour;

-				if (F.isHeader())

-					F.value = fntHeader.value;

-				else if ((F.flags & FIDF_CLASSMASK) == FIDF_CLASSSMALL)

-					F.value = fntSmall.value;

-				else

-					F.value = fntGeneral.value;

-

-				F.value.colour = cl;

-				sttSaveFontData(hwndDlg, F);

-			}

-

-			OptionsChanged();

-		}

-		break;

-	}

-	return FALSE;

-}

-

 INT_PTR CALLBACK DlgPluginOpt(HWND, UINT, WPARAM, LPARAM);

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 4b82aa09b1..938474c988 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -18,7 +18,6 @@
 #define IDD_OPT_PROTOCOLORDER           109

 #define IDD_OPT_ICOLIB                  110

 #define IDD_ICOLIB_IMPORT               111

-#define IDD_MODERNOPT_FONTS             112

 #define IDI_LOADED_GRAY                 113

 #define IDI_NOTLOADED_GRAY              114

 #define IDD_ADDED                       115

@@ -34,15 +33,10 @@
 #define IDI_INVISIBLE                   130

 #define IDI_NA                          131

 #define IDI_LOAD                        132

-#define IDR_SRMM								 133

+#define IDR_SRMM						133

 #define IDD_OPT_SOUND                   134

 #define IDI_RECVMSG                     136

 #define IDI_URL                         138

-#define IDD_MODERNOPT_ACCOUNTS          139

-#define IDD_MODERNOPT_MODULES           140

-#define IDD_MODERNOPT_STATUS            141

-#define IDD_MODERNOPT_IDLE              142

-#define IDD_MODERNOPT_IGNORE            143

 #define IDI_MCMENUOFF                   144

 #define IDI_MCMENU                      145

 #define IDI_MCCONVERT                   146

@@ -479,20 +473,6 @@
 #define IDC_PROTOCOL                    1580

 #define IDC_CONTRIBLINK                 1586

 #define IDC_DEVS                        1589

-#define IDC_TXT_TITLE1                  1592

-#define IDC_TXT_TITLE2                  1593

-#define IDC_TXT_TITLE3                  1594

-#define IDC_TXT_TITLE4                  1595

-#define IDC_TXT_TITLE5                  1596

-#define IDC_TXT_TITLE6                  1597

-#define IDC_TXT_TITLE7                  1598

-#define IDC_TXT_TITLE8                  1599

-#define IDC_PREVIEWSMALL                1600

-#define IDC_PREVIEWGENERAL              1601

-#define IDC_PREVIEWHEADER               1602

-#define IDC_CHOOSEFONTHEADER            1603

-#define IDC_CHOOSEFONTGENERAL           1604

-#define IDC_CHOOSEFONTSMALL             1605

 #define IDC_IDLEONWINDOWS               1637

 #define IDC_IDLEONMIRANDA               1638

 #define IDC_SCREENSAVER                 1642

@@ -559,7 +539,6 @@
 #define IDC_LST_ERRORS                  1731

 #define IDC_LV_ERRORS                   1733

 #define IDC_HEADERBAR                   1734

-#define IDC_LV_LEGEND                   1735

 #define IDC_ENABLEBETA                  1737

 #define IDC_ENABLESTABLE                1738

 #define IDC_STORELASTPROFILE            1739