minus ModernOpt

4 files changed, 0 insertions, 382 deletions

diff --git a/include/delphi/m_api.pas b/include/delphi/m_api.pas
index 1621e49438..2abea6900c 100644
--- a/include/delphi/m_api.pas
+++ b/include/delphi/m_api.pas
@@ -218,7 +218,6 @@ var
   {$include m_langpack.inc}

   {$include m_message.inc}

   {$include m_metacontacts.inc}

-  {$include m_modernopt.inc}

   {$include m_netlib.inc}

   {$include m_options.inc}

   {$include m_pluginupdater.inc}

diff --git a/include/delphi/m_modernopt.inc b/include/delphi/m_modernopt.inc
deleted file mode 100644
index cbb981b95b..0000000000
--- a/include/delphi/m_modernopt.inc
+++ /dev/null
@@ -1,110 +0,0 @@
-{

-Miranda IM: the free IM client for Microsoft* Windows*

-

-Copyright 2007 Artem Shpynov

-Copyright 2000-2007 Miranda ICQ/IM project,

-

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-}

-

-{$IFNDEF M_MODERNOPT}

-{$DEFINE M_MODERNOPT}

-

-{

-	260x210 - subsection

-	368x210 - section

-}

-const

-  MS_MODERNOPT_SHOW      :PAnsiChar = 'ModernOpt/Show';

-

-  ME_MODERNOPT_INITIALIZE:PAnsiChar = 'ModernOpt/Initialize';

-

-  MODEROPT_FLG_UNICODE  = $01;

-  MODEROPT_FLG_NORESIZE = $02;

-

-type

-  moType = (

-    MODERNOPT_TYPE_SECTIONPAGE,

-    MODERNOPT_TYPE_SUBSECTIONPAGE,

-    MODERNOPT_TYPE_IGNOREOBJECT,

-    MODERNOPT_TYPE_SELECTORPAGE,

-    MODERNOPT_TYPE_COUNT);

-

-type

-  moPage = (

-    MODERNOPT_PAGE_HOME,

-    MODERNOPT_PAGE_ACCOUNTS,

-    MODERNOPT_PAGE_SKINS,

-    MODERNOPT_PAGE_CLIST,

-    MODERNOPT_PAGE_MSGS,

-    MODERNOPT_PAGE_IGNORE,

-    MODERNOPT_PAGE_STATUS,

-    MODERNOPT_PAGE_ADVANCED,

-    MODERNOPT_PAGE_MODULES,

-    MODERNOPT_PAGE_COUNT);

-

-const

-  MODERNOPT_CTRL_LAST = 0;

-

-type

-  TMODERNOPTOBJECT = record

-    cbSize            :int;

-    dwFlags           :dword;

-    iType             :int;

-    iSection          :int;

-

-    hIcon             :HICON;

-    szSubsection      :TChar;

-

-    // Generic dialog page

-    hInstance         :HINST;

-    lpzTemplate       :PAnsiChar;

-    pfnDlgProc        :pointer;

-    iBoldControls     :pint;

-

-    // General page support

-    lpzClassicGroup   :PAnsiChar;

-    lpzClassicPage    :PAnsiChar;

-    lpzClassicTab     :PAnsiChar;

-    lpzHelpUrl        :PAnsiChar;

-

-    // Ingore page

-    lpzIgnoreModule   :PAnsiChar;

-    lpzIgnoreSetting  :PAnsiChar;

-    dwIgnoreBit       :dword;

-

-    // Selector type page

-    lpzThemeExtension :PAnsiChar;

-    lpzThemeModuleName:PAnsiChar;

-  end;

-

-const

-  MS_MODERNOPT_ADDOBJECT :PAnsiChar = 'ModernOpt/AddObject';

-  MS_MODERNOPT_SELECTPAGE:PAnsiChar = 'ModernOpt/SelectPage';

-  ME_MODERNINGORE_RELOAD :PAnsiChar = 'ModernOpt/Ignore/Reload';

-

-  TS_SKIN_ACTIVE          = '/Active';

-

-  TS_SKIN_PREVIEW         = '/Preview';

-

-  TS_SKIN_APPLY           = '/Apply';

-

-// used by core options module to switch back to modernopt module

-  MS_MODERNOPT_RESTORE:PAnsiChar = 'ModernOpt/Restore';

-

-{$ENDIF}

