From 6056ed3959bd5edf99b53b9ed9e25beb315a45bc Mon Sep 17 00:00:00 2001 From: dartraiden Date: Thu, 14 Sep 2017 17:20:18 +0300 Subject: remove ModernOpt support completely --- src/core/stdaway/res/resource.rc | 30 ---------- src/core/stdclist/res/resource.rc | 112 -------------------------------------- src/core/stdclist/src/init.cpp | 3 - src/core/stdclist/src/resource.h | 6 -- src/core/stdidle/res/resource.rc | 44 --------------- src/core/stdmsg/src/resource.h | 3 - 6 files changed, 198 deletions(-) (limited to 'src/core') 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 ///////////////////////////////////////////////////////////////////////////// @@ -90,23 +63,6 @@ END // DESIGNINFO // -#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 ///////////////////////////////////////////////////////////////////////////// // 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 -- cgit v1.2.3