diff options
184 files changed, 369 insertions, 342 deletions
diff --git a/include/m_options.h b/include/m_options.h index 0b2112d1aa..b8e0404425 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -82,9 +82,9 @@ struct OPTIONSDIALOGPAGE #define PSM_GETBOLDFONT (WM_USER+102) //returns HFONT used for group box titles
-EXTERN_C MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int = hLangpack);
+EXTERN_C MIR_APP_DLL(int) Options_AddPage(WPARAM wParam, OPTIONSDIALOGPAGE *odp, int langId);
-EXTERN_C MIR_APP_DLL(void) KillModuleOptions(int _hLang);
+EXTERN_C MIR_APP_DLL(void) KillModuleOptions(int langId);
// The behaviour if the options dialog is already open is that it will just be
// activated, the page won't be changed. This may change in the future.
@@ -95,9 +95,9 @@ EXTERN_C MIR_APP_DLL(void) KillModuleOptions(int _hLang); // Opens the options dialog, optionally at the specified page
// Returns 0 on success, nonzero on failure
-EXTERN_C MIR_APP_DLL(int) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage = nullptr, const wchar_t *pszTab = nullptr, int = hLangpack);
+EXTERN_C MIR_APP_DLL(int) Options_Open(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, int langId);
// Opens the options dialog, with only specified page
-EXTERN_C MIR_APP_DLL(HWND) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage = nullptr, const wchar_t *pszTab = nullptr, int = hLangpack);
+EXTERN_C MIR_APP_DLL(HWND) Options_OpenPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab, int langId);
#endif //M_OPTIONS_H__
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index ed6d733bcb..bb86189e87 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -193,6 +193,10 @@ public: Icon_RegisterT(m_hInst, szSection, pIcons, _Size, prefix, m_hLang);
}
+ int addOptions(WPARAM wParam, struct OPTIONSDIALOGPAGE *odp);
+ void openOptions(const wchar_t *pszGroup, const wchar_t *pszPage = 0, const wchar_t *pszTab = 0);
+ void openOptionsPage(const wchar_t *pszGroup, const wchar_t *pszPage = 0, const wchar_t *pszTab = 0);
+
int addSound(const char *name, const wchar_t *section, const wchar_t *description, const wchar_t *defaultFile = nullptr);
int addUserInfo(WPARAM wParam, struct OPTIONSDIALOGPAGE *odp);
diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib Binary files differindex 68726b54f8..2de5994482 100644 --- a/libs/win32/mir_app.lib +++ b/libs/win32/mir_app.lib diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib Binary files differindex fbb7380679..36904e7dd1 100644 --- a/libs/win64/mir_app.lib +++ b/libs/win64/mir_app.lib diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index aed11c808d..7b5998bf13 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -715,17 +715,17 @@ int OptInit(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Protocols"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PICTS); odp.pfnDlgProc = DlgProcOptionsProtos; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.a = LPGEN("Contact avatars"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_AVATARS); odp.pfnDlgProc = DlgProcOptionsAvatars; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.a = LPGEN("Own avatars"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_OWN); odp.pfnDlgProc = DlgProcOptionsOwn; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 69759eb1d6..9836ab3858 100755 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -383,7 +383,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND:
switch (LOWORD(wParam)) {
case ID_REMINDERFRAMECONTEXT_OPTIONS:
- Options_Open(L"Events", L"Alarms");
+ g_plugin.openOptions(L"Events", L"Alarms");
break;
case ID_REMINDERFRAMECONTEXT_SUSPEND:
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 3dc22dccba..d756fe850f 100755 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -1218,7 +1218,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Events");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/AsSingleWindow/src/Options.cpp b/plugins/AsSingleWindow/src/Options.cpp index 383e0422d2..3e0567fb3e 100644 --- a/plugins/AsSingleWindow/src/Options.cpp +++ b/plugins/AsSingleWindow/src/Options.cpp @@ -12,7 +12,7 @@ int InitOptions(WPARAM wParam, LPARAM) Opts.hInstance = g_plugin.getInst(); Opts.flags = ODPF_BOLDGROUPS; - Options_AddPage(wParam, &Opts); + g_plugin.addOptions(wParam, &Opts); return 0; } diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index a71fca6050..f3b2a8ab05 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -920,7 +920,7 @@ static int AssocListOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Associations"); // autotranslated
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = AssocListOptDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp index be4a169827..750cbe670c 100644 --- a/plugins/AuthState/src/options.cpp +++ b/plugins/AuthState/src/options.cpp @@ -26,6 +26,6 @@ int onOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Auth state");
odp.flags = ODPF_BOLDGROUPS;
odp.pDialog = new COptionsDialog;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp index f8c0950e83..c9e009c9aa 100644 --- a/plugins/AutoRun/src/main.cpp +++ b/plugins/AutoRun/src/main.cpp @@ -116,7 +116,7 @@ static int AutorunOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Services");
odp.pfnDlgProc = DlgProcAutorunOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index df9cc47f9b..cf06e45ce7 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -114,7 +114,7 @@ static int ShutdownOptInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Automatic shutdown"); /* autotranslated, can be made a tab */
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = ShutdownOptDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index 2c82d7d4df..e54ef15296 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -323,7 +323,7 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L break;
case IDC_URL_IDLE:
- Options_Open(L"Status", L"Idle");
+ g_plugin.openOptions(L"Status", L"Idle");
return TRUE;
case IDC_COMBO_SHUTDOWNTYPE:
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index 79caebdbf1..08b6af4239 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -153,7 +153,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.szGroup.w = LPGENW("Popups");
@@ -161,7 +161,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = PopupsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index a8a5bc0d6b..ce179545b3 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -322,7 +322,7 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = OptionsProc;
odp.szGroup.a = LPGEN("Sounds");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index d6e8487d23..ebac3bd0c5 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -533,7 +533,7 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP DlgReturn(TRUE);
case IDM_CONFIG:
- Options_Open(nullptr, LPGENW("History"));
+ g_plugin.openOptions(nullptr, LPGENW("History"));
DlgReturn(TRUE);
case IDM_DELETE:
@@ -1766,13 +1766,13 @@ void HistoryWindow::ConfigToolbarClicked(LPNMTOOLBAR lpnmTB) SendMessage(m_hWnd, WM_COMMAND, IDM_CONFIG, 0);
break;
case IDM_FONTS:
- Options_Open(L"Customize", L"Fonts and colors");
+ g_plugin.openOptions(L"Customize", L"Fonts and colors");
break;
case IDM_ICONS:
- Options_Open(L"Customize", L"Icons");
+ g_plugin.openOptions(L"Customize", L"Icons");
break;
case IDM_HOTKEYS:
- Options_Open(L"Customize", L"Hotkeys");
+ g_plugin.openOptions(L"Customize", L"Hotkeys");
break;
case IDM_SAVEPOS:
SavePos(false);
diff --git a/plugins/BasicHistory/src/Options.cpp b/plugins/BasicHistory/src/Options.cpp index 8e9ed171f4..0c13190e5a 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -126,32 +126,32 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Group list");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GROUPLIST);
odp.pfnDlgProc = Options::DlgProcOptsGroupList;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MESSAGES);
odp.pfnDlgProc = Options::DlgProcOptsMessages;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Searching");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SEARCHING);
odp.pfnDlgProc = Options::DlgProcOptsSearching;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Export");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXPORT);
odp.pfnDlgProc = Options::DlgProcOptsExport;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Scheduler");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SCHEDULER);
odp.pfnDlgProc = Options::DlgProcOptsScheduler;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);
odp.pfnDlgProc = Options::DlgProcOptsMain;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index 16b988ec1c..1c1f2f51a4 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -446,12 +446,12 @@ static int MessageOptInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = MainDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN);
odp.szTab.a = TAB_GENERAL;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pfnDlgProc = EngineDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ENGINE);
odp.szTab.a = TAB_ENGINE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 2779438530..14c24b4eed 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -184,7 +184,7 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam return true;
case IDC_MAINOPT_LNK_HOTKEY:
- Options_Open(L"Customize", L"Hotkeys");
+ g_plugin.openOptions(L"Customize", L"Hotkeys");
return true;
}
return 0;
@@ -323,11 +323,11 @@ int OptsDlgInit(WPARAM wParam, LPARAM) optDi.szGroup.a = LPGEN("Events");
optDi.szTab.a = LPGEN("Main");
optDi.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
optDi.pfnDlgProc = AdvOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_OPTDIALOGADV);
optDi.szTab.a = LPGEN("Advanced");
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
return 0;
}
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 03dbb7eb43..327f40a910 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -438,13 +438,13 @@ static int OptionsInit(WPARAM wParam, LPARAM) odp.szTitle.w = LPGENW("Buddy Expectator");
odp.pfnDlgProc = OptionsFrameProc;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.szGroup.w = LPGENW("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPPANEL);
odp.pfnDlgProc = PopupOptionsFrameProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index d9cb8d0b45..3dfb782687 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -89,7 +89,7 @@ int BuddyPounceOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Message sessions");
odp.szTitle.w = LPGENW("Buddy Pounce");
odp.pfnDlgProc = BuddyPounceOptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 417948bd17..657f36374b 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -83,7 +83,7 @@ static int OnInitOptions(WPARAM wparam, LPARAM) odp.szGroup.w = L"Status"; odp.szTitle.w = MODULENAME; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - Options_AddPage(wparam, &odp); + g_plugin.addOptions(wparam, &odp); return 0; } diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index bc339f1435..30e14780fd 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -147,13 +147,13 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgMainProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPTION_FORM);
odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgPopupsProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index 57653c71aa..0095a2a4cc 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -169,7 +169,7 @@ int OptionsDlgInit(WPARAM wParam, LPARAM) optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
optDi.hInstance = g_plugin.getInst();
optDi.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
}
return 0;
}
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 1cf731ec71..d06c5d8d93 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -261,6 +261,6 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("List");
odp.pfnDlgProc = DlgProcClcMainOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index 48434dad55..69e6a904af 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -187,6 +187,6 @@ int CListOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcGenOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 77be347ef1..aba4a28ad1 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -314,12 +314,12 @@ int CluiOptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
odp.szTitle.a = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 4e3007ab9f..857b661cb3 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -1522,7 +1522,7 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTab.a = it.name;
odp.pfnDlgProc = it.wnd_proc;
odp.flags = ODPF_BOLDGROUPS | it.flag;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
if (g_CluiData.fDisableSkinEngine) {
@@ -1532,7 +1532,7 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("List background");
odp.pfnDlgProc = DlgProcClcBkgOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 8887a3cbfd..4481781157 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -941,7 +941,7 @@ int CListOptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(it.id);
odp.szTab.a = it.name;
odp.pfnDlgProc = it.wnd_proc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index b1dfa879bd..785408f3a6 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -56,7 +56,7 @@ int SkinOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Skins"); odp.szTitle.w = LPGENW("Contact list"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); } return 0; } diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 78cba2f7cf..01a94b2df5 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -525,27 +525,27 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgProcGenOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("List layout");
odp.pfnDlgProc = DlgProcClcMainOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Window");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Background");
odp.pfnDlgProc = DlgProcClcBkgOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
////////////////////////////////////////////////////////////////////////////
// Contact rows tabs
@@ -557,22 +557,22 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = DlgProcDspItems;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPITEMS);
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Groups and layout");
odp.pfnDlgProc = DlgProcDspGroups;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPGROUPS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcDspAdvanced;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPADVANCED);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Icons");
odp.pfnDlgProc = DlgProcIcons;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICONS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
////////////////////////////////////////////////////////////////////////////
// Other options
@@ -582,7 +582,7 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Contact list");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/CloudFile/src/options.cpp b/plugins/CloudFile/src/options.cpp index 1277aed11c..4a3ae86250 100644 --- a/plugins/CloudFile/src/options.cpp +++ b/plugins/CloudFile/src/options.cpp @@ -80,7 +80,7 @@ int OnOptionsInitialized(WPARAM wParam, LPARAM) //odp.szTab.w = LPGENW("General"); odp.pDialog = new COptionsMainDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index 2e322ff362..53b51ee22a 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -598,7 +598,7 @@ int ConnectionNotifyOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Plugins");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcConnectionNotifyOpts;//callback function name
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 2b8e490839..f9c47a74a5 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1060,7 +1060,7 @@ static int OptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Console");
odp.pfnDlgProc = OptDlgProc;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/CountryFlags/src/options.cpp b/plugins/CountryFlags/src/options.cpp index d47bf75963..df5ac76dc5 100644 --- a/plugins/CountryFlags/src/options.cpp +++ b/plugins/CountryFlags/src/options.cpp @@ -91,6 +91,6 @@ int OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Country Flags"); /* autotranslated, can be made a tab */
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = ExtraImgOptDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index b2c23dbfbd..16fdc7282e 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -213,7 +213,7 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Services");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index d0a328e39b..fe00cf272d 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -310,7 +310,7 @@ static int OnOptionsInit(PVOID obj, WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Database");
odp.pfnDlgProc = DlgProcOptions;
odp.dwInitParam = (LPARAM)obj;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index 1dedfec9d5..1698814b4d 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -506,7 +506,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) refreshTree(1);
break;
case MENU_OPEN_OPTIONS:
- Options_Open(L"Database", _A2W(modFullname));
+ g_plugin.openOptions(L"Database", _A2W(modFullname));
break;
}
return TRUE; // case WM_COMMAND
diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index 7b2b6297c1..f7bc725573 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -63,6 +63,6 @@ INT OptInit(WPARAM wParam, LPARAM) odp.szTitle.a = modFullname;
odp.pfnDlgProc = DlgProcOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp index 23974a9d85..803193cccd 100644 --- a/plugins/Db_autobackups/src/options.cpp +++ b/plugins/Db_autobackups/src/options.cpp @@ -206,7 +206,7 @@ void COptionsDlg::BrowseFolder_OnClick(CCtrlButton*) void COptionsDlg::FoldersPageLink_OnClick(CCtrlHyperlink*)
{
- Options_Open(L"Customize", L"Folders");
+ g_plugin.openOptions(L"Customize", L"Folders");
}
void COptionsDlg::SetDialogState()
@@ -330,7 +330,7 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Automatic backups");
odp.szGroup.a = LPGEN("Database");
odp.pDialog = new COptionsDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Dbx_mdbx/src/ui.cpp b/plugins/Dbx_mdbx/src/ui.cpp index 3a24d00c63..83caaab11e 100644 --- a/plugins/Dbx_mdbx/src/ui.cpp +++ b/plugins/Dbx_mdbx/src/ui.cpp @@ -167,7 +167,7 @@ static int OnOptionsInit(PVOID obj, WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS;
odp.szTitle.a = LPGEN("Database");
odp.pDialog = new COptionsDialog((CDbxMDBX*)obj);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index 3286622a22..479a0c05ff 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -80,7 +80,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Plugins");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/FTPFileYM/src/options.cpp b/plugins/FTPFileYM/src/options.cpp index e37e9bc84b..eff7b5e7bd 100644 --- a/plugins/FTPFileYM/src/options.cpp +++ b/plugins/FTPFileYM/src/options.cpp @@ -256,11 +256,11 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FTPFILE);
odp.pfnDlgProc = Options::DlgProcOptsAccounts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = Options::DlgProcOptsAdvanced;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index 27f2946cdb..55f1c10d6c 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -173,7 +173,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA break;
case IDC_BTN_FONTS:
- Options_Open(L"Customize", L"Fonts and colors");
+ g_plugin.openOptions(L"Customize", L"Fonts and colors");
break;
case IDC_TXT_RADIUS:
@@ -261,6 +261,6 @@ int ProcessOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Favorites");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 5a6d541c6d..608e465691 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -163,7 +163,7 @@ int OnOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Events");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 18ee7372bd..67c6971ea9 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -118,6 +118,6 @@ int OnOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.w = LPGENW("Fingerprint");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index f34b610674..feec786728 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -340,11 +340,11 @@ int OnOptionsInitialize(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Main Features");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptWndProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
odp.szTab.a = LPGEN("Appearance");
odp.pfnDlgProc = OptSknWndProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index 45b38585f4..df0756e5d6 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -253,7 +253,7 @@ static int OnOptionsInitialize(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Customize");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp index d39f25ae2e..7d3729a0e5 100644 --- a/plugins/GmailNotifier/src/options.cpp +++ b/plugins/GmailNotifier/src/options.cpp @@ -278,6 +278,6 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Network");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 6fd41c2625..c7ff424622 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1346,7 +1346,7 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) odp.szTitle.w = LPGENW("HTTP Server");
odp.szGroup.w = LPGENW("Network");
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index a084d2d202..85b1cc546e 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -57,7 +57,7 @@ static int InitOptionsDlg(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_DLG);
odp.pfnDlgProc = OptionsDlgProc;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 212485233a..de199bd0df 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -88,7 +88,7 @@ namespace mu odp.szGroup.w = const_cast<wchar_t*>(pszGroup);
odp.flags = flags | ODPF_UNICODE;
odp.szTab.w = const_cast<wchar_t*>(pszTab);
- Options_AddPage(addInfo, &odp);
+ g_plugin.addOptions(addInfo, &odp);
}
}
diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index 7a49032bfa..61364a1907 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -276,6 +276,6 @@ int HSOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("History");
odp.pfnDlgProc = DlgProcHSOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index d16be454d7..589264af6b 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -127,7 +127,7 @@ int initializeOptions(WPARAM wParam, LPARAM) OptDlgPg.szTitle.w = LPGENW("Hardware HotKeys");
OptDlgPg.pfnDlgProc = OptDlgProc;
OptDlgPg.langId = hLangpack;
- Options_AddPage(wParam, &OptDlgPg);
+ g_plugin.addOptions(wParam, &OptDlgPg);
return 0;
}
diff --git a/plugins/IEHistory/src/events.cpp b/plugins/IEHistory/src/events.cpp index 175bfff144..e092c681e3 100644 --- a/plugins/IEHistory/src/events.cpp +++ b/plugins/IEHistory/src/events.cpp @@ -44,6 +44,6 @@ int OnOptionsInitialize(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HISTORY); odp.hInstance = g_plugin.getInst(); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 242222a2f9..1ca8ece36c 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -443,7 +443,7 @@ int IEViewOptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(tabPages[0].dlgId);
odp.pfnDlgProc = tabPages[0].dlgProc;
odp.szTab.w = tabPages[0].tabName;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szGroup.w = LPGENW("Skins");
odp.szTitle.w = LPGENW("IEView");
@@ -451,7 +451,7 @@ int IEViewOptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);
odp.pfnDlgProc = tabPages[i].dlgProc;
odp.szTab.w = tabPages[i].tabName;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp index 8db1304186..a7b1e0ca94 100644 --- a/plugins/IgnoreState/src/options.cpp +++ b/plugins/IgnoreState/src/options.cpp @@ -110,6 +110,6 @@ int onOptInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_IGNORE_OPT);
odp.szTitle.a = LPGEN("Ignore State");
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index a66c01ca97..7f993f1291 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -1390,6 +1390,6 @@ int InitializeOptions(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Events"); odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOptions; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index acc6bc175b..295d87c4d7 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -79,18 +79,18 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Format");
odp.pfnDlgProc = FormatDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_FORMAT);
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Players");
odp.pfnDlgProc = PlayersDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PLAYERS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index 07f3a32830..673a130b88 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1480,17 +1480,17 @@ int LotusNotifyOptInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Connection");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_CONECTION);
odp.pfnDlgProc = DlgProcLotusNotifyConnectionOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Popup");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_POPUP);
odp.pfnDlgProc = DlgProcLotusNotifyPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Miscellaneous");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_MISC);
odp.pfnDlgProc = DlgProcLotusNotifyMiscOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/MagneticWindows/src/Options.cpp b/plugins/MagneticWindows/src/Options.cpp index 47acc990cb..1f90473801 100644 --- a/plugins/MagneticWindows/src/Options.cpp +++ b/plugins/MagneticWindows/src/Options.cpp @@ -84,7 +84,7 @@ int InitOptions(WPARAM wParam, LPARAM) Opt.szGroup.a = LPGEN("Customize"); Opt.szTitle.a = LPGEN("Magnetic Windows"); Opt.flags = ODPF_BOLDGROUPS; - Options_AddPage(wParam, &Opt); + g_plugin.addOptions(wParam, &Opt); return 0; } diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index e7e176062a..71b2676e04 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -676,7 +676,7 @@ static INT_PTR onCopyMirVer(WPARAM wparam, LPARAM lparam) static INT_PTR OpenIgnoreOptions(WPARAM, LPARAM)
{
- Options_Open(L"Contacts", L"Ignore");
+ g_plugin.openOptions(L"Contacts", L"Ignore");
return 0;
}
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp index f9505d84dc..eeee4998c6 100644 --- a/plugins/MenuItemEx/src/options.cpp +++ b/plugins/MenuItemEx/src/options.cpp @@ -104,6 +104,6 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.pfnDlgProc = OptionsProc;
odp.szGroup.a = LPGEN("Customize");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
return 0;
}
diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index 7cb9a470e7..4fef2aa8c7 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -680,19 +680,19 @@ int OptInit(WPARAM wParam, LPARAM) { odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
odp.szTab.a = LPGEN("Options");
odp.pfnDlgProc = DlgProcOpts_Tab1;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
//2 - contacts
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT2);
odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcOpts_Tab2;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
//3 - accounts
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT3);
odp.szTab.a = LPGEN("Accounts");
odp.pfnDlgProc = DlgProcOpts_Tab3;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/MirLua/src/Modules/m_options.cpp b/plugins/MirLua/src/Modules/m_options.cpp index babcfe3909..f956885bb7 100644 --- a/plugins/MirLua/src/Modules/m_options.cpp +++ b/plugins/MirLua/src/Modules/m_options.cpp @@ -92,7 +92,7 @@ int opt_AddPage(lua_State *L) OPTIONSDIALOGPAGE odp = { 0 }; MakeOptionDialogPage(L, odp); - INT_PTR res = Options_AddPage(wParam, &odp); + INT_PTR res = g_plugin.addOptions(wParam, &odp); lua_pushboolean(L, !res); mir_free(odp.szGroup.w); diff --git a/plugins/MirLua/src/main.cpp b/plugins/MirLua/src/main.cpp index 08390a557a..c37c75bf9b 100644 --- a/plugins/MirLua/src/main.cpp +++ b/plugins/MirLua/src/main.cpp @@ -41,7 +41,7 @@ int OnOptionsInit(WPARAM wParam, LPARAM) odp.szTitle.w = L"Lua";
odp.szTab.w = LPGENW("Scripts");
odp.pDialog = new CMLuaOptions();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp index f8419c40c1..b0cd74e3ba 100644 --- a/plugins/MirOTR/src/options.cpp +++ b/plugins/MirOTR/src/options.cpp @@ -836,22 +836,22 @@ static int OpenOptions(WPARAM wParam, LPARAM) odp.szTab.w = LANG_OPT_GENERAL; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL); odp.pfnDlgProc = DlgProcMirOTROpts; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LANG_OPT_PROTO; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PROTO); odp.pfnDlgProc = DlgProcMirOTROptsProto; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LANG_OPT_CONTACTS; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACTS); odp.pfnDlgProc = DlgProcMirOTROptsContacts; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LANG_OPT_FINGER; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FINGER); odp.pfnDlgProc = DlgProcMirOTROptsFinger; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp index 1aba05e6d0..26c8f2b0dd 100644 --- a/plugins/MirandaG15/src/CConfig.cpp +++ b/plugins/MirandaG15/src/CConfig.cpp @@ -252,25 +252,25 @@ int CConfig::InitOptionsDialog(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Appearance");
odp.szGroup.a = LPGEN("MirandaG15");
odp.pfnDlgProc = CConfig::AppearanceDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_NOTIFICATIONS);
odp.szTitle.a = LPGEN("Notifications");
odp.pfnDlgProc = CConfig::NotificationsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CHAT);
odp.szTitle.a = LPGEN("Chat sessions");
odp.pfnDlgProc = CConfig::ChatDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLIST);
odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = CConfig::ContactlistDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index 579a272200..dc2f5cfea3 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -203,7 +203,7 @@ int HookedOptions(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Popups");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index f51b662ab7..4b3bab4c98 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -1235,12 +1235,12 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) odp.szGroup.w = LPGENW("History");
odp.szTab.w = LPGENW("General");
odp.pfnDlgProc = DlgProcMsgExportOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.position = 100000001;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT2);
odp.szTab.w = LPGENW("Additional");
odp.pfnDlgProc = DlgProcMsgExportOpts2;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp index 827a598056..6ee25f1604 100644 --- a/plugins/MyDetails/src/options.cpp +++ b/plugins/MyDetails/src/options.cpp @@ -169,7 +169,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Contact list");
odp.szTitle.w = LPGENW("My details");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp index be2996772e..53a2ee4ecd 100644 --- a/plugins/NewAwaySysMod/src/AwayOpt.cpp +++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp @@ -1027,22 +1027,22 @@ int OptsDlgInit(WPARAM wParam, LPARAM) optDi.pfnDlgProc = MessagesOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES);
optDi.szTab.a = LPGEN("Status messages");
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
optDi.pfnDlgProc = MoreOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MOREOPTDIALOG);
optDi.szTab.a = LPGEN("Main options");
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
optDi.pfnDlgProc = AutoreplyOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_AUTOREPLY);
optDi.szTab.a = LPGEN("Autoreply");
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
optDi.pfnDlgProc = ContactsOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACTSOPTDLG);
optDi.szTab.a = LPGEN("Contacts");
- Options_AddPage(wParam, &optDi);
+ g_plugin.addOptions(wParam, &optDi);
return 0;
}
diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp index f943a37a9d..933fc75dbc 100644 --- a/plugins/NewEventNotify/src/options.cpp +++ b/plugins/NewEventNotify/src/options.cpp @@ -296,7 +296,7 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo) odp.szGroup.a = LPGEN("Popups");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(addInfo, &odp);
+ g_plugin.addOptions(addInfo, &odp);
}
return 0;
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 1187e17cab..8c3e5954b8 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -1181,22 +1181,22 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL);
odp.pfnDlgProc = DlgProcGeneralOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Status logging");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOG);
odp.pfnDlgProc = DlgProcLogOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Extra status logging");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XLOG);
odp.pfnDlgProc = DlgProcXLogOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Filtering");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILTERS);
odp.pfnDlgProc = DlgProcFiltering;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.szTitle.a = LPGEN("Status Notify");
@@ -1204,17 +1204,17 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProcPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Extra status");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XPOPUP);
odp.pfnDlgProc = DlgProcXPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Status message");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMPOPUP);
odp.pfnDlgProc = DlgProcSMPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 650a703c05..23ff125f22 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -1069,18 +1069,18 @@ int GpgOptInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Main"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pDialog = new COptGpgMainDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LPGENW("GnuPG Variables"); odp.pDialog = new COptGpgBinDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LPGENW("Messages"); odp.pDialog = new COptGpgMsgDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LPGENW("Advanced"); odp.pDialog = new COptGpgAdvDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp index 86ce209c22..b0fad183f5 100644 --- a/plugins/NewsAggregator/Src/Options.cpp +++ b/plugins/NewsAggregator/Src/Options.cpp @@ -1069,6 +1069,6 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Network");
odp.szTitle.w = LPGENW("News Aggregator");
odp.pDialog = new COptionsMain();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp index 4cb6b5fd65..c0eba96e71 100644 --- a/plugins/NoHistory/src/options.cpp +++ b/plugins/NoHistory/src/options.cpp @@ -227,7 +227,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("History");
odp.szTab.w = LPGENW("Logging");
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index e9e4e84a06..c2d73aeb5f 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -54,7 +54,7 @@ int NimcOptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Plugins");
odp.szTitle.a = LPGEN("Non-IM Contacts");
odp.pfnDlgProc = DlgProcNimcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
//=====================================================
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index b39e5dc082..81daebc34f 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -134,7 +134,7 @@ static int OnOptInitialise(WPARAM w, LPARAM) odp.szTitle.a = SECTIONNAME;
odp.szGroup.a = LPGEN("Plugins");
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
return 0;
}
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index d468ff11bc..d26cb7131c 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -179,6 +179,6 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = g_plugin.getInst();
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp index 3d1c77c654..157cc48682 100644 --- a/plugins/Nudge/src/options.cpp +++ b/plugins/Nudge/src/options.cpp @@ -381,12 +381,12 @@ int NudgeOptInit(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Nudge");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcNudgeOpt;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.position = -790000001;
odp.szTab.a = LPGEN("Window Shaking");
odp.pfnDlgProc = DlgProcShakeOpt;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHAKE);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index 49649a9f66..5758e734b6 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -101,7 +101,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA break;
case IDC_LINK_HOTKEY:
- Options_Open(L"Customize", L"Hotkeys");
+ g_plugin.openOptions(L"Customize", L"Hotkeys");
return true;
case IDC_MSG_BOXES2:
@@ -388,14 +388,14 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Services");
odp.szTitle.w = LPGENW("Pack Updater");
odp.pfnDlgProc = UpdateNotifyOptsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
odp.szGroup.w = LPGENW("Popups");
odp.szTitle.w = LPGENW("Pack Updater");
odp.pfnDlgProc = DlgPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 70a578ce7c..1077714690 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -687,12 +687,12 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Main");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);
odp.pfnDlgProc = Options::DlgProcOptsMain;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Web page");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PAGES);
odp.pfnDlgProc = Options::DlgProcOptsPages;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index 5be6572852..b1753d5143 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -505,12 +505,12 @@ int PingOptInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Settings");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG1);
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Hosts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG2);
odp.pfnDlgProc = DlgProcOpts2;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index 7551747378..c37ef558a9 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -672,11 +672,11 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return TRUE;
case ID_MENU_OPTIONS:
- Options_Open(L"Network", L"Ping", L"Settings");
+ g_plugin.openOptions(L"Network", L"Ping", L"Settings");
return TRUE;
case ID_MENU_DESTINATIONS:
- Options_Open(L"Network", L"Ping", L"Hosts");
+ g_plugin.openOptions(L"Network", L"Ping", L"Hosts");
return TRUE;
}
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index e81c536ea2..d77d0c9be1 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -243,7 +243,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar break;
case IDC_LINK_HOTKEY:
- Options_Open(L"Customize", L"Hotkeys");
+ g_plugin.openOptions(L"Customize", L"Hotkeys");
return true;
}
break;
@@ -511,14 +511,14 @@ static int OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Services");
odp.szTitle.w = LPGENW("Plugin Updater");
odp.pfnDlgProc = UpdateNotifyOptsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
odp.szGroup.w = LPGENW("Popups");
odp.szTitle.w = LPGENW("Plugin Updater");
odp.pfnDlgProc = DlgPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index ca1c94d5e9..bf96b77579 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -298,7 +298,7 @@ bool DownloadFile(FILEURL *pFileURL, HNETLIBCONN &nlc) void __stdcall OpenPluginOptions(void*)
{
- Options_Open(nullptr, L"Plugins");
+ g_plugin.openOptions(nullptr, L"Plugins");
}
// FUNCTION: IsRunAsAdmin()
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index f71cc05144..616ef9834d 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -71,33 +71,33 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgProcPopupGeneral;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Classes");
odp.pfnDlgProc = DlgProcOptsClasses;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFICATIONS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Actions");
odp.pfnDlgProc = DlgProcPopupActions;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACTIONS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcContactOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACTS);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcPopupAdvOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_ADVANCED);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szGroup.a = LPGEN("Skins");
odp.szTab.a = LPGEN(MODULNAME_PLU);
odp.pfnDlgProc = DlgProcPopSkinsOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN2);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 582fddbe55..415d9a2cdb 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -368,7 +368,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l break;
case IDC_MORE:
- Options_Open(L"Customize", L"Fonts and colors");
+ g_plugin.openOptions(L"Customize", L"Fonts and colors");
break;
case IDC_SOFFLINE: case IDC_SONLINE: case IDC_SAWAY: case IDC_SNA: case IDC_SOCCUPIED:
diff --git a/plugins/QuickContacts/src/options.cpp b/plugins/QuickContacts/src/options.cpp index ff274eee58..a7969c3059 100644 --- a/plugins/QuickContacts/src/options.cpp +++ b/plugins/QuickContacts/src/options.cpp @@ -56,7 +56,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp index a298bba934..5dee646403 100644 --- a/plugins/QuickMessages/src/options.cpp +++ b/plugins/QuickMessages/src/options.cpp @@ -1091,6 +1091,6 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.pfnDlgProc = OptionsProc;
odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
return 0;
}
diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index 14488e58ab..ea0a55dadd 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -68,7 +68,7 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) if (count == 0 || cbcd->flags & BBCF_RIGHTBUTTON) {
mir_snprintf(buttonName, "%s %x", Translate("Button"), iNumber + 1);
- Options_Open(L"Message sessions", L"Quick Replies", _A2T(buttonName));
+ g_plugin.openOptions(L"Message sessions", L"Quick Replies", _A2T(buttonName));
return 0;
}
diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index 70dc1fb2ca..ee5ee16568 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -172,6 +172,6 @@ int OnOptInitialized(WPARAM wParam, LPARAM) odp.hInstance = g_plugin.getInst();
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);
odp.pfnDlgProc = DlgProcOptionsPage;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp index d8ff58068c..3d7a226cc5 100644 --- a/plugins/Quotes/src/OptionDukasCopy.cpp +++ b/plugins/Quotes/src/OptionDukasCopy.cpp @@ -315,5 +315,5 @@ void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider, WPARAM wp, OPTIO odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_ECONOMIC_RATES);
odp.pfnDlgProc = EconomicRatesDlgProc;
odp.szTab.w = const_cast<LPTSTR>(pi.m_sName.c_str());
- Options_AddPage(wp, &odp);
+ g_plugin.addOptions(wp, &odp);
}
diff --git a/plugins/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp index 686a1406a4..c80559a6b6 100644 --- a/plugins/Quotes/src/QuotesProviderFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderFinance.cpp @@ -261,5 +261,5 @@ void CQuotesProviderFinance::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp) odp.pfnDlgProc = GoogleFinanceOptDlgProc;
odp.dwInitParam = LPARAM(this);
odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
- Options_AddPage(wp, &odp);
+ g_plugin.addOptions(wp, &odp);
}
diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp index f52be5a6c0..e791b8cc4f 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp @@ -377,7 +377,7 @@ void CQuotesProviderGoogle::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp) odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_OPT_GOOGLE);
odp.pfnDlgProc = GoogleOptDlgProc;
odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
- Options_AddPage(wp, &odp);
+ g_plugin.addOptions(wp, &odp);
}
void CQuotesProviderGoogle::Accept(CQuotesProviderVisitor& visitor)const
diff --git a/plugins/RecentContacts/src/options.cpp b/plugins/RecentContacts/src/options.cpp index 3a833f4ba4..313d89a130 100644 --- a/plugins/RecentContacts/src/options.cpp +++ b/plugins/RecentContacts/src/options.cpp @@ -64,6 +64,6 @@ int onOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Recent Contacts");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp index 015929ec5f..3a9bfd6014 100644 --- a/plugins/SMS/src/options.cpp +++ b/plugins/SMS/src/options.cpp @@ -96,7 +96,7 @@ int OptInitialise(WPARAM wParam,LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMSPLUGIN);
odp.szTitle.a = PROTOCOL_DISPLAY_NAME_ORIG;
odp.pfnDlgProc = DlgProcEditorOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 30d35d39cf..c3af02c3b5 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -706,7 +706,7 @@ public: case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_FONTSCOLORS:
- Options_Open(L"Customize", L"Fonts and colors");
+ g_plugin.openOptions(L"Customize", L"Fonts and colors");
break;
case IDC_LOADUNREAD:
@@ -966,23 +966,23 @@ int OptInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);
odp.pfnDlgProc = DlgProcOptions;
odp.szTab.a = LPGEN("General");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTABS);
odp.pfnDlgProc = DlgProcTabsOptions;
odp.szTab.a = LPGEN("Tabs");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LAYOUT);
odp.pfnDlgProc = DlgProcLayoutOptions;
odp.szTab.a = LPGEN("Layout");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = nullptr;
odp.pfnDlgProc = nullptr;
odp.pDialog = new CLogOptionsDlg();
odp.szTab.a = LPGEN("Event log");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pDialog = nullptr;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);
@@ -990,18 +990,18 @@ int OptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Message sessions");
odp.szTitle.a = LPGEN("Group chats");
odp.szTab.a = LPGEN("General");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS2);
odp.pfnDlgProc = DlgProcOptions2;
odp.szTab.a = LPGEN("Event log");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);
odp.szTitle.a = LPGEN("Typing notify");
odp.pfnDlgProc = DlgProcTypeOptions;
odp.szTab.a = nullptr;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (g_dat.popupInstalled) {
odp.position = 910000002;
@@ -1011,7 +1011,7 @@ int OptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgProcOptionsPopup;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index f0cad3c731..789a7bf667 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1692,6 +1692,6 @@ int onRegisterOptions(WPARAM wParam, LPARAM) odp.szTitle.a = (char*)MODULENAME;
odp.szGroup.a = LPGEN("Services");
odp.pfnDlgProc = OptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index ee9dfcf19d..8f799ea352 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -168,7 +168,7 @@ int onRegisterPopOptions(WPARAM wParam, LPARAM) odp.szTitle.a = (char*)MODULENAME;
odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = PopOptionsDlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp index 46d9c8b8c6..db4914a3e6 100644 --- a/plugins/SeenPlugin/src/options.cpp +++ b/plugins/SeenPlugin/src/options.cpp @@ -494,14 +494,14 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.szGroup.w = LPGENW("Contacts");
odp.szTitle.w = LPGENW("Last seen");
odp.pfnDlgProc = OptsSettingsDlgProc;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
odp.szGroup.w = LPGENW("Popups");
odp.szTitle.w = LPGENW("Last seen");
odp.pfnDlgProc = OptsPopupsDlgProc;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
}
return 0;
}
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index 5ff238d1af..51409e4785 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -497,6 +497,6 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.pfnDlgProc = OptionsProc;
odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
return 0;
}
diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp index dee192de91..e8f56e1614 100644 --- a/plugins/ShellExt/src/options.cpp +++ b/plugins/ShellExt/src/options.cpp @@ -117,6 +117,6 @@ int OnOptionsInit(WPARAM wParam, LPARAM) opt.pszTemplate = MAKEINTRESOURCEA(IDD_SHLOPTS);
opt.hInstance = g_plugin.getInst();
opt.pfnDlgProc = OptDialogProc;
- Options_AddPage(wParam, &opt);
+ g_plugin.addOptions(wParam, &opt);
return 0;
}
diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp index fa93906df2..33ec72f31d 100644 --- a/plugins/SimpleAR/src/Options.cpp +++ b/plugins/SimpleAR/src/Options.cpp @@ -143,6 +143,6 @@ INT OptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
\ No newline at end of file diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index 9646aac6fd..be24533c97 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -1534,7 +1534,7 @@ int InitOptions(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Status");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATUS);
odp.pfnDlgProc = DlgStatusOptionsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
if (accounts->statusMsgCount == 0)
@@ -1546,16 +1546,16 @@ int InitOptions(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Status");
odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgOptionsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Variables");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_VARIABLES);
odp.pfnDlgProc = DlgVariablesOptionsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgAdvancedOptionsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/SkypeStatusChange/src/options.cpp b/plugins/SkypeStatusChange/src/options.cpp index fc3e2dfab8..dadabb5995 100644 --- a/plugins/SkypeStatusChange/src/options.cpp +++ b/plugins/SkypeStatusChange/src/options.cpp @@ -306,6 +306,6 @@ int SSC_OptInitialise(WPARAM wp, LPARAM) odp.szGroup.a = LPGEN("Plugins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_SETTINGS);
odp.pfnDlgProc = SettingsDlgProc;
- Options_AddPage(wp, &odp);
+ g_plugin.addOptions(wp, &odp);
return 0;
}
diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index 9f90a17076..ce7176f040 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -661,6 +661,6 @@ int SmileysOptionsInitialize(WPARAM addInfo, LPARAM) odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcSmileysOptions;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(addInfo, &odp);
+ g_plugin.addOptions(addInfo, &odp);
return 0;
}
diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index 6411a624ac..2183656a5e 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -560,24 +560,24 @@ int OnOptInitialize(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Settings");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_MAIN);
odp.pfnDlgProc = DlgProcOptionsMain;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_Q);
odp.pfnDlgProc = DlgProcOptionsQuestion;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Bayes");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_BAYES);
odp.pfnDlgProc = DlgProcOptionsBayes;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_POPUPS);
odp.pfnDlgProc = DlgProcOptionsPopups;
odp.szGroup.a = LPGEN("Popups");
odp.szTab.a = nullptr;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp index 9ed6be4e3c..b1580a3701 100644 --- a/plugins/SpellChecker/src/options.cpp +++ b/plugins/SpellChecker/src/options.cpp @@ -62,7 +62,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
memset(&odp, 0, sizeof(odp));
odp.hInstance = g_plugin.getInst();
@@ -71,7 +71,7 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.pfnDlgProc = AutoreplaceDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_REPLACEMENTS);
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 46e2941b42..db5b2f2bcd 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -342,6 +342,6 @@ int OptInit(WPARAM wParam, LPARAM lParam) odp.szTitle.a = LPGEN("Splash Screen");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/StartPosition/src/startposition.cpp b/plugins/StartPosition/src/startposition.cpp index 34602969a6..85c29bea02 100644 --- a/plugins/StartPosition/src/startposition.cpp +++ b/plugins/StartPosition/src/startposition.cpp @@ -53,7 +53,7 @@ int CMPlugin::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Start position"); odp.pDialog = new COptionsDlg(); odp.flags = ODPF_BOLDGROUPS; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 806ea357e6..9feda84023 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -425,7 +425,7 @@ int InitializeOptions(WPARAM wParam, LPARAM) odp.szTitle.a = MENU_NAME;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index 3fa0db37f6..d4d3050a7a 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -331,7 +331,7 @@ int StatusChangeOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Status");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcStatusChangeOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/StatusManager/src/options.cpp b/plugins/StatusManager/src/options.cpp index db81aca285..4d87a08548 100644 --- a/plugins/StatusManager/src/options.cpp +++ b/plugins/StatusManager/src/options.cpp @@ -60,7 +60,7 @@ int OnCommonOptionsInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Status"); odp.szTitle.w = LPGENW("Status manager"); odp.pDialog = new CSubPluginsOptionsDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 9847352c76..13d122d006 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -276,19 +276,19 @@ int OnOptInit(WPARAM w, LPARAM l) odp.szTab.w = LPGENW("General");
odp.pDialog = new COptMainDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
odp.szTab.w = LPGENW("Messages");
odp.pDialog = new COptMessagesDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
odp.szTab.w = LPGENW("Accounts");
odp.pDialog = new COptProtoDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.pDialog = new COptAdvancedDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
return 0;
}
diff --git a/plugins/StopSpamPlus/src/options.cpp b/plugins/StopSpamPlus/src/options.cpp index 43f33b1030..79b040d967 100644 --- a/plugins/StopSpamPlus/src/options.cpp +++ b/plugins/StopSpamPlus/src/options.cpp @@ -163,14 +163,14 @@ int OnOptInit(WPARAM w, LPARAM) odp.szTab.a = LPGEN("General");
odp.pDialog = new COptMainDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
odp.szTab.a = LPGEN("Messages");
odp.pDialog = new COptMessageDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
odp.szTab.a = LPGEN("Accounts");
odp.pDialog = new COptAccountDlg();
- Options_AddPage(w, &odp);
+ g_plugin.addOptions(w, &odp);
return 0;
}
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 1019b82a75..a72e879343 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -386,7 +386,7 @@ int CTabBaseDlg::MsgWindowMenuHandler(int selection, int menuId) else if (menuId == MENU_LOGMENU) {
switch (selection) {
case ID_MESSAGELOGSETTINGS_GLOBAL:
- Options_Open(nullptr, L"Message sessions", L"Message log");
+ g_plugin.openOptions(nullptr, L"Message sessions", L"Message log");
return 1;
case ID_MESSAGELOGSETTINGS_FORTHISCONTACT:
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 1c155e1c2e..9cb1e6e548 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1294,28 +1294,28 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odpnew.szTab.a = LPGEN("General");
odpnew.pDialog = new COptMainDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
odpnew.szTab.a = LPGEN("Tabs and layout");
odpnew.pDialog = new COptTabbedDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
odpnew.szTab.a = LPGEN("Containers");
odpnew.pDialog = new COptContainersDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
odpnew.szTab.a = LPGEN("Message log");
odpnew.pDialog = new COptLogDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
odpnew.szTab.a = LPGEN("Advanced tweaks");
odpnew.pDialog = new COptAdvancedDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
odpnew.szGroup.a = LPGEN("Message sessions");
odpnew.szTitle.a = LPGEN("Typing notify");
odpnew.pDialog = new COptTypingDlg();
- Options_AddPage(wParam, &odpnew);
+ g_plugin.addOptions(wParam, &odpnew);
OPTIONSDIALOGPAGE odp = {};
odp.hInstance = g_plugin.getInst();
@@ -1327,7 +1327,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odp.szTitle.a = LPGEN("Event notifications");
odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgProcPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
@@ -1335,12 +1335,12 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odp.szTab.a = LPGEN("Load and apply");
odp.pfnDlgProc = DlgProcSkinOpts;
odp.szGroup.a = LPGEN("Skins");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_TABCONFIG);
odp.szTab.a = LPGEN("Window layout tweaks");
odp.pfnDlgProc = DlgProcTabConfig;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// group chats
odp.szGroup.a = LPGEN("Message sessions");
@@ -1348,22 +1348,22 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) odp.szTitle.a = LPGEN("Group chats");
odp.szTab.a = LPGEN("Settings");
odp.pfnDlgProc = DlgProcOptions1;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS2);
odp.szTab.a = LPGEN("Log formatting");
odp.pfnDlgProc = DlgProcOptions2;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS3);
odp.szTab.a = LPGEN("Events and filters");
odp.pfnDlgProc = DlgProcOptions3;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS4);
odp.szTab.a = LPGEN("Highlighting");
odp.pfnDlgProc = CMUCHighlight::dlgProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index b6f6261fc8..8d1b3a1c9e 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -498,7 +498,7 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Popups");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index 0f62a94f93..673b94426f 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -2090,34 +2090,34 @@ int OptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Tooltips");
odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsAppearance;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
odp.szTab.a = LPGEN("Tooltips");
odp.szGroup.a = LPGEN("Skins");
odp.pfnDlgProc = DlgProcOptsSkin;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTENT);
odp.szTab.a = LPGEN("Content");
odp.szTitle.a = LPGEN("Tooltips");
odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsContent;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRAYTIP);
odp.szTab.a = LPGEN("Tray tooltip");
odp.szTitle.a = LPGEN("Tooltips");
odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsTraytip;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRA);
odp.szTab.a = LPGEN("Extra");
odp.szTitle.a = LPGEN("Tooltips");
odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsExtra;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Toaster/src/options.cpp b/plugins/Toaster/src/options.cpp index da2e46ae84..6a027ac84f 100644 --- a/plugins/Toaster/src/options.cpp +++ b/plugins/Toaster/src/options.cpp @@ -51,7 +51,7 @@ int OnOptionsInitialized(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.szTab.w = _T(MODULENAME);
odp.pDialog = new COptions();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 952ec98a40..98d90b25cb 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -263,7 +263,7 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Popups");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper;
- ::Options_AddPage(wParam, &odp);
+ ::g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index 8c416d7200..226dc8d57a 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -548,6 +548,6 @@ int TTBOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Toolbar");
odp.pfnDlgProc = ButOrderOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index 1da2a9ee09..00a17afbfe 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -351,13 +351,13 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Traffic counter");
odp.pfnDlgProc = DlgProcTCOptions;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Statistics options page
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATS);
odp.szTab.a = LPGEN("Statistics");
odp.pfnDlgProc = DlgProcOptStatistics;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Popups option page
if (bPopupExists) {
@@ -366,7 +366,7 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Traffic counter");
odp.pfnDlgProc = DlgProcPopupsTraffic;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 071c3ece1a..e37239af27 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -1039,28 +1039,28 @@ static int OnInitOptions(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_COMMON);
odp.pfnDlgProc = DlgProc_CommonOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Advanced page
odp.szTab.a = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgProc_AdvancedOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Details Dialog page
odp.szTab.a = LPGEN("Details dialog");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DETAILSDLG);
odp.pfnDlgProc = DlgProc_DetailsDlgOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Reminder page
odp.szTab.a = LPGEN("Reminder");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_REMINDER);
odp.pfnDlgProc = DlgProc_ReminderOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// Popups page
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
@@ -1069,7 +1069,7 @@ static int OnInitOptions(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProc_Popups;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return MIR_OK;
}
diff --git a/plugins/Variables/src/options.cpp b/plugins/Variables/src/options.cpp index 1087b6f250..0b22ba13ca 100644 --- a/plugins/Variables/src/options.cpp +++ b/plugins/Variables/src/options.cpp @@ -137,6 +137,6 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.hInstance = g_plugin.getInst();
odp.pfnDlgProc = SetOptsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS_DIALOG);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp index a726ef26d2..c05fffc223 100755 --- a/plugins/Watrack_MPD/src/options.cpp +++ b/plugins/Watrack_MPD/src/options.cpp @@ -55,6 +55,6 @@ int WaMpdOptInit(WPARAM wParam,LPARAM) odp.szTab.w = LPGENW("Watrack MPD"); odp.flags=ODPF_BOLDGROUPS|ODPF_UNICODE; odp.pDialog = new COptWaMpdDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 0d611997e2..ae739f5012 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -581,13 +581,13 @@ int OptInit(WPARAM wParam, LPARAM) odp.szTitle.a = WEATHERPROTOTEXT;
odp.szTab.a = LPGEN("General");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// text options
odp.pszTemplate = MAKEINTRESOURCEA(IDD_TEXTOPT);
odp.pfnDlgProc = DlgProcText;
odp.szTab.a = LPGEN("Display");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// if popup service exists, load the weather popup options
if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {
@@ -596,7 +596,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Popups");
odp.szTab.a = nullptr;
odp.pfnDlgProc = DlgPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index ee0660d813..f384f48132 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -297,14 +297,14 @@ static int OptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = MODULENAME;
odp.pfnDlgProc = DlgProcOpt;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
// if popup service exists
if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
odp.szGroup.w = LPGENW("Popups");
odp.pfnDlgProc = DlgPopUpOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index ad79aab976..2c15367319 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -50,7 +50,7 @@ static int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Contacts");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/WhoUsesMyFiles/src/options.cpp b/plugins/WhoUsesMyFiles/src/options.cpp index 17808930c8..59b37d4d6b 100644 --- a/plugins/WhoUsesMyFiles/src/options.cpp +++ b/plugins/WhoUsesMyFiles/src/options.cpp @@ -276,6 +276,6 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.pfnDlgProc = OptionsDlgProc; odp.szGroup.a = LPGEN("Services"); odp.flags = ODPF_BOLDGROUPS; - Options_AddPage(wparam, &odp); + g_plugin.addOptions(wparam, &odp); return 0; } diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index bda060629f..58d1fff3e7 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -85,12 +85,12 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONFIG);
odp.szTitle.w = LPGENW("Engine/Voice");
odp.pfnDlgProc = DialogConfigEngine::process;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ACTIVEMODES);
odp.szTitle.w = LPGENW("Active Modes");
odp.pfnDlgProc = DialogConfigActive::process;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
if (g_speak_announce)
@@ -98,7 +98,7 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_ANNOUNCE);
odp.szTitle.w = LPGENW("Announce");
odp.pfnDlgProc = AnnounceDialog::process;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index f696ec49e6..e1d5148edc 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -350,6 +350,6 @@ INT OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Sounds");
odp.szTitle.w = LPGENW("XSound Notify");
odp.pfnDlgProc = OptsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index f4ca57cb49..3842602582 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -162,24 +162,24 @@ int YAMNOptInitSvc(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTOPT);
odp.pfnDlgProc = DlgProcPOP3AccOpt;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_YAMNOPT);
odp.pfnDlgProc = DlgProcYAMNOpt;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Plugins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PLUGINOPT);
odp.pfnDlgProc = DlgProcPluginOpt;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.szGroup.a = LPGEN("Popups");
odp.szTab.a = LPGEN("YAMN");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP);
odp.pfnDlgProc = DlgProcPOP3AccPopup;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index 95ed5a651b..a3538a7969 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -481,12 +481,12 @@ int OptInit(WPARAM wParam, LPARAM) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
odp.szTab.a = LPGEN("Settings");
odp.pfnDlgProc = DlgProcOpts1;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLASSES);
odp.szTab.a = LPGEN("Classes");
odp.pfnDlgProc = DlgProcOptsClasses;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp index 2ce13a9d78..4855369189 100644 --- a/plugins/YARelay/src/options.cpp +++ b/plugins/YARelay/src/options.cpp @@ -199,6 +199,6 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Messages forwarding");
odp.pfnDlgProc = OptionsFrameProc;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/plugins/ZeroNotification/src/options.cpp b/plugins/ZeroNotification/src/options.cpp index b0c6684569..7e611d09f6 100644 --- a/plugins/ZeroNotification/src/options.cpp +++ b/plugins/ZeroNotification/src/options.cpp @@ -138,6 +138,6 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.szTitle.w = LPGENW("Zero Notifications"); odp.szGroup.w = LPGENW("Plugins"); odp.pfnDlgProc = DlgProcNoSoundOpts; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index 1c92e5829d..fa35231f73 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -417,6 +417,6 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.szTitle.w = LPGENW("OSD");
odp.pfnDlgProc = OptDlgProc;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- Options_AddPage(wparam, &odp);
+ g_plugin.addOptions(wparam, &odp);
return 0;
}
diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp index 12a44b2f5a..b291f98cdd 100644 --- a/protocols/Discord/src/options.cpp +++ b/protocols/Discord/src/options.cpp @@ -76,6 +76,6 @@ int CDiscordProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.position = 1; odp.szTab.w = LPGENW("Account"); odp.pDialog = new CDiscardAccountOptions(this, IDD_OPTIONS_ACCOUNT); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/protocols/EmLanProto/src/amdproto.cpp b/protocols/EmLanProto/src/amdproto.cpp index 15a65b1824..e676d7a6e5 100644 --- a/protocols/EmLanProto/src/amdproto.cpp +++ b/protocols/EmLanProto/src/amdproto.cpp @@ -287,7 +287,7 @@ int __cdecl EMPCreateOptionsDlg(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Network");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = EMPDlgProcMainOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 64127caef8..d683dc848f 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -425,25 +425,25 @@ int FacebookProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = FBOptionsProc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.position = 271829; odp.szTab.w = LPGENW("Events"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS); odp.pfnDlgProc = FBOptionsEventsProc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.position = 271830; odp.szTab.w = LPGENW("Statuses"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_STATUSES); odp.pfnDlgProc = FBOptionsStatusesProc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.position = 271831; odp.szTab.w = LPGENW("Messaging"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_MESSAGING); odp.pfnDlgProc = FBOptionsMessagingProc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/protocols/Gadu-Gadu/src/dialogs.cpp b/protocols/Gadu-Gadu/src/dialogs.cpp index 20e71b2b37..22fe1dea3b 100644 --- a/protocols/Gadu-Gadu/src/dialogs.cpp +++ b/protocols/Gadu-Gadu/src/dialogs.cpp @@ -768,18 +768,18 @@ int GaduProto::options_init(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("General"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_GENERAL); odp.pfnDlgProc = gg_genoptsdlgproc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LPGENW("Conference"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GG_CONFERENCE); odp.pfnDlgProc = gg_confoptsdlgproc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.szTab.w = LPGENW("Advanced"); odp.position = 2; odp.pszTemplate = nullptr; odp.pDialog = new GaduOptionsDlgAdvanced(this); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/protocols/ICQCorp/src/options.cpp b/protocols/ICQCorp/src/options.cpp index c463d41dfc..976ceb6567 100644 --- a/protocols/ICQCorp/src/options.cpp +++ b/protocols/ICQCorp/src/options.cpp @@ -75,7 +75,7 @@ int icqOptionsInitialise(WPARAM wParam, LPARAM) odp.hInstance = g_plugin.getInst();
odp.szGroup.a = LPGEN("Network");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/IRCG/src/options.cpp b/protocols/IRCG/src/options.cpp index 6f33f9b9d0..8160d70e30 100644 --- a/protocols/IRCG/src/options.cpp +++ b/protocols/IRCG/src/options.cpp @@ -1634,19 +1634,19 @@ int CIrcProto::OnInitOptionsPages(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pDialog = new CConnectPrefsDlg(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("DCC and CTCP");
odp.pDialog = new CCtcpPrefsDlg(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.pDialog = new COtherPrefsDlg(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Ignore");
odp.pDialog = new CIgnorePrefsDlg(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index 83229a25e2..94817c3c42 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -515,22 +515,22 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQ);
odp.pfnDlgProc = DlgProcIcqOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQCONTACTS);
odp.pfnDlgProc = DlgProcIcqContactsOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Features");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQFEATURES);
odp.pfnDlgProc = DlgProcIcqFeaturesOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Privacy");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICQPRIVACY);
odp.pfnDlgProc = DlgProcIcqPrivacyOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (bPopupService) {
odp.position = 100000000;
@@ -538,7 +538,7 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.pfnDlgProc = DlgProcIcqPopupOpts;
odp.szGroup.w = LPGENW("Popups");
odp.szTab.w = nullptr;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index 1808615c7e..0044594f56 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -1502,15 +1502,15 @@ int CJabberProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pDialog = new CDlgOptAccount(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Conferences");
odp.pDialog = new CDlgOptGc(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.pDialog = new CDlgOptAdvanced(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
//TODO: add omemo options
return 0;
}
@@ -2221,6 +2221,6 @@ void CJabberProto::JabberUpdateDialogs(BOOL) INT_PTR __cdecl CJabberProto::OnMenuOptions(WPARAM, LPARAM)
{
- Options_Open(L"Network", m_tszUserName, L"Account");
+ g_plugin.openOptions(L"Network", m_tszUserName, L"Account");
return 0;
}
diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index 7338eb2fdb..b54fa0cc79 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -136,7 +136,7 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Popups");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = MraPopupDlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index 794c7db3ea..2010c0846a 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -223,22 +223,22 @@ int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.szTab.w = LPGENW("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACCOUNT);
odp.pfnDlgProc = DlgProcOptsAccount;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Connections");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONNECTIONS);
odp.pfnDlgProc = DlgProcOptsConnections;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Files");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILES);
odp.pfnDlgProc = MraFilesQueueDlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Avatars");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AVATRS);
odp.pfnDlgProc = MraAvatarsQueueDlgProcOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
OnPopupOptInit(wParam, lParam);
return 0;
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 8705bbf845..0a45df570a 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -601,22 +601,22 @@ int CMsnProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
odp.pfnDlgProc = DlgProcMsnOpts;
odp.dwInitParam = (LPARAM)this;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Connection");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSN_CONN);
odp.pfnDlgProc = DlgProcMsnConnOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Server list");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_LISTSMGR);
odp.pfnDlgProc = DlgProcMsnServLists;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Notifications");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
odp.pfnDlgProc = DlgProcHotmailPopupOpts;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 5bd7fc668d..1b003d37c1 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -168,7 +168,7 @@ int OmegleProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pfnDlgProc = OmegleOptionsProc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/Sametime/src/options.cpp b/protocols/Sametime/src/options.cpp index b2a50a5fce..95642e983a 100644 --- a/protocols/Sametime/src/options.cpp +++ b/protocols/Sametime/src/options.cpp @@ -349,7 +349,7 @@ int CSametimeProto::OptInit(WPARAM wParam, LPARAM) odp.szGroup.w = LPGENW("Network");
odp.pfnDlgProc = DlgProcOptNet;
odp.dwInitParam = (LPARAM)this;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/SkypeWeb/src/skype_options.cpp b/protocols/SkypeWeb/src/skype_options.cpp index 2bac189297..cf92dfd198 100644 --- a/protocols/SkypeWeb/src/skype_options.cpp +++ b/protocols/SkypeWeb/src/skype_options.cpp @@ -78,7 +78,7 @@ int CSkypeProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pDialog = CSkypeOptionsMain::CreateOptionsPage(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/Steam/src/steam_options.cpp b/protocols/Steam/src/steam_options.cpp index ed5fc00e36..92fd87152e 100644 --- a/protocols/Steam/src/steam_options.cpp +++ b/protocols/Steam/src/steam_options.cpp @@ -83,11 +83,11 @@ int CSteamProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pDialog = CSteamOptionsMain::CreateOptionsPage(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
//odp.szTab.w = LPGENW("Blocked contacts");
//odp.pDialog = CSteamOptionsBlockList::CreateOptionsPage(this);
- //Options_AddPage(wParam, &odp);
+ //g_plugin.addOptions(wParam, &odp);
return 0;
}
\ No newline at end of file diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index c31c76412c..3cc61ec397 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -556,15 +556,15 @@ int CToxProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.pDialog = CToxOptionsMain::CreateOptionsPage(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
/*odp.szTab.w = LPGENW("Multimedia");
odp.pDialog = CToxOptionsMultimedia::CreateOptionsPage(this);
- Options_AddPage(wParam, &odp);*/
+ g_plugin.addOptions(wParam, &odp);*/
odp.szTab.w = LPGENW("Nodes");
odp.pDialog = CToxOptionsNodeList::CreateOptionsPage(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 8f98d0e4b1..fe1e265fcd 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -249,13 +249,13 @@ int TwitterProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Basic");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pfnDlgProc = options_proc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.szTab.w = LPGENW("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);
odp.pfnDlgProc = popup_options_proc;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
}
return 0;
}
diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp index 93ff35c579..beb9171e58 100644 --- a/protocols/VKontakte/src/vk_options.cpp +++ b/protocols/VKontakte/src/vk_options.cpp @@ -81,27 +81,27 @@ int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM) odp.szTab.w = LPGENW("Account");
odp.position = 1;
odp.pDialog = new CVkOptionAccountForm(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Advanced");
odp.position = 2;
odp.pDialog = new CVkOptionAdvancedForm(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("News and notifications");
odp.position = 3;
odp.pDialog = new CVkOptionFeedsForm(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("View");
odp.position = 4;
odp.pDialog = new CVkOptionViewForm(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.w = LPGENW("Menu");
odp.position = 5;
odp.pDialog = new CVkOptionMenuForm(this);
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdaway/src/sendmsg.cpp b/src/core/stdaway/src/sendmsg.cpp index 532ad9d1ec..cc416c4ef6 100644 --- a/src/core/stdaway/src/sendmsg.cpp +++ b/src/core/stdaway/src/sendmsg.cpp @@ -523,7 +523,7 @@ static int AwayMsgOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Status");
odp.pfnDlgProc = DlgProcAwayMsgOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdclist/src/clcopts.cpp b/src/core/stdclist/src/clcopts.cpp index e2790adc9c..311e3a959d 100644 --- a/src/core/stdclist/src/clcopts.cpp +++ b/src/core/stdclist/src/clcopts.cpp @@ -430,12 +430,12 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("List");
odp.pfnDlgProc = DlgProcClcMainOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);
odp.szTitle.a = LPGEN("List background");
odp.pfnDlgProc = DlgProcClcBkgOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdclist/src/clistopts.cpp b/src/core/stdclist/src/clistopts.cpp index cf77a0d953..623787e931 100644 --- a/src/core/stdclist/src/clistopts.cpp +++ b/src/core/stdclist/src/clistopts.cpp @@ -199,6 +199,6 @@ int CListOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcGenOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdclist/src/cluiopts.cpp b/src/core/stdclist/src/cluiopts.cpp index a2afe36280..f4607ada42 100644 --- a/src/core/stdclist/src/cluiopts.cpp +++ b/src/core/stdclist/src/cluiopts.cpp @@ -317,12 +317,12 @@ int CluiOptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
odp.szTitle.a = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdfile/src/fileopts.cpp b/src/core/stdfile/src/fileopts.cpp index 3d75637686..88a320883d 100644 --- a/src/core/stdfile/src/fileopts.cpp +++ b/src/core/stdfile/src/fileopts.cpp @@ -232,6 +232,6 @@ int FileOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Events");
odp.pfnDlgProc = DlgProcFileOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/core/stdidle/src/options.cpp b/src/core/stdidle/src/options.cpp index 8d34a2909a..4b9beab7ac 100644 --- a/src/core/stdidle/src/options.cpp +++ b/src/core/stdidle/src/options.cpp @@ -129,6 +129,6 @@ int IdleOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Idle"); odp.flags = ODPF_BOLDGROUPS; odp.pDialog = new COptionsDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/core/stdmsg/src/chat_options.cpp b/src/core/stdmsg/src/chat_options.cpp index 45880e5bfc..10b645db68 100644 --- a/src/core/stdmsg/src/chat_options.cpp +++ b/src/core/stdmsg/src/chat_options.cpp @@ -672,12 +672,12 @@ int ChatOptionsInitialize(WPARAM wParam) odp.position = 910000000; odp.szTab.a = LPGEN("General"); odp.pDialog = new COptMainDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); odp.position = 910000001; odp.szTab.a = LPGEN("Chat log"); odp.pDialog = new COptLogDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); if (PopupInstalled) { odp.position = 910000002; @@ -685,7 +685,7 @@ int ChatOptionsInitialize(WPARAM wParam) odp.szGroup.a = LPGEN("Popups"); odp.szTab.a = nullptr; odp.pDialog = new COptPopupDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); } return 0; } diff --git a/src/core/stdmsg/src/msgoptions.cpp b/src/core/stdmsg/src/msgoptions.cpp index 204f34eaff..640841691d 100644 --- a/src/core/stdmsg/src/msgoptions.cpp +++ b/src/core/stdmsg/src/msgoptions.cpp @@ -586,19 +586,19 @@ static int OptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Message sessions");
odp.pDialog = new COptionMainDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Messaging log");
odp.pDialog = new COptionLogDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Typing notify");
odp.pDialog = new COptionTypingDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
odp.szTab.a = LPGEN("Tabs");
odp.pDialog = new COptionsTabDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
ChatOptionsInitialize(wParam);
return 0;
diff --git a/src/mir_app/src/CMPluginBase.cpp b/src/mir_app/src/CMPluginBase.cpp index cc2400269d..d75e34ac09 100644 --- a/src/mir_app/src/CMPluginBase.cpp +++ b/src/mir_app/src/CMPluginBase.cpp @@ -97,9 +97,26 @@ void CMPluginBase::tryOpenLog() ///////////////////////////////////////////////////////////////////////////////////////// +int CMPluginBase::addOptions(WPARAM wParam, struct OPTIONSDIALOGPAGE *odp) +{ + return ::Options_AddPage(wParam, odp, m_hLang); +} + +void CMPluginBase::openOptions(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab) +{ + ::Options_Open(pszGroup, pszPage, pszTab, m_hLang); +} + +void CMPluginBase::openOptionsPage(const wchar_t *pszGroup, const wchar_t *pszPage, const wchar_t *pszTab) +{ + ::Options_OpenPage(pszGroup, pszPage, pszTab, m_hLang); +} + +///////////////////////////////////////////////////////////////////////////////////////// + int CMPluginBase::addUserInfo(WPARAM wParam, OPTIONSDIALOGPAGE *odp) { - odp->langId = hLangpack; + odp->langId = m_hLang; return CallService("UserInfo/AddPage", wParam, (LPARAM)odp); } diff --git a/src/mir_app/src/FontOptions.cpp b/src/mir_app/src/FontOptions.cpp index 823afc3955..a6b9bf0ad2 100644 --- a/src/mir_app/src/FontOptions.cpp +++ b/src/mir_app/src/FontOptions.cpp @@ -1191,7 +1191,7 @@ int OptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Customize");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcLogOptions;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/contacts.cpp b/src/mir_app/src/contacts.cpp index 90b9daad1d..0bd5ab73c9 100644 --- a/src/mir_app/src/contacts.cpp +++ b/src/mir_app/src/contacts.cpp @@ -358,7 +358,7 @@ static int ContactOptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Contact names");
odp.pDialog = new CContactOptsDlg();
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/ei_options.cpp b/src/mir_app/src/ei_options.cpp index 35babf713b..02cec8571f 100644 --- a/src/mir_app/src/ei_options.cpp +++ b/src/mir_app/src/ei_options.cpp @@ -460,6 +460,6 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.szTab.a = LPGEN("General"); odp.flags = ODPF_BOLDGROUPS; odp.pDialog = new CExtraIconOptsDlg(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/mir_app/src/hotkey_opts.cpp b/src/mir_app/src/hotkey_opts.cpp index d0d495fa8b..c9361e20ff 100644 --- a/src/mir_app/src/hotkey_opts.cpp +++ b/src/mir_app/src/hotkey_opts.cpp @@ -1030,6 +1030,6 @@ int HotkeyOptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Hotkeys"); odp.szGroup.a = LPGEN("Customize"); odp.pfnDlgProc = sttOptionsDlgProc; - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/mir_app/src/ignore.cpp b/src/mir_app/src/ignore.cpp index 4659f0ec99..1d2aa10cf5 100644 --- a/src/mir_app/src/ignore.cpp +++ b/src/mir_app/src/ignore.cpp @@ -334,7 +334,7 @@ static int IgnoreOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcIgnoreOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/lpopts.cpp b/src/mir_app/src/lpopts.cpp index f32e71481f..01916a1a16 100644 --- a/src/mir_app/src/lpopts.cpp +++ b/src/mir_app/src/lpopts.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. static void CALLBACK OpenOptions(void*)
{
- Options_Open(L"Customize", L"Languages");
+ g_plugin.openOptions(L"Customize", L"Languages");
}
static void ReloadOptions(void *hWnd)
@@ -261,6 +261,6 @@ int LangpackOptionsInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Customize");
odp.flags = ODPF_BOLDGROUPS;
odp.pDialog = new CLangpackDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp index 223d8b6e4a..59b5df0a74 100644 --- a/src/mir_app/src/menu_options.cpp +++ b/src/mir_app/src/menu_options.cpp @@ -531,7 +531,7 @@ int GenMenuOptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Customize"); odp.flags = ODPF_BOLDGROUPS; odp.pDialog = new CGenMenuOptionsPage(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return ProtocolOrderOptInit(wParam, 0); } diff --git a/src/mir_app/src/meta_options.cpp b/src/mir_app/src/meta_options.cpp index 51c27b9b21..f80d9c3019 100644 --- a/src/mir_app/src/meta_options.cpp +++ b/src/mir_app/src/meta_options.cpp @@ -124,6 +124,6 @@ int Meta_OptInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Metacontacts");
odp.szGroup.a = LPGEN("Contacts");
odp.pDialog = new CMetaOptionsDlg();
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index ed4f7da8f1..1fb62d69ed 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -596,3 +596,6 @@ GetPluginByLangId @624 GetInstByAddress @625
GetPluginByInstance @626
?addUserInfo@CMPluginBase@@QAEHIPAUOPTIONSDIALOGPAGE@@@Z @627 NONAME
+?addOptions@CMPluginBase@@QAEHIPAUOPTIONSDIALOGPAGE@@@Z @628 NONAME
+?openOptions@CMPluginBase@@QAEXPB_W00@Z @629 NONAME
+?openOptionsPage@CMPluginBase@@QAEXPB_W00@Z @630 NONAME
diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 9fae50382f..6d4ca9c44a 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -596,3 +596,6 @@ GetPluginByLangId @624 GetInstByAddress @625
GetPluginByInstance @626
?addUserInfo@CMPluginBase@@QEAAH_KPEAUOPTIONSDIALOGPAGE@@@Z @627 NONAME
+?addOptions@CMPluginBase@@QEAAH_KPEAUOPTIONSDIALOGPAGE@@@Z @628 NONAME
+?openOptions@CMPluginBase@@QEAAXPEB_W00@Z @629 NONAME
+?openOptionsPage@CMPluginBase@@QEAAXPEB_W00@Z @630 NONAME
diff --git a/src/mir_app/src/netlibopts.cpp b/src/mir_app/src/netlibopts.cpp index 90edef4089..4c8db2c1ce 100644 --- a/src/mir_app/src/netlibopts.cpp +++ b/src/mir_app/src/netlibopts.cpp @@ -514,6 +514,6 @@ int NetlibOptInitialise(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Network");
odp.pfnDlgProc = DlgProcNetlibOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/pluginopts.cpp b/src/mir_app/src/pluginopts.cpp index 4ae83a6145..ee7bc7d146 100644 --- a/src/mir_app/src/pluginopts.cpp +++ b/src/mir_app/src/pluginopts.cpp @@ -545,7 +545,7 @@ int PluginOptionsInit(WPARAM wParam, LPARAM) odp.position = 1300000000;
odp.szTitle.a = LPGEN("Plugins");
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/proto_opts.cpp b/src/mir_app/src/proto_opts.cpp index be60116532..edd8114758 100644 --- a/src/mir_app/src/proto_opts.cpp +++ b/src/mir_app/src/proto_opts.cpp @@ -507,7 +507,7 @@ public: pshn.hdr.hwndFrom = m_hwnd;
SendMessage(m_hwnd, WM_NOTIFY, 0, (LPARAM)&pshn);
- Options_Open(nullptr, L"Network");
+ g_plugin.openOptions(nullptr, L"Network");
}
void OnOptions(CCtrlButton*)
@@ -516,7 +516,7 @@ public: if (idx != -1) {
PROTOACCOUNT *pa = (PROTOACCOUNT*)m_accList.GetItemData(idx);
if (pa->bOldProto)
- Options_Open(L"Network", _A2T(pa->szModuleName));
+ g_plugin.openOptions(L"Network", _A2T(pa->szModuleName));
else
OpenAccountOptions(pa);
}
diff --git a/src/mir_app/src/proto_order.cpp b/src/mir_app/src/proto_order.cpp index 2e7f0095b3..997f2b2a7b 100644 --- a/src/mir_app/src/proto_order.cpp +++ b/src/mir_app/src/proto_order.cpp @@ -228,6 +228,6 @@ int ProtocolOrderOptInit(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Contact list");
odp.pDialog = new CProtocolOrderOpts();
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/skin2opts.cpp b/src/mir_app/src/skin2opts.cpp index f6479cd92a..3d70ba3952 100644 --- a/src/mir_app/src/skin2opts.cpp +++ b/src/mir_app/src/skin2opts.cpp @@ -940,6 +940,6 @@ int SkinOptionsInit(WPARAM wParam, LPARAM) odp.position = -180000000;
odp.pDialog = new CIcoLibOptsDlg();
odp.szTitle.a = LPGEN("Icons");
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/sounds.cpp b/src/mir_app/src/sounds.cpp index 198dd3cb95..88d95c2be1 100644 --- a/src/mir_app/src/sounds.cpp +++ b/src/mir_app/src/sounds.cpp @@ -441,7 +441,7 @@ static int SkinOptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Sounds");
odp.pfnDlgProc = DlgProcSoundOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
diff --git a/src/mir_app/src/srmm_toolbar.cpp b/src/mir_app/src/srmm_toolbar.cpp index 103c1e4020..9e5696d9b6 100644 --- a/src/mir_app/src/srmm_toolbar.cpp +++ b/src/mir_app/src/srmm_toolbar.cpp @@ -776,7 +776,7 @@ static int SrmmOptionsInit(WPARAM wParam, LPARAM) odp.szTitle.a = LPGEN("Toolbar"); odp.flags = ODPF_BOLDGROUPS; odp.pDialog = new CSrmmToolbarOptions(); - Options_AddPage(wParam, &odp); + g_plugin.addOptions(wParam, &odp); return 0; } diff --git a/src/mir_app/src/visibility.cpp b/src/mir_app/src/visibility.cpp index d12766845c..fee552ce8e 100644 --- a/src/mir_app/src/visibility.cpp +++ b/src/mir_app/src/visibility.cpp @@ -279,7 +279,7 @@ static int VisibilityOptInitialise(WPARAM wParam, LPARAM) odp.szGroup.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcVisibilityOpts;
odp.flags = ODPF_BOLDGROUPS;
- Options_AddPage(wParam, &odp);
+ g_plugin.addOptions(wParam, &odp);
return 0;
}
|