summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/stdauth/src/stdafx.h1
-rw-r--r--src/core/stdautoaway/src/stdafx.h1
-rw-r--r--src/core/stdaway/src/sendmsg.cpp26
-rw-r--r--src/core/stdaway/src/stdafx.h1
-rw-r--r--src/core/stdclist/src/clcopts.cpp25
-rw-r--r--src/core/stdclist/src/clistopts.cpp26
-rw-r--r--src/core/stdclist/src/cluiopts.cpp31
-rw-r--r--src/core/stdclist/src/init.cpp10
-rw-r--r--src/core/stdclist/src/stdafx.h1
-rw-r--r--src/core/stdcrypt/src/stdafx.h1
-rw-r--r--src/core/stdemail/src/stdafx.h1
-rw-r--r--src/core/stdfile/src/stdafx.h1
-rw-r--r--src/core/stdhelp/src/stdafx.h1
-rw-r--r--src/core/stdidle/src/idle.cpp25
-rw-r--r--src/core/stdidle/src/stdafx.h1
-rw-r--r--src/core/stdmsg/src/msgoptions.cpp33
-rw-r--r--src/core/stduihist/src/stdafx.h1
-rw-r--r--src/core/stduserinfo/src/stdafx.h1
-rw-r--r--src/core/stduseronline/src/stdafx.h1
19 files changed, 0 insertions, 188 deletions
diff --git a/src/core/stdauth/src/stdafx.h b/src/core/stdauth/src/stdafx.h
index 627c26ecd1..353c02d116 100644
--- a/src/core/stdauth/src/stdafx.h
+++ b/src/core/stdauth/src/stdafx.h
@@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_addcontact.h>
#include <m_findadd.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stdautoaway/src/stdafx.h b/src/core/stdautoaway/src/stdafx.h
index 4425a5fd73..c590380a2d 100644
--- a/src/core/stdautoaway/src/stdafx.h
+++ b/src/core/stdautoaway/src/stdafx.h
@@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_awaymsg.h>
#include <m_idle.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp
index 10a3c1c309..d3013ea14f 100644
--- a/src/core/stdaway/src/sendmsg.cpp
+++ b/src/core/stdaway/src/sendmsg.cpp
@@ -534,31 +534,6 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM)
return 0;
}
-static int AwayMsgSendModernOptInit(WPARAM wParam, LPARAM)
-{
- if (protoModeMsgFlags == 0)
- return 0;
-
- static const int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
- MODERNOPT_CTRL_LAST
- };
-
- MODERNOPTOBJECT obj = { 0 };
- obj.cbSize = sizeof(obj);
- obj.hInstance = hInst;
- obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;
- obj.iSection = MODERNOPT_PAGE_STATUS;
- obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
- obj.iBoldControls = (int*)iBoldControls;
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_STATUS);
- obj.pfnDlgProc = DlgProcAwayMsgOpts;
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- return 0;
-}
-
static int AwayMsgSendAccountsChanged(WPARAM, LPARAM)
{
protoModeMsgFlags = 0;
@@ -581,7 +556,6 @@ static int AwayMsgSendModulesLoaded(WPARAM, LPARAM)
AwayMsgSendAccountsChanged(0, 0);
HookEvent(ME_CLIST_STATUSMODECHANGE, StatusModeChange);
- HookEvent(ME_MODERNOPT_INITIALIZE, AwayMsgSendModernOptInit);
HookEvent(ME_OPT_INITIALISE, AwayMsgOptInitialise);
return 0;
}
diff --git a/src/core/stdaway/src/stdafx.h b/src/core/stdaway/src/stdafx.h
index 5ac853c77c..6ad64d0f36 100644
--- a/src/core/stdaway/src/stdafx.h
+++ b/src/core/stdaway/src/stdafx.h
@@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_awaymsg.h>
#include <m_idle.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include <m_metacontacts.h>
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp
index 8468088d51..0beae07eec 100644
--- a/src/core/stdclist/src/clcopts.cpp
+++ b/src/core/stdclist/src/clcopts.cpp
@@ -443,28 +443,3 @@ int ClcOptInit(WPARAM wParam, LPARAM)
Options_AddPage(wParam, &odp);
return 0;
}
-
-int ClcModernOptInit(WPARAM wParam, LPARAM)
-{
- static int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2,
- MODERNOPT_CTRL_LAST
- };
-
- MODERNOPTOBJECT obj = { 0 };
- obj.cbSize = sizeof(obj);
- obj.dwFlags = MODEROPT_FLG_TCHAR;
- obj.hIcon = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
- obj.hInstance = g_hInst;
- obj.iSection = MODERNOPT_PAGE_SKINS;
- obj.iType = MODERNOPT_TYPE_SUBSECTIONPAGE;
- obj.lptzSubsection = LPGENW("Contact list");
- obj.iBoldControls = iBoldControls;
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLCBKG);
- obj.pfnDlgProc = DlgProcClcBkgOpts;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- return 0;
-}
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp
index 55cf7d2c49..8a92ee1146 100644
--- a/src/core/stdclist/src/clistopts.cpp
+++ b/src/core/stdclist/src/clistopts.cpp
@@ -208,29 +208,3 @@ int CListOptInit(WPARAM wParam, LPARAM)
Options_AddPage(wParam, &odp);
return 0;
}
-
-int CListModernOptInit(WPARAM wParam, LPARAM)
-{
- static int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2,
- 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_CLIST;
- obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
- obj.iBoldControls = iBoldControls;
- obj.lpzClassicGroup = LPGEN("Contact list");
- obj.lpzClassicPage = "List";
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLIST);
- obj.pfnDlgProc = DlgProcGenOpts;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- return 0;
-}
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp
index b4835091e3..e97dcc9667 100644
--- a/src/core/stdclist/src/cluiopts.cpp
+++ b/src/core/stdclist/src/cluiopts.cpp
@@ -331,34 +331,3 @@ int CluiOptInit(WPARAM wParam, LPARAM)
Options_AddPage(wParam, &odp);
return 0;
}
-
-int CluiModernOptInit(WPARAM wParam, LPARAM)
-{
- static int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_SHOWSBAR,
- 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_CLIST;
- obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
- obj.iBoldControls = iBoldControls;
- obj.lpzClassicGroup = LPGEN("Contact list");
- obj.lpzClassicPage = "List";
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_CLUI);
- obj.pfnDlgProc = DlgProcCluiOpts;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_SBAR);
- obj.pfnDlgProc = DlgProcSBarOpts;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- return 0;
-}
diff --git a/src/core/stdclist/src/init.cpp b/src/core/stdclist/src/init.cpp
index 3e0b594684..75caafbfd1 100644
--- a/src/core/stdclist/src/init.cpp
+++ b/src/core/stdclist/src/init.cpp
@@ -91,10 +91,8 @@ static int OnAccountsChanged(WPARAM, LPARAM)
/////////////////////////////////////////////////////////////////////////////////////////
// called when all modules got loaded
-static int OnModernOptsInit(WPARAM wParam, LPARAM lParam);
static int OnModulesLoaded(WPARAM, LPARAM)
{
- HookEvent(ME_MODERNOPT_INITIALIZE, OnModernOptsInit);
RegisterCListFonts();
himlCListClc = Clist_GetImageList();
return 0;
@@ -111,14 +109,6 @@ static int OnOptsInit(WPARAM wParam, LPARAM lParam)
return 0;
}
-static int OnModernOptsInit(WPARAM wParam, LPARAM lParam)
-{
- ClcModernOptInit(wParam, lParam);
- CListModernOptInit(wParam, lParam);
- CluiModernOptInit(wParam, lParam);
- return 0;
-}
-
/////////////////////////////////////////////////////////////////////////////////////////
// menu status services
diff --git a/src/core/stdclist/src/stdafx.h b/src/core/stdclist/src/stdafx.h
index 35286fe2f9..c5b5d0a3a7 100644
--- a/src/core/stdclist/src/stdafx.h
+++ b/src/core/stdclist/src/stdafx.h
@@ -43,7 +43,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_langpack.h>
#include <m_button.h>
#include <m_options.h>
-#include <m_modernopt.h>
#include <m_protosvc.h>
#include <m_utils.h>
#include <m_skin.h>
diff --git a/src/core/stdcrypt/src/stdafx.h b/src/core/stdcrypt/src/stdafx.h
index aa3396790a..1300a88bb4 100644
--- a/src/core/stdcrypt/src/stdafx.h
+++ b/src/core/stdcrypt/src/stdafx.h
@@ -56,7 +56,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_findadd.h>
#include <m_ignore.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include <m_string.h>
#include <m_crypto.h>
diff --git a/src/core/stdemail/src/stdafx.h b/src/core/stdemail/src/stdafx.h
index f97989a83d..a77ba9146e 100644
--- a/src/core/stdemail/src/stdafx.h
+++ b/src/core/stdemail/src/stdafx.h
@@ -57,7 +57,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_findadd.h>
#include <m_email.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stdfile/src/stdafx.h b/src/core/stdfile/src/stdafx.h
index d36254e79a..c9f0c27d3f 100644
--- a/src/core/stdfile/src/stdafx.h
+++ b/src/core/stdfile/src/stdafx.h
@@ -64,7 +64,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_findadd.h>
#include <m_file.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include <m_metacontacts.h>
#include <m_string.h>
diff --git a/src/core/stdhelp/src/stdafx.h b/src/core/stdhelp/src/stdafx.h
index 6ff81726a5..d7dd0726c8 100644
--- a/src/core/stdhelp/src/stdafx.h
+++ b/src/core/stdhelp/src/stdafx.h
@@ -56,7 +56,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_userinfo.h>
#include <m_findadd.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stdidle/src/idle.cpp b/src/core/stdidle/src/idle.cpp
index 8a04285c2b..6176f7baa2 100644
--- a/src/core/stdidle/src/idle.cpp
+++ b/src/core/stdidle/src/idle.cpp
@@ -369,30 +369,6 @@ static INT_PTR IdleGetInfo(WPARAM, LPARAM lParam)
return 0;
}
-static int IdleModernOptInit(WPARAM wParam, LPARAM)
-{
- static const int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
- MODERNOPT_CTRL_LAST
- };
-
- MODERNOPTOBJECT obj = {0};
- obj.cbSize = sizeof(obj);
- obj.hInstance = hInst;
- obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;
- obj.iSection = MODERNOPT_PAGE_STATUS;
- obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
- obj.iBoldControls = (int*)iBoldControls;
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_IDLE);
- obj.pfnDlgProc = IdleOptsDlgProc;
-// obj.lpzClassicGroup = "Status";
-// obj.lpzClassicPage = "Messages";
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
- return 0;
-}
-
int LoadIdleModule(void)
{
bModuleInitialized = TRUE;
@@ -401,7 +377,6 @@ int LoadIdleModule(void)
IdleObject_Create(&gIdleObject);
CreateServiceFunction(MS_IDLE_GETIDLEINFO, IdleGetInfo);
HookEvent(ME_OPT_INITIALISE, IdleOptInit);
- HookEvent(ME_MODERNOPT_INITIALIZE, IdleModernOptInit);
return 0;
}
diff --git a/src/core/stdidle/src/stdafx.h b/src/core/stdidle/src/stdafx.h
index ce1877ea9f..920188e6dc 100644
--- a/src/core/stdidle/src/stdafx.h
+++ b/src/core/stdidle/src/stdafx.h
@@ -58,7 +58,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_findadd.h>
#include <m_idle.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp
index 1fdeb19cad..60480f1715 100644
--- a/src/core/stdmsg/src/msgoptions.cpp
+++ b/src/core/stdmsg/src/msgoptions.cpp
@@ -22,7 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "stdafx.h"
#include "m_fontservice.h"
-#include "m_modernopt.h"
int ChatOptionsInitialize(WPARAM);
@@ -637,39 +636,7 @@ static int OptInitialise(WPARAM wParam, LPARAM)
return 0;
}
-static int ModernOptInitialise(WPARAM wParam, LPARAM)
-{
- static int iBoldControls[] =
- {
- IDC_TXT_TITLE1, IDC_TXT_TITLE2, IDC_TXT_TITLE3,
- MODERNOPT_CTRL_LAST
- };
-
- MODERNOPTOBJECT obj = { sizeof(obj) };
- obj.dwFlags = MODEROPT_FLG_TCHAR | MODEROPT_FLG_NORESIZE;
- obj.hIcon = Skin_LoadIcon(SKINICON_EVENT_MESSAGE);
- obj.hInstance = g_hInst;
- obj.iSection = MODERNOPT_PAGE_MSGS;
- obj.iType = MODERNOPT_TYPE_SECTIONPAGE;
- obj.iBoldControls = iBoldControls;
- obj.lpzClassicGroup = nullptr;
- obj.lpzClassicPage = "Message Sessions";
- obj.lpzClassicTab = "Messaging";
- obj.lpzHelpUrl = "https://wiki.miranda-ng.org/";
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_MSGDLG);
- obj.pfnDlgProc = DlgProcOptions;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
-
- obj.lpzTemplate = MAKEINTRESOURCEA(IDD_MODERNOPT_MSGLOG);
- obj.pfnDlgProc = DlgProcLogOptions;
- CallService(MS_MODERNOPT_ADDOBJECT, wParam, (LPARAM)&obj);
-
- return 0;
-}
-
void InitOptions(void)
{
HookEvent(ME_OPT_INITIALISE, OptInitialise);
- HookEvent(ME_MODERNOPT_INITIALIZE, ModernOptInitialise);
}
diff --git a/src/core/stduihist/src/stdafx.h b/src/core/stduihist/src/stdafx.h
index 09a09e1dd2..8acbb3e65c 100644
--- a/src/core/stduihist/src/stdafx.h
+++ b/src/core/stduihist/src/stdafx.h
@@ -57,7 +57,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_history.h>
#include <m_findadd.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stduserinfo/src/stdafx.h b/src/core/stduserinfo/src/stdafx.h
index a7aa8865d7..1267720fd5 100644
--- a/src/core/stduserinfo/src/stdafx.h
+++ b/src/core/stduserinfo/src/stdafx.h
@@ -59,7 +59,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_userinfo.h>
#include <m_findadd.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
diff --git a/src/core/stduseronline/src/stdafx.h b/src/core/stduseronline/src/stdafx.h
index 87f73876c6..fcb9b4b93c 100644
--- a/src/core/stduseronline/src/stdafx.h
+++ b/src/core/stduseronline/src/stdafx.h
@@ -57,7 +57,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include <m_findadd.h>
#include <m_ignore.h>
#include <m_icolib.h>
-#include <m_modernopt.h>
#include <m_timezones.h>
#include "version.h"
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 18:29:47 +0000