remove ModernOpt support completely

3 files changed, 1 insertions, 243 deletions

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