minus ModernOpt

8 files changed, 4 insertions, 90 deletions

diff --git a/src/mir_app/res/resource.rc b/src/mir_app/res/resource.rc
index 7b9ac32d40..f95f0b5666 100644
--- a/src/mir_app/res/resource.rc
+++ b/src/mir_app/res/resource.rc
@@ -148,7 +148,6 @@ BEGIN
     PUSHBUTTON      "Apply",IDC_APPLY,374,283,50,14

     CONTROL         "Tree1",IDC_PAGETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_NOHSCROLL | WS_BORDER | WS_TABSTOP,4,30,102,249

     CONTROL         "",IDC_TAB,"SysTabControl32",NOT WS_VISIBLE | WS_TABSTOP,111,30,313,249

-    CONTROL         "Switch to simple options",IDC_MODERN,"Hyperlink",WS_TABSTOP,5,284,102,10,WS_EX_TRANSPARENT

     CTEXT           "Please select a subentry from the list",IDC_STNOPAGE,111,30,313,251,SS_CENTERIMAGE

 END

 

@@ -165,7 +164,6 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,212,283,50,14

     PUSHBUTTON      "Apply",IDC_APPLY,267,283,50,14

     CONTROL         "",IDC_TAB,"SysTabControl32",NOT WS_VISIBLE | WS_TABSTOP,4,32,313,249

-    CONTROL         "Switch to simple options",IDC_MODERN,"Hyperlink",WS_TABSTOP,347,254,62,10,WS_EX_TRANSPARENT

     CTEXT           "Please select a subentry from the list",IDC_STNOPAGE,4,30,313,251,SS_CENTERIMAGE

     CONTROL         "",IDC_PAGETREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_TRACKSELECT | TVS_NOHSCROLL | NOT WS_VISIBLE | WS_BORDER | WS_TABSTOP,347,86,52,137

 END

diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp
index 1e7452ebd0..de970855bb 100644
--- a/src/mir_app/src/FontOptions.cpp
+++ b/src/mir_app/src/FontOptions.cpp
@@ -1337,49 +1337,3 @@ static INT_PTR CALLBACK DlgProcModernOptions(HWND hwndDlg, UINT msg, WPARAM wPar
 }

 

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

-

-int FontsModernOptInit(WPARAM wParam, LPARAM)

-{

-	static int iBoldControls[] =

-	{

-		IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,

-		MODERNOPT_CTRL_LAST

-	};

-

-	MODERNOPTOBJECT obj = {0};

-	obj.cbSize = sizeof(obj);

-	obj.dwFlags = MODEROPT_FLG_TCHAR|MODEROPT_FLG_NORESIZE;

-	obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);

-	obj.hInstance = g_hInst;

-	obj.iSection = MODERNOPT_PAGE_SKINS;

-	obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;

-	obj.iBoldControls = iBoldControls;

-	obj.lptzSubsection = LPGENW("Fonts");

-	obj.lpzClassicGroup = "Customize";

-	obj.lpzClassicPage = "Fonts";

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_FONTS);

-	obj.pfnDlgProc = DlgProcModernOptions;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-/*

-	obj.iSection = MODERNOPT_PAGE_ACCOUNTS;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_ACCOUNTS);

-	obj.pfnDlgProc = AccMgrDlgProc;

-	obj.lpzClassicGroup = nullptr;

-	obj.lpzClassicPage = "Network";

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-*/

-	obj.iSection = MODERNOPT_PAGE_MODULES;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_MODULES);

-	obj.pfnDlgProc = DlgPluginOpt;

-	obj.iBoldControls = iBoldControls;

-	obj.lpzClassicGroup = nullptr;

-	obj.lpzClassicPage = nullptr;

-	obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

diff --git a/src/mir_app/src/FontService.cpp b/src/mir_app/src/FontService.cpp
index 4620d8b727..b40410ad6c 100644
--- a/src/mir_app/src/FontService.cpp
+++ b/src/mir_app/src/FontService.cpp
@@ -502,12 +502,10 @@ MIR_APP_DLL(void) KillModuleEffects(int _hLang)
 /////////////////////////////////////////////////////////////////////////////////////////

 

 int OptInit(WPARAM, LPARAM);