diff --git a/include/deprecated/m_errors.h b/include/deprecated/m_errors.h
deleted file mode 100644
index 9fc716410d..0000000000
--- a/include/deprecated/m_errors.h
+++ /dev/null
@@ -1,149 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (ñ) 2012-17 Miranda NG project (https://miranda-ng.org)

-Copyright (c) 2000-08 Miranda ICQ/IM project,

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef M_ERRORS_H__

-#define M_ERRORS_H__ 1

-

-#define MERR_UNICODE				0x01

-#define MERR_DEFAULT_INFO			0x02

-#define MERR_DEFAULT_WARNING		0x04

-#define MERR_DEFAULT_ERROR			0x08

-#define MERR_DEFAULT_ALL			0x0E

-

-// Error notifications are sorted according to this level

-#define MERR_LEVEL_INFO				1

-#define MERR_LEVEL_WARNING			2

-#define MERR_LEVEL_ERROR			3

-

-// Predefined error types (no need to call MS_ERROR_REGISTER)

-#define MERR_TYPE_INFO				"Core/Info"

-#define MERR_TYPE_SRV_INFO			"Core/SrvInfo"

-#define MERR_TYPE_WARNING			"Core/Warning"

-#define MERR_TYPE_SRV_WARNING		"Core/SrvWarning"

-#define MERR_TYPE_SRV_ERROR			"Core/SrvError"

-#define MERR_TYPE_NETWORK			"Core/Network"

-#define MERR_TYPE_LOGIN				"Core/Login"

-

-// Specify set of buttons to make query box

-#define MERR_BTN_NONE				0

-#define MERR_BTN_YESNO				1

-#define MERR_BTN_YESNOCANCEL		2

-#define MERR_BTN_ABORTRETRYIGNORE	4

-

-// General-purpose error definition

-typedef struct

-{

-	int                 cbSize;

-	DWORD               flags;

-	int                 level;

-	char                *name;

-

-	union {

-		wchar_t           *ptszTitle;

-		char            *pszTitle;

-		wchar_t           *pwszTitle;

-	};

-} MIRANDAERROR_TYPE;

-

-// General-purpose error definition

-typedef struct

-{

-	int                 cbSize;

-	DWORD               flags;

-	char                *type;

-

-	union {

-		wchar_t           *ptszModuleTitle;

-		char            *pszModuleTitle;

-		wchar_t           *pwszModuleTitle;

-	};

-

-	int                 buttons;

-	int                 btnDefault;

-	char                *pszQueryName; // to save answer in DB

-	char                *pszSvcCallback;

-	LPARAM              lParam;

-

-	// information itself

-	HANDLE              hContact;

-	union {

-		wchar_t           *ptszTitle;

-		char            *pszTitle;

-		wchar_t           *pwszTitle;

-	};

-	union {

-		wchar_t           *ptszText;

-		char            *pszText;

-		wchar_t           *pwszText;

-	};

-

-	// filled by core and may be used in handlers.

-	MIRANDAERROR_TYPE   *typeInfo;

-	DWORD               dwTimestamp;

-} MIRANDAERROR;

-

-// Information about particular error handler for options UI

-typedef struct

-{

-	int                 cbSize;

-	DWORD               flags;

-	char                *pszDbModule;

-

-	HANDLE              hIcolibIcon;

-	union {

-		wchar_t           *ptszTitle;

-		char            *pszTitle;

-		wchar_t           *pwszTitle;

-	};

-} MIRANDAERROR_HANDLER;

-

-#define MS_ERROR_REGISTER           "Errors/Register"

-#define MS_ERROR_ADDHANDLER         "Errors/AddHandler"

-#define MS_ERROR_PROCESS            "Errors/Process"

-#define ME_ERROR_ONPROCESS          "Errors/OnProcess"

-

-#ifndef MIRANDA_ERRORS_NOHELPERS

-	#ifdef __cplusplus

-		#define	DEFVAL(x)	= x

-	#else

-		#define	DEFVAL(x)

-	#endif

-

-	static __forceinline void mir_ReportError(HANDLE hContact, wchar_t *ptszModuleTitle, char *pszType, wchar_t *ptszText, wchar_t *ptszTitle DEFVAL(NULL))

-	{

-		MIRANDAERROR err = {0};

-		err.cbSize = sizeof(err);

-		err.flags = MERR_TCHAR;

-		err.type = pszType;

-		err.ptszModuleTitle = ptszModuleTitle;

-		err.hContact = hContact;

-		err.ptszText = ptszText;

-		err.ptszTitle = ptszTitle;

-		CallServiceSync(MS_ERROR_PROCESS, 0, (LPARAM)&err);

-	}

-

-	#undef DEFVAL

-#endif // MIRANDA_ERRORS_NOHELPERS

-

-#endif // M_ERRORS_H__

diff --git a/include/m_modernopt.h b/include/m_modernopt.h
deleted file mode 100644
index c0a83df2d5..0000000000
--- a/include/m_modernopt.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*

-

-Miranda NG: the free IM client for Microsoft* Windows*

-

-Copyright (ñ) 2012-17 Miranda NG project (https://miranda-ng.org)

-Copyright (ñ) 2000-10 Miranda ICQ/IM project,

-Copyright (c) 2007 Artem Shpynov

-

-all portions of this codebase are copyrighted to the people

-listed in contributors.txt.

-

-This program is free software; you can redistribute it and/or

-modify it under the terms of the GNU General Public License

-as published by the Free Software Foundation; either version 2

-of the License, or (at your option) any later version.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program; if not, write to the Free Software

-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

-*/

-

-#ifndef M_MODERNOPT_H__

-#define M_MODERNOPT_H__ 1

-

-/*

-	260x210 - subsection

-	368x210 - section

-*/

-

-#define MS_MODERNOPT_SHOW			"ModernOpt/Show"

-

-#define ME_MODERNOPT_INITIALIZE		"ModernOpt/Initialize"

-

-#define MODEROPT_FLG_UNICODE		0x01

-#define MODEROPT_FLG_NORESIZE		0x02

-

-#ifdef UNICODE

-	#define MODEROPT_FLG_TCHAR		MODEROPT_FLG_UNICODE

-#else

-	#define MODEROPT_FLG_TCHAR		0

-#endif

-

-enum {

-	MODERNOPT_TYPE_SECTIONPAGE,

-	MODERNOPT_TYPE_SUBSECTIONPAGE,

-	MODERNOPT_TYPE_IGNOREOBJECT,

-	MODERNOPT_TYPE_SELECTORPAGE,

-	MODERNOPT_TYPE_COUNT

-};

-

-enum {

-	MODERNOPT_PAGE_HOME,

-	MODERNOPT_PAGE_ACCOUNTS,

-	MODERNOPT_PAGE_SKINS,

-	MODERNOPT_PAGE_CLIST,

-	MODERNOPT_PAGE_MSGS,

-	MODERNOPT_PAGE_IGNORE,

-	MODERNOPT_PAGE_STATUS,

-	MODERNOPT_PAGE_ADVANCED,

-	MODERNOPT_PAGE_MODULES,

-	MODERNOPT_PAGE_COUNT

-};

-

-#define MODERNOPT_CTRL_LAST		0

-

-struct MODERNOPTOBJECT

-{

-	int			cbSize;

-	DWORD		dwFlags;

-	int			iType;

-	int			iSection;

-

-	HICON		hIcon;

-	union {

-		wchar_t	*lptzSubsection;

-		char	*lpzSubsection;

-		wchar_t	*lpwzSubsection;

-	};

-

-	// Generic dialog page

-	HINSTANCE	hInstance;

-	char		*lpzTemplate;

-	DLGPROC		pfnDlgProc;

-	int			*iBoldControls;

-

-	// General page support

-	char		*lpzClassicGroup;

-	char		*lpzClassicPage;

-	char		*lpzClassicTab;

-	char		*lpzHelpUrl;

-

-	// Ingore page

-	char		*lpzIgnoreModule;

-	char		*lpzIgnoreSetting;

-	DWORD		dwIgnoreBit;

-

-	// Selector type page

-	char		*lpzThemeExtension;

-	char		*lpzThemeModuleName;

-};

-

-#define MS_MODERNOPT_ADDOBJECT		"ModernOpt/AddObject"

-

-#define MS_MODERNOPT_SELECTPAGE		"ModernOpt/SelectPage"

-

-#define ME_MODERNINGORE_RELOAD		"ModernOpt/Ignore/Reload"

-

-#define TS_SKIN_ACTIVE				"/Active"

-

-#define TS_SKIN_PREVIEW				"/Preview"

-

-#define TS_SKIN_APPLY				"/Apply"

-

-// used by core options module to switch back to modernopt module

-#define MS_MODERNOPT_RESTORE		"ModernOpt/Restore"

-

-#endif // M_MODERNOPT_H__