-int FontsModernOptInit(WPARAM wParam, LPARAM lParam);

 

 static int OnModulesLoaded(WPARAM, LPARAM)

 {

 	HookEvent(ME_OPT_INITIALISE, OptInit);

-	HookEvent(ME_MODERNOPT_INITIALIZE, FontsModernOptInit);

 	return 0;

 }

 

diff --git a/src/mir_app/src/ignore.cpp b/src/mir_app/src/ignore.cpp
index f76856e026..1a212bafa4 100644
--- a/src/mir_app/src/ignore.cpp
+++ b/src/mir_app/src/ignore.cpp
@@ -415,22 +415,6 @@ static int IgnoreAddedNotify(WPARAM, LPARAM lParam)
 	return 0;

 }

 

-static int iBoldControls[] = { IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3, MODERNOPT_CTRL_LAST };

-

-static int IgnoreModernOptInit(WPARAM wParam, LPARAM)

-{

-	MODERNOPTOBJECT obj = { sizeof(obj) };

-	obj.hInstance = g_hInst;

-	obj.dwFlags = MODEROPT_FLG_TCHAR;

-	obj.iSection = MODERNOPT_PAGE_IGNORE;

-	obj.iType = MODERNOPT_TYPE_SECTIONPAGE;

-	obj.iBoldControls = iBoldControls;

-	obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_IGNORE);

-	obj.pfnDlgProc = DlgProcIgnoreOpts;

-	CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);

-	return 0;

-}

-

 int LoadIgnoreModule(void)

 {

 	PROTOCOLDESCRIPTOR pd = { 0 };

@@ -449,7 +433,6 @@ int LoadIgnoreModule(void)
 	CreateServiceFunction(MS_IGNORE_UNIGNORE, Unignore);

 

 	HookEvent(ME_DB_EVENT_FILTER_ADD, IgnoreAddedNotify);

-	HookEvent(ME_MODERNOPT_INITIALIZE, IgnoreModernOptInit);

 	HookEvent(ME_OPT_INITIALISE, IgnoreOptInitialise);

 	return 0;

 }

diff --git a/src/mir_app/src/newplugins.cpp b/src/mir_app/src/newplugins.cpp
index 57655c2ec9..22bbfb6cb4 100644
--- a/src/mir_app/src/newplugins.cpp
+++ b/src/mir_app/src/newplugins.cpp
@@ -115,7 +115,8 @@ static const MUUID pluginBannedList[] =
 	{ 0xf0fdf73a, 0x753d, 0x499d, { 0x8d, 0xba, 0x33, 0x6d, 0xb7, 0x9c, 0xdd, 0x41 } },  // advancedautoaway

 	{ 0xa5bb1b7a, 0xb7cd, 0x4cbb, { 0xa7, 0xdb, 0xce, 0xb4, 0xeb, 0x71, 0xda, 0x49 } },  // keepstatus

 	{ 0x4b733944, 0x5a70, 0x4b52, { 0xab, 0x2d, 0x68, 0xb1, 0xef, 0x38, 0xff, 0xe8 } },  // startupstatus

-	{ 0x9d6c3213, 0x02b4, 0x4fe1, { 0x92, 0xe6, 0x52, 0x6d, 0xe1, 0x4f, 0x8d, 0x65 } }   // stdchat

+	{ 0x9d6c3213, 0x02b4, 0x4fe1, { 0x92, 0xe6, 0x52, 0x6d, 0xe1, 0x4f, 0x8d, 0x65 } },  // stdchat

+	{ 0x621f886b, 0xa7f6, 0x457f, { 0x9d, 0x62, 0x8e, 0xe8, 0x4c, 0x27, 0x59, 0x93 } }   // modernopt

 };

 

 static bool isPluginBanned(const MUUID& u1)

diff --git a/src/mir_app/src/options.cpp b/src/mir_app/src/options.cpp
index 272d8ab216..33962626fb 100644
--- a/src/mir_app/src/options.cpp
+++ b/src/mir_app/src/options.cpp
@@ -373,7 +373,7 @@ class COptionsDlg : public CDlgBase
 

 	CCtrlTreeView m_pageTree;

 	CCtrlCombo m_keywordFilter;

-	CCtrlButton m_btnApply, m_btnCancel, m_btnModern;

+	CCtrlButton m_btnApply, m_btnCancel;

 

 	COptionsDlg& operator=(const COptionsDlg&);

 

@@ -715,7 +715,6 @@ public:
 		CDlgBase(g_hInst, bSinglePage ? IDD_OPTIONSPAGE : IDD_OPTIONS),

 		m_btnApply(this, IDC_APPLY),

 		m_btnCancel(this, IDCANCEL),

-		m_btnModern(this, IDC_MODERN),

 		m_pageTree(this, IDC_PAGETREE),

 		m_keywordFilter(this, IDC_KEYWORD_FILTER),

 		m_arOpd(10),

@@ -733,14 +732,10 @@ public:
 

 		m_btnCancel.OnClick = Callback(this, &COptionsDlg::OnCancel);

 		m_btnApply.OnClick = Callback(this, &COptionsDlg::btnApply_Click);

-		m_btnModern.OnClick = Callback(this, &COptionsDlg::btnModern_Click);

 	}

 

 	virtual void OnInitDialog() override

 	{

-		if (!ServiceExists(MS_MODERNOPT_SHOW))

-			ShowWindow(GetDlgItem(m_hwnd, IDC_MODERN), FALSE);

-

 		Utils_RestoreWindowPositionNoSize(m_hwnd, 0, "Options", "");

 		Window_SetSkinIcon_IcoLib(m_hwnd, SKINICON_OTHER_OPTIONS);

 		m_btnApply.Disable();

@@ -853,8 +848,6 @@ public:
 

 		DeleteObject(m_hBoldFont);

 		pOptionsDlg = nullptr;

-

-		CallService(MS_MODERNOPT_RESTORE, 0, 0);

 	}

 

 	virtual void OnApply() override

@@ -898,14 +891,6 @@ public:
 		m_btnApply.Disable();

 	}

 

-	void btnModern_Click(CCtrlButton*)

-	{

-		db_set_b(0, "Options", "Expert", 0);

-		SaveOptionsTreeState();

-		PostMessage(m_hwnd, WM_CLOSE, 0, 0);

-		CallService(MS_MODERNOPT_SHOW, 0, 0);

-	}

-

 	void OnOk(void*)

 	{

 		if (GetParent(GetFocus()) == GetDlgItem(m_hwnd, IDC_KEYWORD_FILTER))

@@ -1220,10 +1205,7 @@ MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int _hLa
 

 static INT_PTR OpenOptionsDialog(WPARAM, LPARAM)

 {

-	if (pOptionsDlg || !ServiceExists(MS_MODERNOPT_SHOW))

-		OpenOptionsNow(0, nullptr, nullptr, nullptr, false);

-	else

-		CallService(MS_MODERNOPT_SHOW, 0, 0);

+	OpenOptionsNow(0, nullptr, nullptr, nullptr, false);

 	return 0;

 }

 

diff --git a/src/mir_app/src/resource.h b/src/mir_app/src/resource.h
index 5a56718d2d..4b82aa09b1 100644
--- a/src/mir_app/src/resource.h
+++ b/src/mir_app/src/resource.h
@@ -377,7 +377,6 @@
 #define IDC_NEWNAME                     1341

 #define IDC_MOVE                        1342

 #define IDC_LEAVE                       1343

-#define IDC_MODERN                      1346

 #define IDC_CATEGORYLIST                1366

 #define IDC_LOADICONS                   1369

 #define IDC_STICONSGROUP                1371

diff --git a/src/mir_app/src/stdafx.h b/src/mir_app/src/stdafx.h
index b9dd68cd02..fa9d38129d 100644
--- a/src/mir_app/src/stdafx.h
+++ b/src/mir_app/src/stdafx.h
@@ -84,7 +84,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <m_awaymsg.h>

 #include <m_ignore.h>

 #include <m_icolib.h>

-#include <m_modernopt.h>

 #include <m_timezones.h>

 #include <m_extraicons.h>

 #include <m_xstatus.h>