diff options
| author | George Hazan <ghazan@miranda.im> | 2016-10-28 16:18:50 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-10-28 16:18:50 +0300 |
| commit | cf9de21af3073e29cb7b149fbd8427241de70729 (patch) | |
| tree | 2a0b17f49d14d4a51bc942f15bf3747509f0c3cf /plugins | |
| parent | 3de431cc811a1fbf9cd0d520fe33b6163c73e919 (diff) | |
- old useless helpers removed from the Options module;
- mir_app functions introduced instead of them;
- OPENOPTIONSDIALOG structure removed from m_options.h
Diffstat (limited to 'plugins')
149 files changed, 530 insertions, 653 deletions
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 11f36dfb1e..558426105a 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -709,20 +709,20 @@ int OptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInst; odp.flags = ODPF_BOLDGROUPS; - odp.pszGroup = LPGEN("Contacts"); - odp.pszTitle = LPGEN("Avatars"); + odp.szGroup.a = LPGEN("Contacts"); + odp.szTitle.a = LPGEN("Avatars"); - odp.pszTab = LPGEN("Protocols"); + odp.szTab.a = LPGEN("Protocols"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PICTS); odp.pfnDlgProc = DlgProcOptionsProtos; Options_AddPage(wParam, &odp); - odp.pszTab = LPGEN("Contact avatars"); + odp.szTab.a = LPGEN("Contact avatars"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_AVATARS); odp.pfnDlgProc = DlgProcOptionsAvatars; Options_AddPage(wParam, &odp); - odp.pszTab = LPGEN("Own avatars"); + odp.szTab.a = LPGEN("Own avatars"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_OWN); odp.pfnDlgProc = DlgProcOptionsOwn; Options_AddPage(wParam, &odp); @@ -1104,7 +1104,7 @@ int OnDetailsInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 }; odp.hIcon = g_hIcon; odp.hInstance = g_hInst; - odp.pszTitle = LPGEN("Avatar"); + odp.szTitle.a = LPGEN("Avatar"); MCONTACT hContact = lParam; if (hContact == NULL) { diff --git a/plugins/Alarms/src/frame.cpp b/plugins/Alarms/src/frame.cpp index 41824701af..6df1829178 100644 --- a/plugins/Alarms/src/frame.cpp +++ b/plugins/Alarms/src/frame.cpp @@ -383,12 +383,7 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar case WM_COMMAND:
switch(LOWORD(wParam)) {
case ID_REMINDERFRAMECONTEXT_OPTIONS:
- OPENOPTIONSDIALOG oop;
- oop.cbSize = sizeof(oop);
- oop.pszGroup = "Events";
- oop.pszPage = "Alarms";
- oop.pszTab = 0;
- Options_Open(&oop);
+ Options_Open(L"Events", L"Alarms");
break;
case ID_REMINDERFRAMECONTEXT_SUSPEND:
diff --git a/plugins/Alarms/src/options.cpp b/plugins/Alarms/src/options.cpp index 1920adb518..f7cdda24b8 100644 --- a/plugins/Alarms/src/options.cpp +++ b/plugins/Alarms/src/options.cpp @@ -977,8 +977,8 @@ int OptInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
- odp.pszTitle = LPGEN("Alarms");
- odp.pszGroup = LPGEN("Events");
+ odp.szTitle.a = LPGEN("Alarms");
+ odp.szGroup.a = LPGEN("Events");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/AssocMgr/src/assoclist.cpp b/plugins/AssocMgr/src/assoclist.cpp index ba8a5e9141..c1c34f528e 100644 --- a/plugins/AssocMgr/src/assoclist.cpp +++ b/plugins/AssocMgr/src/assoclist.cpp @@ -919,8 +919,8 @@ static int AssocListOptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ASSOCLIST);
odp.position = 900000100; // network opts = 900000000
- odp.pszGroup = LPGEN("Services"); // autotranslated
- odp.pszTitle = LPGEN("Associations"); // autotranslated
+ odp.szGroup.a = LPGEN("Services"); // autotranslated
+ odp.szTitle.a = LPGEN("Associations"); // autotranslated
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = AssocListOptDlgProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/AuthState/src/options.cpp b/plugins/AuthState/src/options.cpp index 23bf7f609f..be4a169827 100644 --- a/plugins/AuthState/src/options.cpp +++ b/plugins/AuthState/src/options.cpp @@ -22,8 +22,8 @@ int onOptInitialise(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pszGroup = LPGEN("Icons");
- odp.pszTitle = LPGEN("Auth state");
+ odp.szGroup.a = LPGEN("Icons");
+ odp.szTitle.a = LPGEN("Auth state");
odp.flags = ODPF_BOLDGROUPS;
odp.pDialog = new COptionsDialog;
Options_AddPage(wParam, &odp);
diff --git a/plugins/AutoRun/src/main.cpp b/plugins/AutoRun/src/main.cpp index dbd17855b0..0923879dab 100644 --- a/plugins/AutoRun/src/main.cpp +++ b/plugins/AutoRun/src/main.cpp @@ -106,8 +106,8 @@ static int AutorunOptInitialise(WPARAM wParam,LPARAM) odp.position = 100100000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_AUTORUN);
- odp.pszTitle = ModuleName;
- odp.pszGroup = LPGEN("Services");
+ odp.szTitle.a = ModuleName;
+ odp.szGroup.a = LPGEN("Services");
odp.pfnDlgProc = DlgProcAutorunOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/AutoShutdown/src/options.cpp b/plugins/AutoShutdown/src/options.cpp index 267959c1d6..7a9f2001fd 100644 --- a/plugins/AutoShutdown/src/options.cpp +++ b/plugins/AutoShutdown/src/options.cpp @@ -110,9 +110,9 @@ static int ShutdownOptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHUTDOWN);
odp.position = 900000002;
- odp.pwszGroup = LPGENW("Events"); /* autotranslated */
- odp.pwszTitle = LPGENW("Automatic shutdown"); /* autotranslated */
- odp.pwszTab = LPGENW("Automatic shutdown"); /* autotranslated, can be made a tab */
+ odp.szGroup.w = LPGENW("Events"); /* autotranslated */
+ odp.szTitle.w = LPGENW("Automatic shutdown"); /* autotranslated */
+ 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);
diff --git a/plugins/AutoShutdown/src/settingsdlg.cpp b/plugins/AutoShutdown/src/settingsdlg.cpp index ce4504eb4d..58e3911e07 100644 --- a/plugins/AutoShutdown/src/settingsdlg.cpp +++ b/plugins/AutoShutdown/src/settingsdlg.cpp @@ -331,15 +331,8 @@ static INT_PTR CALLBACK SettingsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, L break;
case IDC_URL_IDLE:
- {
- OPENOPTIONSDIALOG ood;
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Status"; /* autotranslated */
- ood.pszPage = "Idle"; /* autotranslated */
- ood.pszTab = NULL;
- Options_Open(&ood);
- return TRUE;
- }
+ Options_Open(L"Status", L"Idle");
+ return TRUE;
case IDC_COMBO_SHUTDOWNTYPE:
if (HIWORD(wParam) == CBN_SELCHANGE)
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index b8c7883560..b1190ed857 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -148,16 +148,16 @@ int OptInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pwszGroup = LPGENW("History"); // group to put your item under
- odp.pwszTitle = LPGENW("Avatar"); // name of the item
+ odp.szGroup.w = LPGENW("History"); // group to put your item under
+ odp.szTitle.w = LPGENW("Avatar"); // name of the item
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.pwszGroup = LPGENW("Popups");
- odp.pwszTitle = LPGENW("Avatar change");
+ odp.szGroup.w = LPGENW("Popups");
+ odp.szTitle.w = LPGENW("Avatar change");
odp.pfnDlgProc = PopupsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index 681eda2a05..5c770678b0 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -317,9 +317,9 @@ int OptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = ModuleName;
+ odp.szTitle.a = ModuleName;
odp.pfnDlgProc = OptionsProc;
- odp.pszGroup = LPGEN("Sounds");
+ odp.szGroup.a = LPGEN("Sounds");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/BasicHistory/src/HistoryWindow.cpp b/plugins/BasicHistory/src/HistoryWindow.cpp index 8f8c856e9f..3f2aa1c040 100644 --- a/plugins/BasicHistory/src/HistoryWindow.cpp +++ b/plugins/BasicHistory/src/HistoryWindow.cpp @@ -467,16 +467,6 @@ void ConvertSize(HWND hwndSrc, HWND hwndDest, RECT& rc) rc.bottom = pt.y;
}
-void OpenOptions(char* group, char* page, char* tab = NULL)
-{
- OPENOPTIONSDIALOG op;
- op.cbSize = sizeof(OPENOPTIONSDIALOG);
- op.pszGroup = group;
- op.pszPage = page;
- op.pszTab = tab;
- Options_Open(&op);
-}
-
#define DlgReturn(ret){\
SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, (ret));\
return (ret);\
@@ -545,12 +535,7 @@ INT_PTR CALLBACK HistoryWindow::DlgProcHistory(HWND hwndDlg, UINT msg, WPARAM wP DlgReturn(TRUE);
case IDM_CONFIG:
- {
- OPENOPTIONSDIALOG opd = { 0 };
- opd.cbSize = sizeof(opd);
- opd.pszPage = LPGEN("History");
- Options_Open(&opd);
- }
+ Options_Open(LPGENW("History"));
DlgReturn(TRUE);
case IDM_DELETE:
@@ -1784,13 +1769,13 @@ void HistoryWindow::ConfigToolbarClicked(LPNMTOOLBAR lpnmTB) SendMessage(m_hWnd, WM_COMMAND, IDM_CONFIG, 0);
break;
case IDM_FONTS:
- OpenOptions("Customize", "Fonts and colors");
+ Options_Open(L"Customize", L"Fonts and colors");
break;
case IDM_ICONS:
- OpenOptions("Customize", "Icons");
+ Options_Open(L"Customize", L"Icons");
break;
case IDM_HOTKEYS:
- OpenOptions("Customize", "Hotkeys");
+ Options_Open(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 3e6fd6d8de..6b33158851 100644 --- a/plugins/BasicHistory/src/Options.cpp +++ b/plugins/BasicHistory/src/Options.cpp @@ -124,34 +124,34 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTitle = LPGENW("History");
+ odp.szTitle.w = LPGENW("History");
- odp.pwszTab = LPGENW("Group list");
+ odp.szTab.w = LPGENW("Group list");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GROUPLIST);
odp.pfnDlgProc = Options::DlgProcOptsGroupList;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Messages");
+ odp.szTab.w = LPGENW("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MESSAGES);
odp.pfnDlgProc = Options::DlgProcOptsMessages;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Searching");
+ odp.szTab.w = LPGENW("Searching");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SEARCHING);
odp.pfnDlgProc = Options::DlgProcOptsSearching;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Export");
+ odp.szTab.w = LPGENW("Export");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXPORT);
odp.pfnDlgProc = Options::DlgProcOptsExport;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Scheduler");
+ odp.szTab.w = LPGENW("Scheduler");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SCHEDULER);
odp.pfnDlgProc = Options::DlgProcOptsScheduler;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Advanced");
+ odp.szTab.w = LPGENW("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);
odp.pfnDlgProc = Options::DlgProcOptsMain;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index ca63fc71c5..212ad0205c 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -446,16 +446,16 @@ static int MessageOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = hInst;
- odp.pszGroup = BOLTUN_GROUP;
- odp.pszTitle = BOLTUN_NAME;
+ odp.szGroup.a = BOLTUN_GROUP;
+ odp.szTitle.a = BOLTUN_NAME;
odp.pfnDlgProc = MainDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN);
- odp.pszTab = TAB_GENERAL;
+ odp.szTab.a = TAB_GENERAL;
Options_AddPage(wParam, &odp);
odp.pfnDlgProc = EngineDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ENGINE);
- odp.pszTab = TAB_ENGINE;
+ odp.szTab.a = TAB_ENGINE;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/BossKeyPlus/src/Options.cpp b/plugins/BossKeyPlus/src/Options.cpp index 682689a7df..1c9bce5ce4 100644 --- a/plugins/BossKeyPlus/src/Options.cpp +++ b/plugins/BossKeyPlus/src/Options.cpp @@ -184,12 +184,8 @@ INT_PTR CALLBACK MainOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam return true;
case IDC_MAINOPT_LNK_HOTKEY:
- OPENOPTIONSDIALOG ood = { 0 };
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Customize";
- ood.pszPage = "Hotkeys";
- Options_Open(&ood);
- return (true);
+ Options_Open(L"Customize", L"Hotkeys");
+ return true;
}
return 0;
@@ -323,15 +319,15 @@ int OptsDlgInit(WPARAM wParam, LPARAM) optDi.pfnDlgProc = MainOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_OPTDIALOGMAIN);
optDi.hInstance = g_hInstance;
- optDi.pwszTitle = LPGENW("BossKey");
- optDi.pwszGroup = LPGENW("Events");
- optDi.pwszTab = LPGENW("Main");
- optDi.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
+ optDi.szTitle.a = LPGEN("BossKey");
+ optDi.szGroup.a = LPGEN("Events");
+ optDi.szTab.a = LPGEN("Main");
+ optDi.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &optDi);
optDi.pfnDlgProc = AdvOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_OPTDIALOGADV);
- optDi.pwszTab = LPGENW("Advanced");
+ optDi.szTab.a = LPGEN("Advanced");
Options_AddPage(wParam, &optDi);
return 0;
}
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 269ec50eaf..158e328583 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -433,15 +433,15 @@ static int OptionsInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pwszGroup = LPGENW("Contacts");
+ odp.szGroup.w = LPGENW("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPANEL);
- odp.pwszTitle = LPGENW("Buddy Expectator");
+ odp.szTitle.w = LPGENW("Buddy Expectator");
odp.pfnDlgProc = OptionsFrameProc;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.pwszGroup = LPGENW("Popups");
+ odp.szGroup.w = LPGENW("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPPANEL);
odp.pfnDlgProc = PopupOptionsFrameProc;
Options_AddPage(wParam, &odp);
@@ -531,8 +531,7 @@ int UserinfoInit(WPARAM wparam, LPARAM lparam) OPTIONSDIALOGPAGE uip = { sizeof(uip) };
uip.hInstance = hInst;
uip.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO);
- uip.flags = ODPF_UNICODE;
- uip.pwszTitle = LPGENW("Buddy Expectator");
+ uip.szTitle.a = LPGEN("Buddy Expectator");
uip.pfnDlgProc = UserinfoDlgProc;
UserInfo_AddPage(wparam, &uip);
}
diff --git a/plugins/BuddyPounce/src/main.cpp b/plugins/BuddyPounce/src/main.cpp index 942b9a1c24..cbab6e24f0 100644 --- a/plugins/BuddyPounce/src/main.cpp +++ b/plugins/BuddyPounce/src/main.cpp @@ -98,8 +98,8 @@ int BuddyPounceOptInit(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pwszGroup = LPGENW("Message sessions");
- odp.pwszTitle = LPGENW("Buddy Pounce");
+ odp.szGroup.w = LPGENW("Message sessions");
+ odp.szTitle.w = LPGENW("Buddy Pounce");
odp.pfnDlgProc = BuddyPounceOptionsDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index f81912dfb8..7fc7af2ca4 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -85,8 +85,8 @@ static int OnInitOptions(WPARAM wparam, LPARAM) odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); odp.pfnDlgProc = CSOptionsProc; - odp.pwszGroup = L"Status"; - odp.pwszTitle = MODULENAME; + odp.szGroup.w = L"Status"; + odp.szTitle.w = MODULENAME; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; Options_AddPage(wparam, &odp); return 0; diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 9abe24c248..4fb45f049e 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -143,15 +143,15 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN_OPTION_FORM);
- odp.pszTitle = ModuleName;
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szTitle.a = ModuleName;
+ odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgMainProcOptions;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPTION_FORM);
- odp.pszGroup = LPGEN("Popups");
+ odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgPopupsProcOptions;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index ffc13577d3..80e1f117e0 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -163,12 +163,12 @@ int OptionsDlgInit(WPARAM wParam, LPARAM) if (bPopupExists) {
OPTIONSDIALOGPAGE optDi = { sizeof(optDi) };
optDi.position = 920000000;
- optDi.pwszTitle = LPGENW("ClientChangeNotify");
+ optDi.szGroup.a = LPGEN("Popups");
+ optDi.szTitle.a = LPGEN("ClientChangeNotify");
optDi.pfnDlgProc = PopupOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
optDi.hInstance = g_hInstance;
- optDi.pwszGroup = LPGENW("Popups");
- optDi.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
+ optDi.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &optDi);
}
return 0;
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 576d958b48..a12f37a104 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -263,9 +263,9 @@ int ClcOptInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
- odp.pszGroup = LPGEN("Contact list");
+ odp.szGroup.a = LPGEN("Contact list");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
- odp.pszTitle = LPGEN("List");
+ odp.szTitle.a = LPGEN("List");
odp.pfnDlgProc = DlgProcClcMainOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index 8a0ed83017..4e1e3d8b5f 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -187,7 +187,7 @@ int CListOptInit(WPARAM wParam, LPARAM) odp.position = -1000000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);
- odp.pszTitle = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcGenOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 34e804d442..5bad81b075 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -310,14 +310,14 @@ int CluiOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);
- odp.pszTitle = LPGEN("Window");
- odp.pszGroup = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Window");
+ odp.szGroup.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
- odp.pszTitle = LPGEN("Status bar");
+ odp.szTitle.a = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index a7ab4ba676..a8b97612bc 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -1817,13 +1817,13 @@ int ClcOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
- odp.pszTitle = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = DlgProcClistListOpts;
odp.flags = ODPF_BOLDGROUPS;
for (int i = 0; i < _countof(clist_opt_items); i++) {
odp.pszTemplate = MAKEINTRESOURCEA(clist_opt_items[i].id);
- odp.pszTab = clist_opt_items[i].name;
+ odp.szTab.a = clist_opt_items[i].name;
odp.pfnDlgProc = clist_opt_items[i].wnd_proc;
odp.flags = ODPF_BOLDGROUPS | clist_opt_items[i].flag;
Options_AddPage(wParam, &odp);
@@ -1831,9 +1831,9 @@ int ClcOptInit(WPARAM wParam, LPARAM) if (g_CluiData.fDisableSkinEngine) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST_LISTBKG);
- odp.pszGroup = LPGEN("Skins");
- odp.pszTitle = LPGEN("Contact list");
- odp.pszTab = LPGEN("List background");
+ odp.szGroup.a = LPGEN("Skins");
+ odp.szTitle.a = LPGEN("Contact list");
+ odp.szTab.a = LPGEN("List background");
odp.pfnDlgProc = DlgProcClcBkgOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 2039a0deb4..41cf048c9c 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -933,13 +933,13 @@ int CListOptInit(WPARAM wParam, LPARAM) odp.position = -200000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ITEMS);
- odp.pszGroup = LPGEN("Contact list");
- odp.pszTitle = LPGEN("Row items");
+ odp.szGroup.a = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Row items");
odp.flags = ODPF_BOLDGROUPS;
for (int i = 0; i < _countof(row_opt_items); i++) {
odp.pszTemplate = MAKEINTRESOURCEA(row_opt_items[i].id);
- odp.pszTab = row_opt_items[i].name;
+ odp.szTab.a = row_opt_items[i].name;
odp.pfnDlgProc = row_opt_items[i].wnd_proc;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 161038a4f5..e47add0db3 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -53,8 +53,8 @@ int SkinOptInit(WPARAM wParam, LPARAM) odp.hInstance = g_hInst; odp.pfnDlgProc = DlgSkinOpts; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN); - odp.pwszGroup = LPGENW("Skins"); - odp.pwszTitle = LPGENW("Contact list"); + odp.szGroup.w = LPGENW("Skins"); + odp.szTitle.w = LPGENW("Contact list"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; Options_AddPage(wParam, &odp); } diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 579407f4d6..316937af0e 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -521,28 +521,28 @@ int ClcOptInit(WPARAM wParam, LPARAM) odp.position = -1000000000;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = LPGEN("Contact list");
- odp.pszTab = LPGEN("General");
+ odp.szTitle.a = LPGEN("Contact list");
+ odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgProcGenOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLIST);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("List layout");
+ odp.szTab.a = LPGEN("List layout");
odp.pfnDlgProc = DlgProcClcMainOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLC);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Window");
+ odp.szTab.a = LPGEN("Window");
odp.pfnDlgProc = DlgProcCluiOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLUI);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Background");
+ odp.szTab.a = LPGEN("Background");
odp.pfnDlgProc = DlgProcClcBkgOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CLCBKG);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Status bar");
+ odp.szTab.a = LPGEN("Status bar");
odp.pfnDlgProc = DlgProcSBarOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SBAR);
Options_AddPage(wParam, &odp);
@@ -551,25 +551,25 @@ int ClcOptInit(WPARAM wParam, LPARAM) // Contact rows tabs
odp.position = 0;
- odp.pszGroup = LPGEN("Contact list");
- odp.pszTitle = LPGEN("Row items");
- odp.pszTab = LPGEN("Contacts");
+ odp.szGroup.a = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Row items");
+ odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcDspItems;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPITEMS);
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Groups and layout");
+ odp.szTab.a = LPGEN("Groups and layout");
odp.pfnDlgProc = DlgProcDspGroups;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPGROUPS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Advanced");
+ odp.szTab.a = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcDspAdvanced;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DSPADVANCED);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Icons");
+ odp.szTab.a = LPGEN("Icons");
odp.pfnDlgProc = DlgProcIcons;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ICONS);
Options_AddPage(wParam, &odp);
@@ -578,8 +578,8 @@ int ClcOptInit(WPARAM wParam, LPARAM) // Other options
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.pszGroup = LPGEN("Skins");
- odp.pszTitle = LPGEN("Contact list");
+ odp.szGroup.a = LPGEN("Skins");
+ odp.szTitle.a = LPGEN("Contact list");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/ConnectionNotify/src/ConnectionNotify.cpp b/plugins/ConnectionNotify/src/ConnectionNotify.cpp index 85aaa80972..0ec95a3328 100644 --- a/plugins/ConnectionNotify/src/ConnectionNotify.cpp +++ b/plugins/ConnectionNotify/src/ConnectionNotify.cpp @@ -588,8 +588,8 @@ int ConnectionNotifyOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DIALOG);
- odp.pwszTitle = _A2W(PLUGINNAME);
- odp.pwszGroup = LPGENW("Plugins");
+ odp.szTitle.w = _A2W(PLUGINNAME);
+ odp.szGroup.w = LPGENW("Plugins");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcConnectionNotifyOpts;//callback function name
Options_AddPage(wParam, &odp);
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 4fc02875fc..e7c6e37258 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -1058,8 +1058,8 @@ static int OptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Services");
- odp.pszTitle = LPGEN("Console");
+ odp.szGroup.a = LPGEN("Services");
+ odp.szTitle.a = LPGEN("Console");
odp.pfnDlgProc = OptDlgProc;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/CountryFlags/src/options.cpp b/plugins/CountryFlags/src/options.cpp index ed8c02eb7f..01b0e31a5c 100644 --- a/plugins/CountryFlags/src/options.cpp +++ b/plugins/CountryFlags/src/options.cpp @@ -86,9 +86,9 @@ int OnOptionsInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRAIMG);
odp.position = 900000002;
- odp.pszGroup = LPGEN("Icons"); /* autotranslated */
- odp.pszTitle = LPGEN("Country Flags"); /* autotranslated */
- odp.pszTab = LPGEN("Country Flags"); /* autotranslated, can be made a tab */
+ odp.szGroup.a = LPGEN("Icons"); /* autotranslated */
+ odp.szTitle.a = LPGEN("Country Flags"); /* autotranslated */
+ odp.szTab.a = LPGEN("Country Flags"); /* autotranslated, can be made a tab */
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = ExtraImgOptDlgProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp index d351160b0b..6538e93bfc 100644 --- a/plugins/CrashDumper/src/crshdmp.cpp +++ b/plugins/CrashDumper/src/crshdmp.cpp @@ -203,8 +203,8 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = PluginName;
- odp.pszGroup = LPGEN("Services");
+ odp.szTitle.a = PluginName;
+ odp.szGroup.a = LPGEN("Services");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 9c18e83900..acfae3aa8e 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -288,7 +288,7 @@ static int OnOptionsInit(PVOID obj, WPARAM wParam, LPARAM) odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = LPGEN("Database");
+ odp.szTitle.a = LPGEN("Database");
odp.pfnDlgProc = DlgProcOptions;
odp.dwInitParam = (LPARAM)obj;
Options_AddPage(wParam, &odp);
diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp index da31dd2eb1..6868493943 100644 --- a/plugins/DbEditorPP/src/main_window.cpp +++ b/plugins/DbEditorPP/src/main_window.cpp @@ -506,12 +506,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) refreshTree(1);
break;
case MENU_OPEN_OPTIONS:
- OPENOPTIONSDIALOG odp = { 0 };
- odp.cbSize = sizeof(odp);
- odp.pszGroup = "Database";
- odp.pszPage = modFullname;
- odp.pszTab = 0;
- Options_Open(&odp);
+ Options_Open(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 8879d0f4a5..c6c59a83ad 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -64,8 +64,8 @@ INT OptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Database");
- odp.pszTitle = modFullname;
+ odp.szGroup.a = LPGEN("Database");
+ odp.szTitle.a = modFullname;
odp.pfnDlgProc = DlgProcOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Db_autobackups/src/options.cpp b/plugins/Db_autobackups/src/options.cpp index d7d54eae55..7d1fdeaaab 100644 --- a/plugins/Db_autobackups/src/options.cpp +++ b/plugins/Db_autobackups/src/options.cpp @@ -322,15 +322,9 @@ INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
case IDC_LNK_FOLDERS:
- {
- OPENOPTIONSDIALOG ood = { 0 };
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Customize";
- ood.pszPage = "Folders";
- Options_Open(&ood);
+ Options_Open(L"Customize", L"Folders");
break;
}
- }
}
break;
@@ -406,8 +400,8 @@ int OptionsInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = g_hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = LPGEN("Automatic backups");
- odp.pszGroup = LPGEN("Database");
+ odp.szTitle.a = LPGEN("Automatic backups");
+ odp.szGroup.a = LPGEN("Database");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Dropbox/src/dropbox_options.cpp b/plugins/Dropbox/src/dropbox_options.cpp index 20f3f99474..fd60a14f3f 100644 --- a/plugins/Dropbox/src/dropbox_options.cpp +++ b/plugins/Dropbox/src/dropbox_options.cpp @@ -152,15 +152,15 @@ void CDropboxOptionsInterception::OnApply() int CDropbox::OnOptionsInitialized(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pwszTitle = MODULEW;
+ odp.szTitle.w = MODULEW;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
- odp.pwszGroup = LPGENW("Network");
+ odp.szGroup.w = LPGENW("Network");
- odp.pwszTab = LPGENW("General");
+ odp.szTab.w = LPGENW("General");
odp.pDialog = CDropboxOptionsMain::CreateOptionsPage(this);
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Interception");
+ odp.szTab.w = LPGENW("Interception");
odp.pDialog = CDropboxOptionsInterception::CreateOptionsPage(this);
Options_AddPage(wParam, &odp);
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index 4d70d44ceb..afa9da5c32 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -82,8 +82,8 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXCHANGE);
- odp.pwszTitle = LPGENW("Exchange notify");
- odp.pwszGroup = LPGENW("Plugins");
+ odp.szTitle.w = LPGENW("Exchange notify");
+ odp.szGroup.w = LPGENW("Plugins");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcOptions;
diff --git a/plugins/FTPFileYM/src/options.cpp b/plugins/FTPFileYM/src/options.cpp index 38777bcc6a..00edede2ee 100644 --- a/plugins/FTPFileYM/src/options.cpp +++ b/plugins/FTPFileYM/src/options.cpp @@ -250,15 +250,15 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTitle = LPGENW("FTP File");
- odp.pwszGroup = LPGENW("Services");
+ odp.szTitle.w = LPGENW("FTP File");
+ odp.szGroup.w = LPGENW("Services");
- odp.pwszTab = LPGENW("Accounts");
+ odp.szTab.w = LPGENW("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FTPFILE);
odp.pfnDlgProc = Options::DlgProcOptsAccounts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Advanced");
+ odp.szTab.w = LPGENW("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = Options::DlgProcOptsAdvanced;
Options_AddPage(wParam, &odp);
diff --git a/plugins/FavContacts/src/options.cpp b/plugins/FavContacts/src/options.cpp index 39d0578537..d0ebe942b3 100644 --- a/plugins/FavContacts/src/options.cpp +++ b/plugins/FavContacts/src/options.cpp @@ -173,13 +173,7 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA break;
case IDC_BTN_FONTS:
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszGroup = "Customize";
- ood.pszPage = "Fonts and colors";
- ood.pszTab = NULL;
- Options_Open(&ood);
- }
+ Options_Open(L"Customize", L"Fonts and colors");
break;
case IDC_TXT_RADIUS:
@@ -263,8 +257,8 @@ int ProcessOptInitialise(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Contacts");
- odp.pszTitle = LPGEN("Favorites");
+ odp.szGroup.a = LPGEN("Contacts");
+ odp.szTitle.a = LPGEN("Favorites");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp index 51c8b53d83..15c53a7c35 100644 --- a/plugins/FileAsMessage/src/main.cpp +++ b/plugins/FileAsMessage/src/main.cpp @@ -149,8 +149,8 @@ int OnOptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = {};
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = SERVICE_TITLE;
- odp.pszGroup = LPGEN("Events");
+ odp.szTitle.a = SERVICE_TITLE;
+ odp.szGroup.a = LPGEN("Events");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 36bac46dab..e90b718026 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -117,9 +117,9 @@ int OnOptInitialise(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
- odp.pwszGroup = LPGENW("Icons");
+ odp.szGroup.w = LPGENW("Icons");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG);
- odp.pwszTitle = LPGENW("Fingerprint");
+ odp.szTitle.w = LPGENW("Fingerprint");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
Options_AddPage(wParam, &odp);
diff --git a/plugins/FloatingContacts/src/options.cpp b/plugins/FloatingContacts/src/options.cpp index f62b761fc4..b9338223b4 100644 --- a/plugins/FloatingContacts/src/options.cpp +++ b/plugins/FloatingContacts/src/options.cpp @@ -335,15 +335,15 @@ int OnOptionsInitialize(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FLTCONT);
- odp.pszTitle = LPGEN("Floating Contacts");
- odp.pszGroup = LPGEN("Contact list");
- odp.pszTab = LPGEN("Main Features");
+ odp.szTitle.a = LPGEN("Floating Contacts");
+ odp.szGroup.a = LPGEN("Contact list");
+ odp.szTab.a = LPGEN("Main Features");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptWndProc;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
- odp.pszTab = LPGEN("Appearance");
+ odp.szTab.a = LPGEN("Appearance");
odp.pfnDlgProc = OptSknWndProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Folders/src/dlg_handlers.cpp b/plugins/Folders/src/dlg_handlers.cpp index ec64c90581..621cdb87b8 100644 --- a/plugins/Folders/src/dlg_handlers.cpp +++ b/plugins/Folders/src/dlg_handlers.cpp @@ -251,8 +251,8 @@ static int OnOptionsInitialize(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FOLDERS);
- odp.pszTitle = LPGEN("Folders");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTitle.a = LPGEN("Folders");
+ odp.szGroup.a = LPGEN("Customize");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
diff --git a/plugins/GmailNotifier/src/options.cpp b/plugins/GmailNotifier/src/options.cpp index 02be23fd17..aa5be0f448 100644 --- a/plugins/GmailNotifier/src/options.cpp +++ b/plugins/GmailNotifier/src/options.cpp @@ -262,8 +262,8 @@ int OptInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.pszTitle = LPGEN("GmailNotifier");
- odp.pszGroup = LPGEN("Network");
+ odp.szTitle.a = LPGEN("GmailNotifier");
+ odp.szGroup.a = LPGEN("Network");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 9df5a270d2..f9d8c2c126 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1343,8 +1343,8 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_HTTP_SERVER);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTitle = LPGENW("HTTP Server");
- odp.pwszGroup = LPGENW("Network");
+ odp.szTitle.w = LPGENW("HTTP Server");
+ odp.szGroup.w = LPGENW("Network");
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/HistoryLinkListPlus/src/linklist.cpp b/plugins/HistoryLinkListPlus/src/linklist.cpp index fb74cbd4a0..aa22ba632d 100644 --- a/plugins/HistoryLinkListPlus/src/linklist.cpp +++ b/plugins/HistoryLinkListPlus/src/linklist.cpp @@ -104,8 +104,8 @@ int InitOptionsDlg(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("History");
- odp.pszTitle = LPGEN("History Linklist");
+ odp.szGroup.a = LPGEN("History");
+ odp.szTitle.a = LPGEN("History Linklist");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_DLG);
odp.pfnDlgProc = OptionsDlgProc;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/HistoryStats/src/mu_common.cpp b/plugins/HistoryStats/src/mu_common.cpp index 598537b135..9737381a2f 100644 --- a/plugins/HistoryStats/src/mu_common.cpp +++ b/plugins/HistoryStats/src/mu_common.cpp @@ -81,13 +81,13 @@ namespace mu void addPage(WPARAM addInfo, const wchar_t* pszGroup, const wchar_t* pszTitle, const wchar_t* pszTab, DLGPROC pfnDlgProc, const char* pszTemplate, HINSTANCE hInstance, DWORD flags /* = ODPF_BOLDGROUPS */)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pwszTitle = const_cast<wchar_t*>(pszTitle);
+ odp.szTitle.w = const_cast<wchar_t*>(pszTitle);
odp.pfnDlgProc = pfnDlgProc;
odp.pszTemplate = const_cast<char*>(pszTemplate);
odp.hInstance = hInstance;
- odp.pwszGroup = const_cast<wchar_t*>(pszGroup);
+ odp.szGroup.w = const_cast<wchar_t*>(pszGroup);
odp.flags = flags | ODPF_UNICODE;
- odp.pwszTab = const_cast<wchar_t*>(pszTab);
+ odp.szTab.w = const_cast<wchar_t*>(pszTab);
Options_AddPage(addInfo, &odp);
}
}
diff --git a/plugins/HistorySweeperLight/src/options.cpp b/plugins/HistorySweeperLight/src/options.cpp index 9744a5b889..36dcd48c01 100644 --- a/plugins/HistorySweeperLight/src/options.cpp +++ b/plugins/HistorySweeperLight/src/options.cpp @@ -275,8 +275,8 @@ int HSOptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HISTORYSWEEPER);
- odp.pszTitle = ModuleName;
- odp.pszGroup = LPGEN("History");
+ odp.szTitle.a = ModuleName;
+ odp.szGroup.a = LPGEN("History");
odp.pfnDlgProc = DlgProcHSOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index eec095c9f1..a138e21388 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -130,8 +130,8 @@ int initializeOptions(WPARAM wParam, LPARAM) OptDlgPg.hInstance = hInstance;
OptDlgPg.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
OptDlgPg.pszTemplate = MAKEINTRESOURCEA(dlg_options);
- OptDlgPg.pwszGroup = LPGENW("Customize");
- OptDlgPg.pwszTitle = LPGENW("Hardware HotKeys");
+ OptDlgPg.szGroup.w = LPGENW("Customize");
+ OptDlgPg.szTitle.w = LPGENW("Hardware HotKeys");
OptDlgPg.pfnDlgProc = OptDlgProc;
OptDlgPg.hLangpack = hLangpack;
Options_AddPage(wParam, &OptDlgPg);
diff --git a/plugins/IEHistory/src/events.cpp b/plugins/IEHistory/src/events.cpp index 5d63eb25dd..c56d11b6da 100644 --- a/plugins/IEHistory/src/events.cpp +++ b/plugins/IEHistory/src/events.cpp @@ -39,7 +39,7 @@ int OnOptionsInitialize(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100000000; - odp.pwszTitle = LPGENW("History"); + odp.szTitle.w = LPGENW("History"); odp.pfnDlgProc = OptionsDlgProc; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_HISTORY); odp.hInstance = hInstance; diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp index 33f7a40fc2..841bebac25 100644 --- a/plugins/IEView/src/Options.cpp +++ b/plugins/IEView/src/Options.cpp @@ -437,20 +437,20 @@ int IEViewOptInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInstance;
- odp.pwszGroup = LPGENW("Message sessions");
- odp.pwszTitle = LPGENW("IEView");
+ odp.szGroup.w = LPGENW("Message sessions");
+ odp.szTitle.w = LPGENW("IEView");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(tabPages[0].dlgId);
odp.pfnDlgProc = tabPages[0].dlgProc;
- odp.pwszTab = tabPages[0].tabName;
+ odp.szTab.w = tabPages[0].tabName;
Options_AddPage(wParam, &odp);
- odp.pwszGroup = LPGENW("Skins");
- odp.pwszTitle = LPGENW("IEView");
+ odp.szGroup.w = LPGENW("Skins");
+ odp.szTitle.w = LPGENW("IEView");
for (size_t i = 1; i < _countof(tabPages); i++) {
odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);
odp.pfnDlgProc = tabPages[i].dlgProc;
- odp.pwszTab = tabPages[i].tabName;
+ odp.szTab.w = tabPages[i].tabName;
Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/plugins/IgnoreState/src/options.cpp b/plugins/IgnoreState/src/options.cpp index e34153b94f..1882a02de2 100644 --- a/plugins/IgnoreState/src/options.cpp +++ b/plugins/IgnoreState/src/options.cpp @@ -106,9 +106,9 @@ int onOptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszGroup = LPGEN("Icons");
+ odp.szGroup.a = LPGEN("Icons");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_IGNORE_OPT);
- odp.pszTitle = LPGEN("Ignore State");
+ odp.szTitle.a = LPGEN("Ignore State");
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp index 8296b4ea27..d4c006aad0 100644 --- a/plugins/KeyboardNotify/src/options.cpp +++ b/plugins/KeyboardNotify/src/options.cpp @@ -1388,8 +1388,8 @@ int InitializeOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS); - odp.pszTitle = LPGEN("Keyboard Flash"); - odp.pszGroup = LPGEN("Events"); + odp.szTitle.a = LPGEN("Keyboard Flash"); + odp.szGroup.a = LPGEN("Events"); odp.groupPosition = 910000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = DlgProcOptions; diff --git a/plugins/ListeningTo/src/options.cpp b/plugins/ListeningTo/src/options.cpp index 26667de180..d29f64cf2f 100644 --- a/plugins/ListeningTo/src/options.cpp +++ b/plugins/ListeningTo/src/options.cpp @@ -78,20 +78,20 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszGroup = LPGEN("Status");
- odp.pszTitle = LPGEN("Listening info");
- odp.pszTab = LPGEN("General");
+ odp.szGroup.a = LPGEN("Status");
+ odp.szTitle.a = LPGEN("Listening info");
+ odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Format");
+ odp.szTab.a = LPGEN("Format");
odp.pfnDlgProc = FormatDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_FORMAT);
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Players");
+ odp.szTab.a = LPGEN("Players");
odp.pfnDlgProc = PlayersDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PLAYERS);
Options_AddPage(wParam, &odp);
diff --git a/plugins/LotusNotify/src/LotusNotify.cpp b/plugins/LotusNotify/src/LotusNotify.cpp index f912f0433b..1e572922bd 100644 --- a/plugins/LotusNotify/src/LotusNotify.cpp +++ b/plugins/LotusNotify/src/LotusNotify.cpp @@ -1455,21 +1455,21 @@ int LotusNotifyOptInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pwszGroup = LPGENW("Plugins");
- odp.pwszTitle = _A2W(__PLUGIN_NAME);
+ odp.szGroup.w = LPGENW("Plugins");
+ odp.szTitle.w = _A2W(__PLUGIN_NAME);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTab = LPGENW("Connection");
+ odp.szTab.w = LPGENW("Connection");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_CONECTION);
odp.pfnDlgProc = DlgProcLotusNotifyConnectionOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Popup");
+ odp.szTab.w = LPGENW("Popup");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_POPUP);
odp.pfnDlgProc = DlgProcLotusNotifyPopupOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Miscellaneous");
+ odp.szTab.w = LPGENW("Miscellaneous");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOTUS_MISC);
odp.pfnDlgProc = DlgProcLotusNotifyMiscOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index 522b590739..af127f9ae7 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -23,7 +23,6 @@ static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS]; HICON hIcons[5];
BOOL bPopupService = FALSE;
PROTOACCOUNT **accs;
-OPENOPTIONSDIALOG ood;
int protoCount;
int hLangpack;
@@ -988,10 +987,6 @@ static int PluginInit(WPARAM, LPARAM) hIgnoreItem[i] = AddSubmenuItem(hmenuIgnore, ii[i].name, Skin_LoadIcon(ii[i].icon), 0, MS_IGNORE, pos++, ii[i].type);
pos += 100000; // insert separator
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Contacts";
- ood.pszPage = "Ignore";
- AddSubmenuItem(hmenuIgnore, LPGENW("Open ignore settings"), IcoLib_GetIcon("miex_ignore"), 0, "Opt/OpenOptions", pos, (INT_PTR)&ood);
SET_UID(mi, 0x820f4637, 0xbcc4, 0x46b7, 0x9c, 0x67, 0xf9, 0x69, 0xed, 0xc2, 0x46, 0xa2);
mi.position++;
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp index 2f94374064..997bc2d417 100644 --- a/plugins/MenuItemEx/src/options.cpp +++ b/plugins/MenuItemEx/src/options.cpp @@ -107,9 +107,9 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.position = 955000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = MODULENAME;
+ odp.szTitle.a = MODULENAME;
odp.pfnDlgProc = OptionsProc;
- odp.pszGroup = LPGEN("Customize");
+ odp.szGroup.a = LPGEN("Customize");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wparam, &odp);
return 0;
diff --git a/plugins/MirFox/src/MirandaOptions.cpp b/plugins/MirFox/src/MirandaOptions.cpp index 20e1d42c30..325ef6cd9b 100644 --- a/plugins/MirFox/src/MirandaOptions.cpp +++ b/plugins/MirFox/src/MirandaOptions.cpp @@ -675,25 +675,25 @@ int OptInit(WPARAM wParam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 };
odp.position = -790000000;
odp.hInstance = hInst;
- odp.pszTitle = LPGEN(PLUGIN_OPTIONS_NAME);
- odp.pszGroup = LPGEN("Services");
+ odp.szTitle.a = LPGEN(PLUGIN_OPTIONS_NAME);
+ odp.szGroup.a = LPGEN("Services");
odp.flags = ODPF_BOLDGROUPS;
//1 - options
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
- odp.pszTab = LPGEN("Options");
+ odp.szTab.a = LPGEN("Options");
odp.pfnDlgProc = DlgProcOpts_Tab1;
Options_AddPage(wParam, &odp);
//2 - contacts
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT2);
- odp.pszTab = LPGEN("Contacts");
+ odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcOpts_Tab2;
Options_AddPage(wParam, &odp);
//3 - accounts
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT3);
- odp.pszTab = LPGEN("Accounts");
+ odp.szTab.a = LPGEN("Accounts");
odp.pfnDlgProc = DlgProcOpts_Tab3;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/MirLua/src/m_options.cpp b/plugins/MirLua/src/m_options.cpp index f55af0f6d0..95330c4bea 100644 --- a/plugins/MirLua/src/m_options.cpp +++ b/plugins/MirLua/src/m_options.cpp @@ -54,15 +54,15 @@ void MakeOptionDialogPage(lua_State *L, OPTIONSDIALOGPAGE &odp) odp.flags |= ODPF_UNICODE;
lua_getfield(L, -1, "Group");
- odp.pwszGroup = mir_utf8decodeW(lua_tostring(L, -1));
+ odp.szGroup.w = mir_utf8decodeW(lua_tostring(L, -1));
lua_pop(L, 1);
lua_getfield(L, -1, "Title");
- odp.pwszTitle = mir_utf8decodeW(luaL_checkstring(L, -1));
+ odp.szTitle.w = mir_utf8decodeW(luaL_checkstring(L, -1));
lua_pop(L, 1);
lua_getfield(L, -1, "Tab");
- odp.pwszTab = mir_utf8decodeW(lua_tostring(L, -1));
+ odp.szTab.w = mir_utf8decodeW(lua_tostring(L, -1));
lua_pop(L, 1);
int onInitDialogRef = LUA_NOREF;
@@ -95,9 +95,9 @@ int opt_AddPage(lua_State *L) INT_PTR res = Options_AddPage(wParam, &odp);
lua_pushboolean(L, !res);
- mir_free(odp.pwszGroup);
- mir_free(odp.pwszTitle);
- mir_free(odp.pwszTab);
+ mir_free(odp.szGroup.w);
+ mir_free(odp.szTitle.w);
+ mir_free(odp.szTab.w);
return 1;
}
diff --git a/plugins/MirLua/src/mlua_options.cpp b/plugins/MirLua/src/mlua_options.cpp index dca7c9f363..86eb481ebb 100644 --- a/plugins/MirLua/src/mlua_options.cpp +++ b/plugins/MirLua/src/mlua_options.cpp @@ -161,9 +161,9 @@ int CMLuaOptions::OnOptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInstance;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE | ODPF_DONTTRANSLATE;
- odp.pwszGroup = LPGENW("Services");
- odp.pwszTitle = L"Lua";
- odp.pwszTab = LPGENW("Scripts");
+ odp.szGroup.w = LPGENW("Services");
+ odp.szTitle.w = L"Lua";
+ odp.szTab.w = LPGENW("Scripts");
odp.pDialog = CMLuaOptions::CreateOptionsPage();
Options_AddPage(wParam, &odp);
diff --git a/plugins/MirOTR/src/options.cpp b/plugins/MirOTR/src/options.cpp index d11a3ecb29..f0382af233 100644 --- a/plugins/MirOTR/src/options.cpp +++ b/plugins/MirOTR/src/options.cpp @@ -820,26 +820,26 @@ static int OpenOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.position = 100; odp.hInstance = hInst; - odp.pwszGroup = LPGENW("Services"); - odp.pwszTitle = L"OTR"; + odp.szGroup.w = LPGENW("Services"); + odp.szTitle.w = L"OTR"; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; - odp.pwszTab = LANG_OPT_GENERAL; + odp.szTab.w = LANG_OPT_GENERAL; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL); odp.pfnDlgProc = DlgProcMirOTROpts; Options_AddPage(wParam, &odp); - odp.pwszTab = LANG_OPT_PROTO; + odp.szTab.w = LANG_OPT_PROTO; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PROTO); odp.pfnDlgProc = DlgProcMirOTROptsProto; Options_AddPage(wParam, &odp); - odp.pwszTab = LANG_OPT_CONTACTS; + odp.szTab.w = LANG_OPT_CONTACTS; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACTS); odp.pfnDlgProc = DlgProcMirOTROptsContacts; Options_AddPage(wParam, &odp); - odp.pwszTab = LANG_OPT_FINGER; + odp.szTab.w = LANG_OPT_FINGER; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FINGER); odp.pfnDlgProc = DlgProcMirOTROptsFinger; Options_AddPage(wParam, &odp); diff --git a/plugins/MirandaG15/src/CConfig.cpp b/plugins/MirandaG15/src/CConfig.cpp index e5c6f687ca..87e3b43883 100644 --- a/plugins/MirandaG15/src/CConfig.cpp +++ b/plugins/MirandaG15/src/CConfig.cpp @@ -250,31 +250,31 @@ int CConfig::InitOptionsDialog(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 847000000;
odp.hInstance = hInstance;
- odp.pszGroup = LPGEN("MirandaG15");
+ odp.szGroup.a = LPGEN("MirandaG15");
odp.flags = ODPF_BOLDGROUPS;
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_FONTS);
- odp.pszTitle = LPGEN("Appearance");
- odp.pszGroup = LPGEN("MirandaG15");
+ odp.szTitle.a = LPGEN("Appearance");
+ odp.szGroup.a = LPGEN("MirandaG15");
odp.pfnDlgProc = CConfig::AppearanceDlgProc;
Options_AddPage(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_NOTIFICATIONS);
- odp.pszTitle = LPGEN("Notifications");
+ odp.szTitle.a = LPGEN("Notifications");
odp.pfnDlgProc = CConfig::NotificationsDlgProc;
Options_AddPage(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CHAT);
- odp.pszTitle = LPGEN("Chat sessions");
+ odp.szTitle.a = LPGEN("Chat sessions");
odp.pfnDlgProc = CConfig::ChatDlgProc;
Options_AddPage(wParam, &odp);
// ---------------------
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLIST);
- odp.pszTitle = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Contact list");
odp.pfnDlgProc = CConfig::ContactlistDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/ModernOpt/src/modernopt.cpp b/plugins/ModernOpt/src/modernopt.cpp index 4743e8394c..cf612d1bb5 100644 --- a/plugins/ModernOpt/src/modernopt.cpp +++ b/plugins/ModernOpt/src/modernopt.cpp @@ -221,10 +221,7 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, case IDC_BTN_CLASSICOPT:
PostMessage(hwndDlg, WM_CLOSE, 0, 0);
db_set_b(NULL, "Options", "Expert", 1);
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- Options_Open(&ood);
- }
+ Options_Open(NULL);
break;
case IDC_BTN_HELP:
@@ -248,15 +245,10 @@ static INT_PTR CALLBACK ModernOptDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, g_iSectionRestore = dat->iSection;
{
struct ModernOptionsObject *obj = (struct ModernOptionsObject *)dat->pObjectList[dat->iPage];
- if (obj->optObject.lpzClassicGroup || obj->optObject.lpzClassicPage) {
- OPENOPTIONSDIALOG ood = { 0 };
- ood.cbSize = sizeof(ood);
- ood.pszGroup = obj->optObject.lpzClassicGroup;
- ood.pszPage = obj->optObject.lpzClassicPage;
- ood.pszTab = obj->optObject.lpzClassicTab;
- Options_OpenPage(&ood);
- }
- else CallService("Options/OptionsCommand", 0, 0);
+ if (obj->optObject.lpzClassicGroup || obj->optObject.lpzClassicPage)
+ Options_OpenPage(_A2T(obj->optObject.lpzClassicGroup), _A2T(obj->optObject.lpzClassicPage), _A2T(obj->optObject.lpzClassicTab));
+ else
+ CallService("Options/OptionsCommand", 0, 0);
PostMessage(hwndDlg, WM_CLOSE, 0, 0);
}
@@ -465,10 +457,8 @@ static INT_PTR svcModernOpt_Impl(WPARAM, LPARAM) static INT_PTR svcModernOpt_Show(WPARAM wParam, LPARAM lParam)
{
- if ( db_get_b(NULL, "Options", "Expert", 0)) {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- return Options_Open(&ood);
- }
+ if (db_get_b(NULL, "Options", "Expert", 0))
+ return Options_Open(NULL);
g_iSectionRestore = 0;
return svcModernOpt_Impl(wParam, lParam);
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index 0d9743112e..1b60c02fa9 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -186,8 +186,8 @@ int HookedOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pwszTitle = LPGENW("MessagePopup");
- odp.pwszGroup = LPGENW("Popups");
+ odp.szTitle.w = LPGENW("MessagePopup");
+ odp.szGroup.w = LPGENW("Popups");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index b09b5dae4d..98a32d40a8 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -1227,16 +1227,16 @@ int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTitle = LPGENW("Message export");
- odp.pwszGroup = LPGENW("History");
- odp.pwszTab = LPGENW("General");
+ odp.szTitle.w = LPGENW("Message export");
+ odp.szGroup.w = LPGENW("History");
+ odp.szTab.w = LPGENW("General");
odp.groupPosition = 100000000;
odp.pfnDlgProc = DlgProcMsgExportOpts;
Options_AddPage(wParam, &odp);
odp.position = 100000001;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT2);
- odp.pwszTab = LPGENW("Additional");
+ odp.szTab.w = LPGENW("Additional");
odp.pfnDlgProc = DlgProcMsgExportOpts2;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/MyDetails/src/options.cpp b/plugins/MyDetails/src/options.cpp index 66ad5e529f..625984cf9f 100644 --- a/plugins/MyDetails/src/options.cpp +++ b/plugins/MyDetails/src/options.cpp @@ -166,8 +166,8 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.pfnDlgProc = DlgProcOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS);
- odp.pwszGroup = LPGENW("Contact list");
- odp.pwszTitle = LPGENW("My details");
+ odp.szGroup.w = LPGENW("Contact list");
+ odp.szTitle.w = LPGENW("My details");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/NewAwaySysMod/src/AwayOpt.cpp b/plugins/NewAwaySysMod/src/AwayOpt.cpp index 70ef7a1389..af6f1498dc 100644 --- a/plugins/NewAwaySysMod/src/AwayOpt.cpp +++ b/plugins/NewAwaySysMod/src/AwayOpt.cpp @@ -850,10 +850,7 @@ INT_PTR CALLBACK MessagesModernOptDlg(HWND hwndDlg, UINT msg, WPARAM wParam, LPA SetFocus(GetDlgItem(hwndDlg, IDC_MESSAGEDLG_MSGTITLE));
break;
case IDC_LNK_AUTOAWAY:
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszPage = "Status";
- ood.pszTab = "Autoreply";
- Options_OpenPage(&ood);
+ Options_OpenPage(NULL, L"Status", L"Autoreply");
}
break;
case EN_CHANGE:
@@ -1234,25 +1231,25 @@ int OptsDlgInit(WPARAM wParam, LPARAM) optDi.hInstance = g_hInstance;
optDi.flags = ODPF_BOLDGROUPS;
- optDi.pszTitle = OPT_MAINGROUP;
+ optDi.szTitle.a = OPT_MAINGROUP;
optDi.pfnDlgProc = MessagesOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES);
- optDi.pszTab = LPGEN("Status messages");
+ optDi.szTab.a = LPGEN("Status messages");
Options_AddPage(wParam, &optDi);
optDi.pfnDlgProc = MoreOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_MOREOPTDIALOG);
- optDi.pszTab = LPGEN("Main options");
+ optDi.szTab.a = LPGEN("Main options");
Options_AddPage(wParam, &optDi);
optDi.pfnDlgProc = AutoreplyOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_AUTOREPLY);
- optDi.pszTab = LPGEN("Autoreply");
+ optDi.szTab.a = LPGEN("Autoreply");
Options_AddPage(wParam, &optDi);
optDi.pfnDlgProc = ContactsOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACTSOPTDLG);
- optDi.pszTab = LPGEN("Contacts");
+ optDi.szTab.a = LPGEN("Contacts");
Options_AddPage(wParam, &optDi);
return 0;
}
diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp index 395c77ec40..0f800ea5e9 100644 --- a/plugins/NewEventNotify/src/options.cpp +++ b/plugins/NewEventNotify/src/options.cpp @@ -292,8 +292,8 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.pszTitle = LPGEN("Event Notify");
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Event Notify");
+ odp.szGroup.a = LPGEN("Popups");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(addInfo, &odp);
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index 504d63ddc3..78034ff7f4 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -599,7 +599,7 @@ int UserInfoInitialise(WPARAM wParam, LPARAM lParam) odp.position = 100000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SOUNDS);
- odp.pszTitle = LPGEN("Status Notify");
+ odp.szTitle.a = LPGEN("Status Notify");
odp.pfnDlgProc = DlgProcSoundUIPage;
UserInfo_AddPage(wParam, &odp);
}
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 3d2de9a971..23e8dc1f8c 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -1226,42 +1226,42 @@ int OptionsInitialize(WPARAM wParam, LPARAM) odp.position = -100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = LPGEN("Status Notify");
- odp.pszGroup = LPGEN("Status");
- odp.pszTab = LPGEN("General");
+ odp.szTitle.a = LPGEN("Status Notify");
+ odp.szGroup.a = LPGEN("Status");
+ odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL);
odp.pfnDlgProc = DlgProcGeneralOpts;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Status logging");
+ odp.szTab.a = LPGEN("Status logging");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LOG);
odp.pfnDlgProc = DlgProcLogOpts;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Extra status logging");
+ odp.szTab.a = LPGEN("Extra status logging");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XLOG);
odp.pfnDlgProc = DlgProcXLogOpts;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Filtering");
+ odp.szTab.a = LPGEN("Filtering");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_FILTERS);
odp.pfnDlgProc = DlgProcFiltering;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.pszTitle = LPGEN("Status Notify");
- odp.pszGroup = LPGEN("Popups");
- odp.pszTab = LPGEN("General");
+ odp.szTitle.a = LPGEN("Status Notify");
+ odp.szGroup.a = LPGEN("Popups");
+ odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProcPopupOpts;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Extra status");
+ odp.szTab.a = LPGEN("Extra status");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_XPOPUP);
odp.pfnDlgProc = DlgProcXPopupOpts;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Status message");
+ odp.szTab.a = LPGEN("Status message");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMPOPUP);
odp.pfnDlgProc = DlgProcSMPopupOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp index 8cf20a395a..c3c2becfc3 100755 --- a/plugins/New_GPG/src/options.cpp +++ b/plugins/New_GPG/src/options.cpp @@ -43,25 +43,25 @@ int GpgOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG);
- odp.pwszTitle = _T(szGPGModuleName);
- odp.pwszGroup = LPGENW("Services");
- odp.pwszTab = LPGENW("Main");
+ odp.szTitle.w = _T(szGPGModuleName);
+ odp.szGroup.w = LPGENW("Services");
+ odp.szTab.w = LPGENW("Main");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcGpgOpts;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_BIN);
- odp.pwszTab = LPGENW("GnuPG Variables");
+ odp.szTab.w = LPGENW("GnuPG Variables");
odp.pfnDlgProc = DlgProcGpgBinOpts;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_MESSAGES);
- odp.pwszTab = LPGENW("Messages");
+ odp.szTab.w = LPGENW("Messages");
odp.pfnDlgProc = DlgProcGpgMsgOpts;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED);
- odp.pwszTab = LPGENW("Advanced");
+ odp.szTab.w = LPGENW("Advanced");
odp.pfnDlgProc = DlgProcGpgAdvOpts;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/NewsAggregator/Src/Options.cpp b/plugins/NewsAggregator/Src/Options.cpp index 9c0b9e3a28..d9868930f3 100644 --- a/plugins/NewsAggregator/Src/Options.cpp +++ b/plugins/NewsAggregator/Src/Options.cpp @@ -586,8 +586,8 @@ int OptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Network");
- odp.pszTitle = LPGEN("News Aggregator");
+ odp.szGroup.a = LPGEN("Network");
+ odp.szTitle.a = LPGEN("News Aggregator");
odp.pfnDlgProc = UpdateNotifyOptsProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/NoHistory/src/options.cpp b/plugins/NoHistory/src/options.cpp index 4541ff8ce0..52e874fb38 100644 --- a/plugins/NoHistory/src/options.cpp +++ b/plugins/NoHistory/src/options.cpp @@ -223,9 +223,9 @@ int OptInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.pwszTitle = LPGENW("No History");
- odp.pwszGroup = LPGENW("History");
- odp.pwszTab = LPGENW("Logging");
+ odp.szTitle.w = LPGENW("No History");
+ odp.szGroup.w = LPGENW("History");
+ odp.szTab.w = LPGENW("Logging");
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Non-IM Contact/src/main.cpp b/plugins/Non-IM Contact/src/main.cpp index 10af2ee25c..03b2a77ad1 100644 --- a/plugins/Non-IM Contact/src/main.cpp +++ b/plugins/Non-IM Contact/src/main.cpp @@ -66,8 +66,8 @@ int NimcOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Plugins");
- odp.pszTitle = LPGEN("Non-IM Contacts");
+ odp.szGroup.a = LPGEN("Plugins");
+ odp.szTitle.a = LPGEN("Non-IM Contacts");
odp.pfnDlgProc = DlgProcNimcOpts;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/NotesAndReminders/src/main.cpp b/plugins/NotesAndReminders/src/main.cpp index fe31d8ef14..8341330d1a 100644 --- a/plugins/NotesAndReminders/src/main.cpp +++ b/plugins/NotesAndReminders/src/main.cpp @@ -120,8 +120,8 @@ static int OnOptInitialise(WPARAM w, LPARAM) odp.position = 900002000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_STNOTEOPTIONS);
- odp.pszTitle = SECTIONNAME;
- odp.pszGroup = LPGEN("Plugins");
+ odp.szTitle.a = SECTIONNAME;
+ odp.szGroup.a = LPGEN("Plugins");
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(w, &odp);
return 0;
diff --git a/plugins/NotifyAnything/src/options.cpp b/plugins/NotifyAnything/src/options.cpp index 8b26054f6f..d8dd4aca04 100644 --- a/plugins/NotifyAnything/src/options.cpp +++ b/plugins/NotifyAnything/src/options.cpp @@ -174,8 +174,8 @@ int OptionsInitialize(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.pszTemplate = MAKEINTRESOURCEA(NA_OPTIONS);
odp.pfnDlgProc = DlgProcOpts;
- odp.pszTitle = LPGEN("Notify Anything");
- odp.pszGroup = LPGEN("Plugins");
+ odp.szTitle.a = LPGEN("Notify Anything");
+ odp.szGroup.a = LPGEN("Plugins");
odp.position = 100000000;
odp.hInstance = hInst;
odp.groupPosition = 910000000;
diff --git a/plugins/Nudge/src/options.cpp b/plugins/Nudge/src/options.cpp index 5954fdfdc9..be47266c4b 100644 --- a/plugins/Nudge/src/options.cpp +++ b/plugins/Nudge/src/options.cpp @@ -381,15 +381,15 @@ int NudgeOptInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NUDGE);
- odp.pszTitle = LPGEN("Nudge");
- odp.pszGroup = LPGEN("Events");
- odp.pszTab = LPGEN("Nudge");
+ odp.szTitle.a = LPGEN("Nudge");
+ odp.szGroup.a = LPGEN("Events");
+ odp.szTab.a = LPGEN("Nudge");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcNudgeOpt;
Options_AddPage(wParam, &odp);
odp.position = -790000001;
- odp.pszTab = LPGEN("Window Shaking");
+ odp.szTab.a = LPGEN("Window Shaking");
odp.pfnDlgProc = DlgProcShakeOpt;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SHAKE);
Options_AddPage(wParam, &odp);
diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index 2738ae2034..ff84eec42d 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -101,13 +101,8 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA break;
case IDC_LINK_HOTKEY:
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszGroup = "Customize";
- ood.pszPage = "Hotkeys";
- Options_Open(&ood);
- }
- return true;
+ Options_Open(L"Customize", L"Hotkeys");
+ return true;
case IDC_MSG_BOXES2:
case IDC_ERRORS2:
@@ -390,15 +385,15 @@ int OptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY);
- odp.pwszGroup = LPGENW("Services");
- odp.pwszTitle = LPGENW("Pack Updater");
+ odp.szGroup.w = LPGENW("Services");
+ odp.szTitle.w = LPGENW("Pack Updater");
odp.pfnDlgProc = UpdateNotifyOptsProc;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.pwszGroup = LPGENW("Popups");
- odp.pwszTitle = LPGENW("Pack Updater");
+ odp.szGroup.w = LPGENW("Popups");
+ odp.szTitle.w = LPGENW("Pack Updater");
odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/PasteIt/src/Options.cpp b/plugins/PasteIt/src/Options.cpp index 8d80a15948..4bbb0bcea7 100644 --- a/plugins/PasteIt/src/Options.cpp +++ b/plugins/PasteIt/src/Options.cpp @@ -681,15 +681,15 @@ int Options::InitOptions(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszTitle = LPGENW("Paste It");
- odp.pwszGroup = LPGENW("Services");
+ odp.szTitle.w = LPGENW("Paste It");
+ odp.szGroup.w = LPGENW("Services");
- odp.pwszTab = LPGENW("Main");
+ odp.szTab.w = LPGENW("Main");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);
odp.pfnDlgProc = Options::DlgProcOptsMain;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Web page");
+ odp.szTab.w = LPGENW("Web page");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_PAGES);
odp.pfnDlgProc = Options::DlgProcOptsPages;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Ping/src/options.cpp b/plugins/Ping/src/options.cpp index 0d763f466a..974469725f 100644 --- a/plugins/Ping/src/options.cpp +++ b/plugins/Ping/src/options.cpp @@ -506,15 +506,15 @@ int PingOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
- odp.pwszGroup = LPGENW("Network");
- odp.pwszTitle = LPGENW("Ping");
+ odp.szGroup.w = LPGENW("Network");
+ odp.szTitle.w = LPGENW("Ping");
- odp.pwszTab = LPGENW("Settings");
+ odp.szTab.w = LPGENW("Settings");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG1);
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
- odp.pwszTab = LPGENW("Hosts");
+ odp.szTab.w = LPGENW("Hosts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG2);
odp.pfnDlgProc = DlgProcOpts2;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Ping/src/pingthread.cpp b/plugins/Ping/src/pingthread.cpp index c0f48b16cc..c3d215329d 100644 --- a/plugins/Ping/src/pingthread.cpp +++ b/plugins/Ping/src/pingthread.cpp @@ -678,25 +678,11 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar return TRUE;
case ID_MENU_OPTIONS:
- {
- OPENOPTIONSDIALOG oop = { 0 };
- oop.cbSize = sizeof(oop);
- oop.pszGroup = "Network";
- oop.pszPage = "Ping";
- oop.pszTab = "Settings";
- Options_Open(&oop);
- }
+ Options_Open(L"Network", L"Ping", L"Settings");
return TRUE;
case ID_MENU_DESTINATIONS:
- {
- OPENOPTIONSDIALOG oop = { 0 };
- oop.cbSize = sizeof(oop);
- oop.pszGroup = "Network";
- oop.pszPage = "Ping";
- oop.pszTab = "Hosts";
- Options_Open(&oop);
- }
+ Options_Open(L"Network", L"Ping", L"Hosts");
return TRUE;
}
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 9a01d64af8..286418d58d 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -242,13 +242,7 @@ static INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wPar break;
case IDC_LINK_HOTKEY:
- {
- OPENOPTIONSDIALOG ood = {0};
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Customize";
- ood.pszPage = "Hotkeys";
- Options_Open(&ood);
- }
+ Options_Open(L"Customize", L"Hotkeys");
return true;
}
break;
@@ -512,15 +506,15 @@ static int OptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_UPDATENOTIFY);
- odp.pwszGroup = LPGENW("Services");
- odp.pwszTitle = LPGENW("Plugin Updater");
+ odp.szGroup.w = LPGENW("Services");
+ odp.szTitle.w = LPGENW("Plugin Updater");
odp.pfnDlgProc = UpdateNotifyOptsProc;
Options_AddPage(wParam, &odp);
if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.pwszGroup = LPGENW("Popups");
- odp.pwszTitle = LPGENW("Plugin Updater");
+ odp.szGroup.w = LPGENW("Popups");
+ odp.szTitle.w = LPGENW("Plugin Updater");
odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp index 6e88d85783..d23d5503dd 100644 --- a/plugins/PluginUpdater/src/Utils.cpp +++ b/plugins/PluginUpdater/src/Utils.cpp @@ -316,10 +316,7 @@ bool DownloadFile(FILEURL *pFileURL, HANDLE &nlc) void __stdcall OpenPluginOptions(void*)
{
- OPENOPTIONSDIALOG ood = {0};
- ood.cbSize = sizeof(ood);
- ood.pszPage = "Plugins";
- Options_Open(&ood);
+ Options_Open(L"Plugins");
}
// FUNCTION: IsRunAsAdmin()
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index b0386e5922..e210ab86e9 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -66,35 +66,35 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.groupPosition = 910000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTitle = MODULNAME_PLU;
+ odp.szTitle.a = MODULNAME_PLU;
- odp.pszTab = LPGEN("General");
+ odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgProcPopupGeneral;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Classes");
+ odp.szTab.a = LPGEN("Classes");
odp.pfnDlgProc = DlgProcOptsClasses;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFICATIONS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Actions");
+ odp.szTab.a = LPGEN("Actions");
odp.pfnDlgProc = DlgProcPopupActions;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ACTIONS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Contacts");
+ odp.szTab.a = LPGEN("Contacts");
odp.pfnDlgProc = DlgProcContactOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTACTS);
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Advanced");
+ odp.szTab.a = LPGEN("Advanced");
odp.pfnDlgProc = DlgProcPopupAdvOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_ADVANCED);
Options_AddPage(wParam, &odp);
- odp.pszGroup = LPGEN("Skins");
- odp.pszTab = LPGEN(MODULNAME_PLU);
+ odp.szGroup.a = LPGEN("Skins");
+ odp.szTab.a = LPGEN(MODULNAME_PLU);
odp.pfnDlgProc = DlgProcPopSkinsOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN2);
Options_AddPage(wParam, &odp);
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 9110e4e58b..9a58419986 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -370,12 +370,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l break;
case IDC_MORE:
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszGroup = "Customize";
- ood.pszPage = "Fonts and colors";
- Options_Open(&ood);
- }
+ Options_Open(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 ca5df48c19..1e534e6c6a 100644 --- a/plugins/QuickContacts/src/options.cpp +++ b/plugins/QuickContacts/src/options.cpp @@ -51,8 +51,8 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pwszGroup = LPGENW("Contacts");
- odp.pwszTitle = LPGENW("Quick Contacts");
+ odp.szGroup.w = LPGENW("Contacts");
+ odp.szTitle.w = LPGENW("Quick Contacts");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
diff --git a/plugins/QuickMessages/src/options.cpp b/plugins/QuickMessages/src/options.cpp index 50e561c814..94d3e7035e 100644 --- a/plugins/QuickMessages/src/options.cpp +++ b/plugins/QuickMessages/src/options.cpp @@ -1099,9 +1099,9 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.position = 940000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = LPGEN("Quick Messages");
+ odp.szTitle.a = LPGEN("Quick Messages");
odp.pfnDlgProc = OptionsProc;
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wparam, &odp);
return 0;
diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index f64b329dc5..b84d89eed9 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -72,14 +72,9 @@ int OnModulesLoaded(WPARAM, LPARAM) int OnButtonPressed(WPARAM wParam, LPARAM lParam)
{
- char key[64];
- int count = 0;
- HMENU hMenu = NULL;
- char buttonName[32];
- CMStringW replies;
- LIST<wchar_t> replyList(1);
CustomButtonClickData *cbcd = (CustomButtonClickData *)lParam;
+ char buttonName[32];
mir_snprintf(buttonName, MODULE" %x", iNumber + 1);
if (mir_strcmp(cbcd->pszModule, buttonName))
return 0;
@@ -87,59 +82,51 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) if (cbcd->dwButtonId != iNumber)
return 1;
+ char key[64];
mir_snprintf(key, "RepliesCount_%x", iNumber);
- count = db_get_w(NULL, MODULE, key, 0);
+ int count = db_get_w(NULL, MODULE, key, 0);
+ if (count == 0 || cbcd->flags & BBCF_RIGHTBUTTON)
{
- if (count == 0 || cbcd->flags & BBCF_RIGHTBUTTON)
- {
- mir_snprintf(buttonName, "%s %x", Translate("Button"), iNumber + 1);
-
- OPENOPTIONSDIALOG ood = {0};
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Message Sessions";
- ood.pszPage = "Quick Replies";
- ood.pszTab = buttonName;
- Options_Open(&ood);
- return 0;
- }
+ mir_snprintf(buttonName, "%s %x", Translate("Button"), iNumber + 1);
+ Options_Open(L"Message Sessions", L"Quick Replies", _A2T(buttonName));
+ return 0;
+ }
- hMenu = CreatePopupMenu();
+ HMENU hMenu = CreatePopupMenu();
- for (int i = 0; i < count; i++)
- {
- mir_snprintf(key, "Reply_%x_%x", iNumber, i);
- wchar_t *value = db_get_wsa(NULL, MODULE, key);
+ LIST<wchar_t> replyList(1);
+ for (int i = 0; i < count; i++)
+ {
+ mir_snprintf(key, "Reply_%x_%x", iNumber, i);
+ wchar_t *value = db_get_wsa(NULL, MODULE, key);
- if (!value)
- replyList.insert(mir_wstrdup(L""));
- else
- replyList.insert(variables_parsedup(value, 0, wParam));
+ if (!value)
+ replyList.insert(mir_wstrdup(L""));
+ else
+ replyList.insert(variables_parsedup(value, 0, wParam));
- if (!mir_wstrcmp(value, L"---"))
- AppendMenu((HMENU)hMenu, MF_SEPARATOR, i + 1, NULL);
- else
- AppendMenu((HMENU)hMenu, MF_STRING, i + 1, replyList[i]);
+ if (!mir_wstrcmp(value, L"---"))
+ AppendMenu((HMENU)hMenu, MF_SEPARATOR, i + 1, NULL);
+ else
+ AppendMenu((HMENU)hMenu, MF_STRING, i + 1, replyList[i]);
- mir_free(value);
- }
+ mir_free(value);
}
+ int index = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, NULL);
+ if (index > 0)
{
- int index = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, NULL);
- if (index > 0)
+ if (mir_wstrcmp(replyList[index - 1], L""))
{
- if (mir_wstrcmp(replyList[index - 1], L""))
- {
- HWND hEdit = GetDlgItem(cbcd->hwndFrom, IDC_MESSAGE);
- if (!hEdit) hEdit = GetDlgItem(cbcd->hwndFrom, IDC_CHATMESSAGE);
+ HWND hEdit = GetDlgItem(cbcd->hwndFrom, IDC_MESSAGE);
+ if (!hEdit) hEdit = GetDlgItem(cbcd->hwndFrom, IDC_CHATMESSAGE);
- SendMessage(hEdit, EM_REPLACESEL, TRUE, (LPARAM)replyList[index - 1]);
+ SendMessage(hEdit, EM_REPLACESEL, TRUE, (LPARAM)replyList[index - 1]);
- mir_snprintf(key, "ImmediatelySend_%x", iNumber);
- if ((BYTE)db_get_b(NULL, MODULE, key, 1) || cbcd->flags & BBCF_CONTROLPRESSED)
- SendMessage(cbcd->hwndFrom, WM_COMMAND, IDOK, 0);
- }
+ mir_snprintf(key, "ImmediatelySend_%x", iNumber);
+ if ((BYTE)db_get_b(NULL, MODULE, key, 1) || cbcd->flags & BBCF_CONTROLPRESSED)
+ SendMessage(cbcd->hwndFrom, WM_COMMAND, IDOK, 0);
}
}
diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index 3356a012b0..4f2b3ffd2c 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -172,9 +172,9 @@ int OnOptInitialized(WPARAM wParam, LPARAM) mir_snprintf(tabName, "%s %x", Translate("Button"), iNumber + 1);
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = LPGEN("Quick Replies");
- odp.pszTab = tabName;
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Quick Replies");
+ odp.szTab.a = tabName;
odp.position = iNumber;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PAGE);
diff --git a/plugins/Quotes/src/Forex.cpp b/plugins/Quotes/src/Forex.cpp index bedd6e2e14..0b4adb1ce7 100644 --- a/plugins/Quotes/src/Forex.cpp +++ b/plugins/Quotes/src/Forex.cpp @@ -268,8 +268,8 @@ int QuotesEventFunc_OptInitialise(WPARAM wp, LPARAM/* lp*/) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInstance;
- odp.pwszTitle = _T(QUOTES_PROTOCOL_NAME);
- odp.pwszGroup = LPGENW("Network");
+ odp.szTitle.w = _T(QUOTES_PROTOCOL_NAME);
+ odp.szGroup.w = LPGENW("Network");
odp.hIcon = Quotes_LoadIconEx(IDI_ICON_MAIN);
odp.flags = ODPF_USERINFOTAB | ODPF_UNICODE;
diff --git a/plugins/Quotes/src/OptionDukasCopy.cpp b/plugins/Quotes/src/OptionDukasCopy.cpp index 6a5b8b0fc6..12c53f1753 100644 --- a/plugins/Quotes/src/OptionDukasCopy.cpp +++ b/plugins/Quotes/src/OptionDukasCopy.cpp @@ -314,6 +314,6 @@ void ShowDukasCopyPropPage(CQuotesProviderDukasCopy* pProvider, WPARAM wp, OPTIO odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_ECONOMIC_RATES);
odp.pfnDlgProc = EconomicRatesDlgProc;
- odp.pwszTab = const_cast<LPTSTR>(pi.m_sName.c_str());
+ odp.szTab.w = const_cast<LPTSTR>(pi.m_sName.c_str());
Options_AddPage(wp, &odp);
}
diff --git a/plugins/Quotes/src/QuoteInfoDlg.cpp b/plugins/Quotes/src/QuoteInfoDlg.cpp index ac9471c959..5e3d355590 100644 --- a/plugins/Quotes/src/QuoteInfoDlg.cpp +++ b/plugins/Quotes/src/QuoteInfoDlg.cpp @@ -113,7 +113,7 @@ int QuotesEventFunc_OnUserInfoInit(WPARAM wp, LPARAM lp) odp.pfnDlgProc = QuoteInfoDlgProc;
odp.position = -2000000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_QUOTE_INFO);
- odp.pszTitle = LPGEN("Quote");
+ odp.szTitle.a = LPGEN("Quote");
UserInfo_AddPage(wp, &odp);
return 0;
}
diff --git a/plugins/Quotes/src/QuotesProviderFinance.cpp b/plugins/Quotes/src/QuotesProviderFinance.cpp index d17a1c39ea..686a1406a4 100644 --- a/plugins/Quotes/src/QuotesProviderFinance.cpp +++ b/plugins/Quotes/src/QuotesProviderFinance.cpp @@ -260,6 +260,6 @@ void CQuotesProviderFinance::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp) odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_OPT_FINANCE);
odp.pfnDlgProc = GoogleFinanceOptDlgProc;
odp.dwInitParam = LPARAM(this);
- odp.pwszTab = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
+ odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
Options_AddPage(wp, &odp);
}
diff --git a/plugins/Quotes/src/QuotesProviderGoogle.cpp b/plugins/Quotes/src/QuotesProviderGoogle.cpp index fb530adb06..63b60b3e8b 100644 --- a/plugins/Quotes/src/QuotesProviderGoogle.cpp +++ b/plugins/Quotes/src/QuotesProviderGoogle.cpp @@ -382,7 +382,7 @@ void CQuotesProviderGoogle::ShowPropertyPage(WPARAM wp, OPTIONSDIALOGPAGE &odp) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_OPT_GOOGLE);
odp.pfnDlgProc = GoogleOptDlgProc;
- odp.pwszTab = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
+ odp.szTab.w = const_cast<LPTSTR>(GetInfo().m_sName.c_str());
Options_AddPage(wp, &odp);
}
diff --git a/plugins/RecentContacts/src/options.cpp b/plugins/RecentContacts/src/options.cpp index b98a34b2ea..f227f0534d 100644 --- a/plugins/RecentContacts/src/options.cpp +++ b/plugins/RecentContacts/src/options.cpp @@ -62,9 +62,9 @@ int onOptInitialise(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Contacts");
+ odp.szGroup.a = LPGEN("Contacts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_LASTUC_OPT);
- odp.pszTitle = msLastUC_ShowListName;
+ odp.szTitle.a = msLastUC_ShowListName;
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/SMS/src/options.cpp b/plugins/SMS/src/options.cpp index 2157187e06..54fc700a62 100644 --- a/plugins/SMS/src/options.cpp +++ b/plugins/SMS/src/options.cpp @@ -91,10 +91,10 @@ int OptInitialise(WPARAM wParam,LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = ssSMSSettings.hInstance;
- odp.pszGroup = LPGEN("Events");
+ odp.szGroup.a = LPGEN("Events");
odp.flags = ODPF_BOLDGROUPS;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMSPLUGIN);
- odp.pszTitle = PROTOCOL_DISPLAY_NAME_ORIG;
+ odp.szTitle.a = PROTOCOL_DISPLAY_NAME_ORIG;
odp.pfnDlgProc = DlgProcEditorOptions;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index 4063da39ae..596a6fd8eb 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -735,8 +735,8 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.position = 910000002;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
- odp.pszTitle = LPGEN("Messaging");
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Messaging");
+ odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgProcOptionsPopup;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp index 4f2053fccb..e0f235e591 100644 --- a/plugins/Scriver/src/msgoptions.cpp +++ b/plugins/Scriver/src/msgoptions.cpp @@ -709,15 +709,9 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_FONTSCOLORS:
- {
- OPENOPTIONSDIALOG ood;
- ood.cbSize = sizeof(ood);
- ood.pszGroup = "Customize";
- ood.pszPage = "Fonts and colors";
- ood.pszTab = NULL;
- Options_Open(&ood);
- }
+ Options_Open(L"Customize", L"Fonts and colors");
break;
+
case IDC_LOADUNREAD:
case IDC_LOADCOUNT:
case IDC_LOADTIME:
@@ -730,14 +724,17 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, EnableWindow(GetDlgItem(hwndDlg, IDC_LOADTIMESPIN), bChecked);
EnableWindow(GetDlgItem(hwndDlg, IDC_STMINSOLD), bChecked);
break;
+
case IDC_SHOWTIMES:
bChecked = IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES);
EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWSECONDS), bChecked);
EnableWindow(GetDlgItem(hwndDlg, IDC_SHOWDATES), bChecked);
+
case IDC_SHOWDATES:
bChecked = IsDlgButtonChecked(hwndDlg, IDC_SHOWDATES) && IsDlgButtonChecked(hwndDlg, IDC_SHOWTIMES);
EnableWindow(GetDlgItem(hwndDlg, IDC_USELONGDATE), bChecked);
EnableWindow(GetDlgItem(hwndDlg, IDC_USERELATIVEDATE), bChecked);
+
case IDC_SHOWNAMES:
case IDC_SHOWSECONDS:
case IDC_USELONGDATE:
@@ -748,25 +745,30 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, case IDC_DRAWLINES:
ShowPreview(hwndDlg);
break;
+
case IDC_GROUPMESSAGES:
EnableWindow(GetDlgItem(hwndDlg, IDC_MARKFOLLOWUPS), IsDlgButtonChecked(hwndDlg, IDC_GROUPMESSAGES));
ShowPreview(hwndDlg);
break;
+
case IDC_INDENTTEXT:
EnableWindow(GetDlgItem(hwndDlg, IDC_INDENTSIZE), IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT));
EnableWindow(GetDlgItem(hwndDlg, IDC_INDENTSPIN), IsDlgButtonChecked(hwndDlg, IDC_INDENTTEXT));
ShowPreview(hwndDlg);
break;
+
case IDC_INDENTSIZE:
if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())
return TRUE;
ShowPreview(hwndDlg);
break;
+
case IDC_LOADCOUNTN:
case IDC_LOADTIMEN:
if (HIWORD(wParam) != EN_CHANGE || (HWND)lParam != GetFocus())
return TRUE;
break;
+
case IDC_LOG:
return 0;
}
@@ -945,20 +947,20 @@ int OptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
- odp.pszTitle = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
for (int i = 0; i < _countof(tabPages); i++) {
odp.pszTemplate = MAKEINTRESOURCEA(tabPages[i].dlgId);
odp.pfnDlgProc = tabPages[i].dlgProc;
- odp.pszTab = (char *)tabPages[i].tabName;
+ odp.szTab.a = (char *)tabPages[i].tabName;
Options_AddPage(wParam, &odp);
}
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = LPGEN("Typing notify");
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Typing notify");
odp.pfnDlgProc = DlgProcTypeOptions;
- odp.pszTab = NULL;
+ odp.szTab.a = NULL;
Options_AddPage(wParam, &odp);
return 0;
}
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index acbe31564a..7ca3e45258 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -1689,8 +1689,8 @@ int onRegisterOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSTAB);
- odp.pszTitle = (char*)MODULENAME;
- odp.pszGroup = LPGEN("Services");
+ odp.szTitle.a = (char*)MODULENAME;
+ odp.szGroup.a = LPGEN("Services");
odp.pfnDlgProc = OptionsDlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index 88f3235436..9206d01681 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -165,8 +165,8 @@ int onRegisterPopOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
- odp.pszTitle = (char*)MODULENAME;
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = (char*)MODULENAME;
+ odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = PopOptionsDlgProc;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp index b2cbc80f12..7115fcd979 100644 --- a/plugins/SeenPlugin/src/options.cpp +++ b/plugins/SeenPlugin/src/options.cpp @@ -434,15 +434,15 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.hInstance = hInstance;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SETTINGS);
- odp.pwszGroup = LPGENW("Contacts");
- odp.pwszTitle = LPGENW("Last seen");
+ odp.szGroup.w = LPGENW("Contacts");
+ odp.szTitle.w = LPGENW("Last seen");
odp.pfnDlgProc = OptsSettingsDlgProc;
Options_AddPage(wparam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
- odp.pwszGroup = LPGENW("Popups");
- odp.pwszTitle = LPGENW("Last seen");
+ odp.szGroup.w = LPGENW("Popups");
+ odp.szTitle.w = LPGENW("Last seen");
odp.pfnDlgProc = OptsPopupsDlgProc;
Options_AddPage(wparam, &odp);
}
diff --git a/plugins/SeenPlugin/src/userinfo.cpp b/plugins/SeenPlugin/src/userinfo.cpp index 881b69ae1e..7582e5ec8a 100644 --- a/plugins/SeenPlugin/src/userinfo.cpp +++ b/plugins/SeenPlugin/src/userinfo.cpp @@ -72,7 +72,7 @@ int UserinfoInit(WPARAM wparam, LPARAM lparam) OPTIONSDIALOGPAGE uip = { sizeof(uip) };
uip.hInstance = hInstance;
uip.pszTemplate = MAKEINTRESOURCEA(IDD_USERINFO);
- uip.pszTitle = LPGEN("Last seen");
+ uip.szTitle.a = LPGEN("Last seen");
uip.pfnDlgProc = UserinfoDlgProc;
UserInfo_AddPage(wparam, &uip);
}
diff --git a/plugins/Sessions/Src/Options.cpp b/plugins/Sessions/Src/Options.cpp index 6f98c5a005..e60515546b 100644 --- a/plugins/Sessions/Src/Options.cpp +++ b/plugins/Sessions/Src/Options.cpp @@ -493,9 +493,9 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.position = 955000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = MODNAME;
+ odp.szTitle.a = MODNAME;
odp.pfnDlgProc = OptionsProc;
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wparam, &odp);
return 0;
diff --git a/plugins/ShellExt/src/options.cpp b/plugins/ShellExt/src/options.cpp index 2f978a70f1..a4ee4a20ac 100644 --- a/plugins/ShellExt/src/options.cpp +++ b/plugins/ShellExt/src/options.cpp @@ -111,9 +111,9 @@ int OnOptionsInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE opt = { sizeof(opt) };
opt.flags = ODPF_BOLDGROUPS;
- opt.pszGroup = LPGEN("Services");
+ opt.szGroup.a = LPGEN("Services");
+ opt.szTitle.a = LPGEN("Shell context menus");
opt.position = -1066;
- opt.pszTitle = LPGEN("Shell context menus");
opt.pszTemplate = MAKEINTRESOURCEA(IDD_SHLOPTS);
opt.hInstance = hInst;
opt.pfnDlgProc = OptDialogProc;
diff --git a/plugins/SimpleAR/src/Options.cpp b/plugins/SimpleAR/src/Options.cpp index f603dcdebe..ee932589a6 100644 --- a/plugins/SimpleAR/src/Options.cpp +++ b/plugins/SimpleAR/src/Options.cpp @@ -139,8 +139,8 @@ INT OptInit(WPARAM wParam, LPARAM) odp.position = -790000000;
odp.hInstance = hinstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTION);
- odp.pszTitle = LPGEN("Simple Auto Replier");
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Simple Auto Replier");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index b6ddf1cc11..9eedcc3e5f 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -1654,7 +1654,7 @@ int InitOptions(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS;
if (!ServiceExists(MS_SS_GETPROFILECOUNT)) {
- odp.pszTitle = LPGEN("Status");
+ odp.szTitle.a = LPGEN("Status");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATUS);
odp.pfnDlgProc = DlgStatusOptionsProc;
Options_AddPage(wParam, &odp);
@@ -1665,18 +1665,18 @@ int InitOptions(WPARAM wParam, LPARAM) odp.position = 870000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GENERAL);
- odp.pszTitle = LPGEN("Status messages");
- odp.pszGroup = LPGEN("Status");
- odp.pszTab = LPGEN("General");
+ odp.szTitle.a = LPGEN("Status messages");
+ odp.szGroup.a = LPGEN("Status");
+ odp.szTab.a = LPGEN("General");
odp.pfnDlgProc = DlgOptionsProc;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Variables");
+ odp.szTab.a = LPGEN("Variables");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_VARIABLES);
odp.pfnDlgProc = DlgVariablesOptionsProc;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Advanced");
+ odp.szTab.a = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgAdvancedOptionsProc;
Options_AddPage(wParam, &odp);
diff --git a/plugins/SkypeStatusChange/src/options.cpp b/plugins/SkypeStatusChange/src/options.cpp index eb5d163de7..df8fc16054 100644 --- a/plugins/SkypeStatusChange/src/options.cpp +++ b/plugins/SkypeStatusChange/src/options.cpp @@ -308,8 +308,8 @@ int SSC_OptInitialise(WPARAM wp, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hModule;
- odp.pszTitle = LPGEN("Change Skype status");
- odp.pszGroup = LPGEN("Plugins");
+ odp.szTitle.a = LPGEN("Change Skype status");
+ odp.szGroup.a = LPGEN("Plugins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG_SETTINGS);
odp.pfnDlgProc = SettingsDlgProc;
Options_AddPage(wp, &odp);
diff --git a/plugins/SmileyAdd/src/options.cpp b/plugins/SmileyAdd/src/options.cpp index e477945e4b..b5570be9ed 100644 --- a/plugins/SmileyAdd/src/options.cpp +++ b/plugins/SmileyAdd/src/options.cpp @@ -658,8 +658,8 @@ int SmileysOptionsInitialize(WPARAM addInfo, LPARAM) odp.position = 910000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SMILEYS);
- odp.pszTitle = LPGEN("Smileys");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTitle.a = LPGEN("Smileys");
+ odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcSmileysOptions;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(addInfo, &odp);
diff --git a/plugins/Spamotron/src/options.cpp b/plugins/Spamotron/src/options.cpp index 59622de861..1c528f9d52 100644 --- a/plugins/Spamotron/src/options.cpp +++ b/plugins/Spamotron/src/options.cpp @@ -556,21 +556,21 @@ int OnOptInitialize(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = PLUGIN_NAME;
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = PLUGIN_NAME;
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTab = LPGEN("Settings");
+ odp.szTab.a = LPGEN("Settings");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_MAIN);
odp.pfnDlgProc = DlgProcOptionsMain;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Messages");
+ odp.szTab.a = LPGEN("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_Q);
odp.pfnDlgProc = DlgProcOptionsQuestion;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Bayes");
+ odp.szTab.a = LPGEN("Bayes");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_BAYES);
odp.pfnDlgProc = DlgProcOptionsBayes;
Options_AddPage(wParam, &odp);
@@ -578,8 +578,8 @@ int OnOptInitialize(WPARAM wParam, LPARAM) if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPAMOTRON_POPUPS);
odp.pfnDlgProc = DlgProcOptionsPopups;
- odp.pszGroup = LPGEN("Popups");
- odp.pszTab = NULL;
+ odp.szGroup.a = LPGEN("Popups");
+ odp.szTab.a = NULL;
Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/plugins/SpellChecker/src/options.cpp b/plugins/SpellChecker/src/options.cpp index 8f57cb2ed1..565d602cf4 100644 --- a/plugins/SpellChecker/src/options.cpp +++ b/plugins/SpellChecker/src/options.cpp @@ -57,8 +57,8 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = LPGEN("Spell Checker");
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Spell Checker");
odp.pfnDlgProc = OptionsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.flags = ODPF_BOLDGROUPS;
@@ -66,8 +66,8 @@ int InitOptionsCallback(WPARAM wParam, LPARAM) memset(&odp, 0, sizeof(odp));
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = LPGEN("Auto-replacements");
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Auto-replacements");
odp.pfnDlgProc = AutoreplaceDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_REPLACEMENTS);
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/SplashScreen/src/options.cpp b/plugins/SplashScreen/src/options.cpp index 49aed98c8e..4fcef6b257 100644 --- a/plugins/SplashScreen/src/options.cpp +++ b/plugins/SplashScreen/src/options.cpp @@ -398,9 +398,9 @@ int OptInit(WPARAM wParam, LPARAM lParam) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Skins");
+ odp.szGroup.a = LPGEN("Skins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SPLASH_OPT);
- odp.pszTitle = LPGEN("Splash Screen");
+ odp.szTitle.a = LPGEN("Splash Screen");
odp.pfnDlgProc = DlgProcOptions;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/StartPosition/src/main.cpp b/plugins/StartPosition/src/main.cpp index 37f8dc5087..c9a01ead3f 100644 --- a/plugins/StartPosition/src/main.cpp +++ b/plugins/StartPosition/src/main.cpp @@ -196,8 +196,8 @@ int OptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszGroup = LPGEN("Contact list");
- odp.pszTitle = LPGEN("Start position");
+ odp.szGroup.a = LPGEN("Contact list");
+ odp.szTitle.a = LPGEN("Start position");
odp.pfnDlgProc = OptionsDlgProc;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 2c6fd9d728..032362c92f 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -463,8 +463,8 @@ int InitializeOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SSOPT);
- odp.pszGroup = LPGEN("Events");//FIXME: move to...Group?
- odp.pszTitle = MENU_NAME;
+ odp.szGroup.a = LPGEN("Events");//FIXME: move to...Group?
+ odp.szTitle.a = MENU_NAME;
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOptions;
diff --git a/plugins/StatusChange/src/main.cpp b/plugins/StatusChange/src/main.cpp index 55e7a1ae94..6bd837044f 100644 --- a/plugins/StatusChange/src/main.cpp +++ b/plugins/StatusChange/src/main.cpp @@ -315,8 +315,8 @@ int StatusChangeOptInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pwszTitle = LPGENW("Status Change");
- odp.pwszGroup = LPGENW("Status");
+ odp.szTitle.w = LPGENW("Status Change");
+ odp.szGroup.w = LPGENW("Status");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcStatusChangeOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/StatusManager/src/aaa_options.cpp b/plugins/StatusManager/src/aaa_options.cpp index 60d8cec21e..d26678c1ce 100644 --- a/plugins/StatusManager/src/aaa_options.cpp +++ b/plugins/StatusManager/src/aaa_options.cpp @@ -514,8 +514,8 @@ int AutoAwayOptInitialise(WPARAM wParam, LPARAM) odp.position = 1000000000; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS); - odp.pszTitle = LPGEN("Auto away"); - odp.pszGroup = LPGEN("Status"); + odp.szTitle.a = LPGEN("Auto away"); + odp.szGroup.a = LPGEN("Status"); odp.pfnDlgProc = DlgProcAutoAwayTabs; odp.flags = ODPF_BOLDGROUPS; Options_AddPage(wParam, &odp); diff --git a/plugins/StatusManager/src/ks_options.cpp b/plugins/StatusManager/src/ks_options.cpp index 52ede459fe..84b86f4458 100644 --- a/plugins/StatusManager/src/ks_options.cpp +++ b/plugins/StatusManager/src/ks_options.cpp @@ -567,8 +567,8 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; - odp.pwszGroup = LPGENW("Status"); - odp.pwszTitle = LPGENW("Keep status"); + odp.szGroup.w = LPGENW("Status"); + odp.szTitle.w = LPGENW("Keep status"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABS); odp.pfnDlgProc = DlgProcKsTabs; @@ -577,11 +577,11 @@ int KeepStatusOptionsInit(WPARAM wparam, LPARAM) if (ServiceExists(MS_POPUP_ADDPOPUPT)) { memset(&odp, 0, sizeof(odp)); odp.position = 150000000; - odp.pwszGroup = LPGENW("Popups"); + odp.szGroup.w = LPGENW("Popups"); odp.groupPosition = 910000000; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_PUOPT_KEEPSTATUS); - odp.pwszTitle = LPGENW("Keep status"); + odp.szTitle.w = LPGENW("Keep status"); odp.pfnDlgProc = PopupOptDlgProc; odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; Options_AddPage(wparam, &odp); diff --git a/plugins/StatusManager/src/ss_options.cpp b/plugins/StatusManager/src/ss_options.cpp index ce4c047801..2acf61483f 100644 --- a/plugins/StatusManager/src/ss_options.cpp +++ b/plugins/StatusManager/src/ss_options.cpp @@ -905,16 +905,16 @@ int StartupStatusOptionsInit(WPARAM wparam,LPARAM) { OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; - odp.pszGroup = LPGEN("Status"); - odp.pszTitle = LPGEN("Startup status"); + odp.szGroup.a = LPGEN("Status"); + odp.szTitle.a = LPGEN("Startup status"); odp.flags = ODPF_BOLDGROUPS; - odp.pszTab = LPGEN("General"); + odp.szTab.a = LPGEN("General"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STARTUPSTATUS); odp.pfnDlgProc = StartupStatusOptDlgProc; Options_AddPage(wparam,&odp); - odp.pszTab = LPGEN("Status profiles"); + odp.szTab.a = LPGEN("Status profiles"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATUSPROFILES); odp.pfnDlgProc = StatusProfilesOptDlgProc; Options_AddPage(wparam,&odp); diff --git a/plugins/StopSpamMod/src/options.cpp b/plugins/StopSpamMod/src/options.cpp index 145f3c9352..ba5fd494cb 100755 --- a/plugins/StopSpamMod/src/options.cpp +++ b/plugins/StopSpamMod/src/options.cpp @@ -318,29 +318,29 @@ MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l) UNREFERENCED_PARAMETER(l);
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pwszGroup = LPGENW("Message sessions");
- odp.pwszTitle = LPGENW("StopSpam");
+ odp.szGroup.w = LPGENW("Message sessions");
+ odp.szTitle.w = LPGENW("StopSpam");
odp.position = -1;
odp.hInstance = hInst;
odp.flags = ODPF_UNICODE;
- odp.pwszTab = LPGENW("General");
+ odp.szTab.w = LPGENW("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN);
odp.pfnDlgProc = MainDlgProc;
Options_AddPage(w, &odp);
- odp.pwszTab = LPGENW("Messages");
+ odp.szTab.w = LPGENW("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES);
odp.pfnDlgProc = MessagesDlgProc;
Options_AddPage(w, &odp);
- odp.pwszTab = LPGENW("Accounts");
+ odp.szTab.w = LPGENW("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PROTO);
odp.pfnDlgProc = ProtoDlgProc;
Options_AddPage(w, &odp);
- odp.pwszTab = LPGENW("Advanced");
+ odp.szTab.w = LPGENW("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ADVANCED);
odp.pfnDlgProc = AdvancedDlgProc;
Options_AddPage(w, &odp);
diff --git a/plugins/StopSpamPlus/src/events.cpp b/plugins/StopSpamPlus/src/events.cpp index d7965d04db..e8646548cb 100644 --- a/plugins/StopSpamPlus/src/events.cpp +++ b/plugins/StopSpamPlus/src/events.cpp @@ -167,22 +167,22 @@ MIRANDA_HOOK_EVENT(ME_OPT_INITIALISE, w, l) UNREFERENCED_PARAMETER(l);
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pszGroup = LPGEN("Message sessions");
- odp.pszTitle = pluginName;
+ odp.szGroup.a = LPGEN("Message sessions");
+ odp.szTitle.a = pluginName;
odp.position = -1;
odp.hInstance = hInst;
- odp.pszTab = LPGEN("General");
+ odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MAIN);
odp.pfnDlgProc = MainDlgProc;
Options_AddPage(w, &odp);
- odp.pszTab = LPGEN("Messages");
+ odp.szTab.a = LPGEN("Messages");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_MESSAGES);
odp.pfnDlgProc = MessagesDlgProc;
Options_AddPage(w, &odp);
- odp.pszTab = LPGEN("Accounts");
+ odp.szTab.a = LPGEN("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PROTO);
odp.pfnDlgProc = ProtoDlgProc;
Options_AddPage(w, &odp);
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index 23f6347ad9..0404527a22 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -400,13 +400,7 @@ int TSAPI MsgWindowMenuHandler(TWindowData *dat, int selection, int menuId) else if (menuId == MENU_LOGMENU) {
switch (selection) {
case ID_MESSAGELOGSETTINGS_GLOBAL:
- {
- OPENOPTIONSDIALOG ood = { sizeof(ood) };
- ood.pszPage = "Message sessions";
- ood.pszGroup = NULL;
- ood.pszTab = "Message log";
- Options_Open(&ood);
- }
+ Options_Open(NULL, 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 05c8ac2e35..dcfefec095 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1256,86 +1256,86 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 910000000;
odp.hInstance = g_hInst;
- odp.pszTitle = LPGEN("Message sessions");
+ odp.szTitle.a = LPGEN("Message sessions");
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTab = LPGEN("General");
+ odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);
odp.pfnDlgProc = DlgProcOptions;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Tabs and layout");
+ odp.szTab.a = LPGEN("Tabs and layout");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TABBEDMSG);
odp.pfnDlgProc = DlgProcTabbedOptions;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Containers");
+ odp.szTab.a = LPGEN("Containers");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTAINERS);
odp.pfnDlgProc = DlgProcContainerSettings;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Message log");
+ odp.szTab.a = LPGEN("Message log");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGLOG);
odp.pfnDlgProc = DlgProcLogOptions;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Toolbar");
+ odp.szTab.a = LPGEN("Toolbar");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TOOLBAR);
odp.pfnDlgProc = DlgProcToolBar;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Advanced tweaks");
+ odp.szTab.a = LPGEN("Advanced tweaks");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_PLUS);
odp.pfnDlgProc = PlusOptionsProc;
Options_AddPage(wParam, &odp);
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);
- odp.pszTitle = LPGEN("Typing notify");
+ odp.szTitle.a = LPGEN("Typing notify");
odp.pfnDlgProc = DlgProcTypeOptions;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPT);
- odp.pszTitle = LPGEN("Event notifications");
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Event notifications");
+ odp.szGroup.a = LPGEN("Popups");
odp.pfnDlgProc = DlgProcPopupOpts;
Options_AddPage(wParam, &odp);
}
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
- odp.pszTitle = LPGEN("Message window");
- odp.pszTab = LPGEN("Load and apply");
+ odp.szTitle.a = LPGEN("Message window");
+ odp.szTab.a = LPGEN("Load and apply");
odp.pfnDlgProc = DlgProcSkinOpts;
- odp.pszGroup = LPGEN("Skins");
+ odp.szGroup.a = LPGEN("Skins");
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_TABCONFIG);
- odp.pszTab = LPGEN("Window layout tweaks");
+ odp.szTab.a = LPGEN("Window layout tweaks");
odp.pfnDlgProc = DlgProcTabConfig;
Options_AddPage(wParam, &odp);
/* group chats */
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);
- odp.pszTitle = LPGEN("Group chats");
- odp.pszTab = LPGEN("Settings");
+ odp.szTitle.a = LPGEN("Group chats");
+ odp.szTab.a = LPGEN("Settings");
odp.pfnDlgProc = DlgProcOptions1;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS2);
- odp.pszTab = LPGEN("Log formatting");
+ odp.szTab.a = LPGEN("Log formatting");
odp.pfnDlgProc = DlgProcOptions2;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS3);
- odp.pszTab = LPGEN("Events and filters");
+ odp.szTab.a = LPGEN("Events and filters");
odp.pfnDlgProc = DlgProcOptions3;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS4);
- odp.pszTab = LPGEN("Highlighting");
+ odp.szTab.a = LPGEN("Highlighting");
odp.pfnDlgProc = CMUCHighlight::dlgProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp index 08dd764a9c..4e9d1dfd2f 100644 --- a/plugins/TabSRMM/src/typingnotify.cpp +++ b/plugins/TabSRMM/src/typingnotify.cpp @@ -496,8 +496,8 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TYPINGNOTIFYPOPUP);
- odp.pszTitle = LPGEN("Typing notify");
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Typing notify");
+ odp.szGroup.a = LPGEN("Popups");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcOpts;
diff --git a/plugins/TipperYM/src/options.cpp b/plugins/TipperYM/src/options.cpp index 157982366c..8ad2ffbd33 100644 --- a/plugins/TipperYM/src/options.cpp +++ b/plugins/TipperYM/src/options.cpp @@ -2134,36 +2134,36 @@ int OptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_APPEARANCE);
- odp.pszTab = LPGEN("Appearance");
- odp.pszTitle = LPGEN("Tooltips");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTab.a = LPGEN("Appearance");
+ odp.szTitle.a = LPGEN("Tooltips");
+ odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsAppearance;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_SKIN);
- odp.pszTab = LPGEN("Tooltips");
- odp.pszGroup = LPGEN("Skins");
+ odp.szTab.a = LPGEN("Tooltips");
+ odp.szGroup.a = LPGEN("Skins");
odp.pfnDlgProc = DlgProcOptsSkin;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_CONTENT);
- odp.pszTab = LPGEN("Content");
- odp.pszTitle = LPGEN("Tooltips");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTab.a = LPGEN("Content");
+ odp.szTitle.a = LPGEN("Tooltips");
+ odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsContent;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRAYTIP);
- odp.pszTab = LPGEN("Tray tooltip");
- odp.pszTitle = LPGEN("Tooltips");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTab.a = LPGEN("Tray tooltip");
+ odp.szTitle.a = LPGEN("Tooltips");
+ odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsTraytip;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_EXTRA);
- odp.pszTab = LPGEN("Extra");
- odp.pszTitle = LPGEN("Tooltips");
- odp.pszGroup = LPGEN("Customize");
+ odp.szTab.a = LPGEN("Extra");
+ odp.szTitle.a = LPGEN("Tooltips");
+ odp.szGroup.a = LPGEN("Customize");
odp.pfnDlgProc = DlgProcOptsExtra;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/Toaster/src/options.cpp b/plugins/Toaster/src/options.cpp index 4fb6b54868..9d0c0d4034 100644 --- a/plugins/Toaster/src/options.cpp +++ b/plugins/Toaster/src/options.cpp @@ -46,10 +46,10 @@ void COptions::Enabled_OnChange(CCtrlCheck* chk) int OnOptionsInitialized(WPARAM wParam, LPARAM)
{
OPTIONSDIALOGPAGE odp = { 0 };
- odp.pwszTitle = L"Popups"; //_T(MODULE);
+ odp.szTitle.w = L"Popups"; //_T(MODULE);
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.position = -790000000;
- odp.pwszTab = _T(MODULE);
+ odp.szTab.w = _T(MODULE);
odp.pDialog = new COptions();
Options_AddPage(wParam, &odp);
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 864fad80c1..356d28f22b 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -260,8 +260,8 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = g_hInstDLL;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = LPGEN("Tooltip Notify");
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Tooltip Notify");
+ odp.szGroup.a = LPGEN("Popups");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper;
diff --git a/plugins/TopToolBar/src/ttbopt.cpp b/plugins/TopToolBar/src/ttbopt.cpp index 0b65ba0bfd..4f0c2b3c93 100644 --- a/plugins/TopToolBar/src/ttbopt.cpp +++ b/plugins/TopToolBar/src/ttbopt.cpp @@ -544,10 +544,10 @@ int TTBOptInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
- odp.pszGroup = LPGEN("Contact list");
+ odp.szGroup.a = LPGEN("Contact list");
odp.position = -1000000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_BUTORDER);
- odp.pszTitle = LPGEN("Toolbar");
+ odp.szTitle.a = LPGEN("Toolbar");
odp.pfnDlgProc = ButOrderOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index db0e0c3c28..5e7a0ca158 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -347,16 +347,16 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) odp.groupPosition = 1;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TRAFFIC);
- odp.pszGroup = LPGEN("Services");
- odp.pszTab = LPGEN("Options");
- odp.pszTitle = LPGEN("Traffic counter");
+ odp.szGroup.a = LPGEN("Services");
+ odp.szTab.a = LPGEN("Options");
+ odp.szTitle.a = LPGEN("Traffic counter");
odp.pfnDlgProc = DlgProcTCOptions;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// Statistics options page
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_STATS);
- odp.pszTab = LPGEN("Statistics");
+ odp.szTab.a = LPGEN("Statistics");
odp.pfnDlgProc = DlgProcOptStatistics;
Options_AddPage(wParam, &odp);
@@ -364,8 +364,8 @@ int TrafficCounterOptInitialise(WPARAM wParam, LPARAM) if (bPopupExists) {
odp.groupPosition = 100;
odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_TRAFFIC_POPUPS);
- odp.pszGroup=LPGEN("Popups");
- odp.pszTitle=LPGEN("Traffic counter");
+ odp.szGroup.a=LPGEN("Popups");
+ odp.szTitle.a=LPGEN("Traffic counter");
odp.pfnDlgProc=DlgProcPopupsTraffic;
odp.flags=ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index 2f16ba1797..df14d06c57 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -130,10 +130,10 @@ int CPsTree::AddDummyItem(LPCSTR pszGroup) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = ghInst; odp.flags = ODPF_UNICODE; - odp.pwszTitle = mir_utf8decodeW(pszGroup); + odp.szTitle.w = mir_utf8decodeW(pszGroup); INT_PTR rc = UserInfo_AddPage((WPARAM)&psh, &odp); - mir_free(odp.pwszTitle); + mir_free(odp.szTitle.w); if (!rc) { _pItems = psh._pPages; _numItems = psh._numPages; diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index fefe458ff8..99e3f70f29 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -328,7 +328,7 @@ int CPsTreeItem::Icon(HIMAGELIST hIml, OPTIONSDIALOGPAGE *odp, BYTE bInitIconsOn if (odp->hInstance == ghInst) {
// the pszGroup holds the iconfile for items added by uinfoex
- sid.defaultFile.w = odp->pwszGroup;
+ sid.defaultFile.w = odp->szGroup.w;
// icon library exists?
if (sid.defaultFile.w)
@@ -404,15 +404,15 @@ int CPsTreeItem::Create(CPsHdr* pPsh, OPTIONSDIALOGPAGE *odp) if (pPsh->_dwFlags & PSF_PROTOPAGESONLY) {
if (_dwFlags & ODPF_USERINFOTAB)
- mir_snwprintf(szTitle, L"%s %d\\%s", odp->pwszTitle, pPsh->_nSubContact+1, odp->pwszTab);
+ mir_snwprintf(szTitle, L"%s %d\\%s", odp->szTitle.w, pPsh->_nSubContact+1, odp->szTab.w);
else
- mir_snwprintf(szTitle, L"%s %d", odp->pwszTitle, pPsh->_nSubContact+1);
+ mir_snwprintf(szTitle, L"%s %d", odp->szTitle.w, pPsh->_nSubContact+1);
}
else {
if (_dwFlags & ODPF_USERINFOTAB)
- mir_snwprintf(szTitle, L"%s\\%s", odp->pwszTitle, odp->pwszTab);
+ mir_snwprintf(szTitle, L"%s\\%s", odp->szTitle.w, odp->szTab.w);
else
- mir_wstrcpy(szTitle, odp->pwszTitle);
+ mir_wstrcpy(szTitle, odp->szTitle.w);
}
// set the unique utf8 encoded name for the item
if (err = Name(szTitle, (_dwFlags & ODPF_UNICODE) == ODPF_UNICODE))
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index e1c7a28f75..83f6400fb3 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -356,7 +356,7 @@ static INT_PTR AddPage(WPARAM wParam, LPARAM lParam) if (pPsh->_dwFlags & (PSF_PROTOPAGESONLY | PSF_PROTOPAGESONLY_INIT)) {
BYTE bIsUnicode = (odp->flags & ODPF_UNICODE) == ODPF_UNICODE;
- wchar_t *ptszTitle = bIsUnicode ? mir_wstrdup(odp->pwszTitle) : mir_a2u(odp->pszTitle);
+ wchar_t *ptszTitle = bIsUnicode ? mir_wstrdup(odp->szTitle.w) : mir_a2u(odp->szTitle.a);
// avoid adding pages for a meta subcontact, which have been added for a metacontact.
if (pPsh->_dwFlags & PSF_PROTOPAGESONLY) {
@@ -431,7 +431,7 @@ static int AddProtocolPages(OPTIONSDIALOGPAGE& odp, WPARAM wParam, LPSTR pszProt wchar_t szTitle[MAX_PATH];
const BYTE ofs = (pszProto) ? mir_snwprintf(szTitle, L"%S\\", pszProto) : 0;
- odp.pwszTitle = szTitle;
+ odp.szTitle.w = szTitle;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_GENERAL);
odp.position = 0x8000000;
@@ -508,16 +508,16 @@ static int InitDetails(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = ghInst;
odp.flags = ODPF_ICON | ODPF_UNICODE;
- odp.pwszGroup = IcoLib_GetDefaultIconFileName();
+ odp.szGroup.w = IcoLib_GetDefaultIconFileName();
if (lParam) {
// ignore common pages for weather contacts
if (!pPsh->_pszProto || _stricmp(pPsh->_pszProto, "weather")) {
AddProtocolPages(odp, wParam);
- odp.pwszTitle = LPGENW("About") L"\\" LPGENW("Notes");
+ odp.szTitle.w = LPGENW("About") L"\\" LPGENW("Notes");
}
else
- odp.pwszTitle = LPGENW("Notes");
+ odp.szTitle.w = LPGENW("Notes");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONTACT_ABOUT);
odp.position = 0x8000008;
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index bdb41d321a..b8a979296a 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -1032,32 +1032,32 @@ static int OnInitOptions(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 95400;
odp.hInstance = ghInst;
- odp.pszTitle = MODULELONGNAME;
- odp.pszGroup = LPGEN("Contacts");
+ odp.szTitle.a = MODULELONGNAME;
+ odp.szGroup.a = LPGEN("Contacts");
// Common page
- odp.pszTab = LPGEN("Common");
+ odp.szTab.a = LPGEN("Common");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_COMMON);
odp.pfnDlgProc = DlgProc_CommonOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// Advanced page
- odp.pszTab = LPGEN("Advanced");
+ odp.szTab.a = LPGEN("Advanced");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_ADVANCED);
odp.pfnDlgProc = DlgProc_AdvancedOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// Details Dialog page
- odp.pszTab = LPGEN("Details dialog");
+ odp.szTab.a = LPGEN("Details dialog");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_DETAILSDLG);
odp.pfnDlgProc = DlgProc_DetailsDlgOpts;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// Reminder page
- odp.pszTab = LPGEN("Reminder");
+ odp.szTab.a = LPGEN("Reminder");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_REMINDER);
odp.pfnDlgProc = DlgProc_ReminderOpts;
odp.flags = ODPF_BOLDGROUPS;
@@ -1065,8 +1065,8 @@ static int OnInitOptions(WPARAM wParam, LPARAM) // Popups page
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.pszTitle = MODULELONGNAME;
- odp.pszGroup = LPGEN("Popups");
+ odp.szTitle.a = MODULELONGNAME;
+ odp.szGroup.a = LPGEN("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProc_Popups;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/Variables/src/options.cpp b/plugins/Variables/src/options.cpp index 8be86a9349..5b13a740a8 100644 --- a/plugins/Variables/src/options.cpp +++ b/plugins/Variables/src/options.cpp @@ -131,11 +131,11 @@ int OptionsInit(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.position = 150000000;
- odp.pszGroup = LPGEN("Services");
+ odp.szGroup.a = LPGEN("Services");
odp.groupPosition = 910000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTS_DIALOG);
- odp.pszTitle = LPGEN("Variables");
+ odp.szTitle.a = LPGEN("Variables");
odp.pfnDlgProc = SetOptsDlgProc;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/Watrack/i_opt_dlg.inc b/plugins/Watrack/i_opt_dlg.inc index 52848bf86b..ad1f576fe4 100644 --- a/plugins/Watrack/i_opt_dlg.inc +++ b/plugins/Watrack/i_opt_dlg.inc @@ -29,13 +29,13 @@ begin odp.pszTemplate:=PAnsiChar(IDD_OPT_PARTS);
odp.pfnDlgProc :=@DlgProcOptions0;
odp.szTab.a :='Modules';
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
odp.flags :=ODPF_BOLDGROUPS;
odp.pszTemplate:=PAnsiChar(IDD_OPT_BASIC);
odp.pfnDlgProc :=@DlgProcOptions1;
odp.szTab.a :='Basic';
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
ptr:=ModuleLink;
while ptr<>nil do
@@ -46,7 +46,7 @@ begin odp.pszTemplate:=tmpl;
odp.pfnDlgProc :=proc;
odp.szTab.a :=name;
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
if i>0 then continue;
end;
ptr:=ptr^.Next;
diff --git a/plugins/Watrack/popup/popups.pas b/plugins/Watrack/popup/popups.pas index 689a825a9d..089fe0b957 100644 --- a/plugins/Watrack/popup/popups.pas +++ b/plugins/Watrack/popup/popups.pas @@ -361,7 +361,7 @@ begin odp.szGroup.a :='Popups';
odp.pszTemplate:=PAnsiChar(IDD_OPT_POPUP);
odp.pfnDlgProc :=@DlgPopupOpt;
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
result:=0;
end;
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp index 1944953c62..15984a3d34 100755 --- a/plugins/Watrack_MPD/src/options.cpp +++ b/plugins/Watrack_MPD/src/options.cpp @@ -71,9 +71,9 @@ int WaMpdOptInit(WPARAM wParam,LPARAM) OPTIONSDIALOGPAGE odp = { 0 }; odp.hInstance = hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WA_MPD); - odp.pwszTitle = LPGENW("Winamp Track"); - odp.pwszGroup = LPGENW("Plugins"); - odp.pwszTab = LPGENW("Watrack MPD"); + odp.szTitle.w = LPGENW("Winamp Track"); + odp.szGroup.w = LPGENW("Plugins"); + odp.szTab.w = LPGENW("Watrack MPD"); odp.flags=ODPF_BOLDGROUPS|ODPF_UNICODE; odp.pfnDlgProc = DlgProcWaMpdOpts; Options_AddPage(wParam, &odp); diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 6e9374dea6..9c0e515806 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -577,25 +577,25 @@ int OptInit(WPARAM wParam, LPARAM) odp.position = 95600;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pfnDlgProc = OptionsProc;
- odp.pszGroup = LPGEN("Network");
- odp.pszTitle = WEATHERPROTOTEXT;
- odp.pszTab = LPGEN("General");
+ odp.szGroup.a = LPGEN("Network");
+ odp.szTitle.a = WEATHERPROTOTEXT;
+ odp.szTab.a = LPGEN("General");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
// text options
odp.pszTemplate = MAKEINTRESOURCEA(IDD_TEXTOPT);
odp.pfnDlgProc = DlgProcText;
- odp.pszTab = LPGEN("Display");
+ odp.szTab.a = LPGEN("Display");
Options_AddPage(wParam, &odp);
// if popup service exists, load the weather popup options
if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {
odp.position = 100000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.pszGroup = LPGEN("Popups");
+ odp.szGroup.a = LPGEN("Popups");
odp.groupPosition = 910000000;
- odp.pszTab = NULL;
+ odp.szTab.a = NULL;
odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/Weather/src/weather_userinfo.cpp b/plugins/Weather/src/weather_userinfo.cpp index 6eb376998d..9462ead897 100644 --- a/plugins/Weather/src/weather_userinfo.cpp +++ b/plugins/Weather/src/weather_userinfo.cpp @@ -316,7 +316,7 @@ int UserInfoInit(WPARAM wParam, LPARAM lParam) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.position = 100000000;
- odp.pszTitle = WEATHERPROTONAME;
+ odp.szTitle.a = WEATHERPROTONAME;
if (lParam == 0) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO);
diff --git a/plugins/WebView/src/webview.cpp b/plugins/WebView/src/webview.cpp index 4cfc3f1d0d..2a80d1a83f 100644 --- a/plugins/WebView/src/webview.cpp +++ b/plugins/WebView/src/webview.cpp @@ -295,8 +295,8 @@ static int OptInitialise(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);
- odp.pszGroup = LPGEN("Network");
- odp.pszTitle = MODULENAME;
+ odp.szGroup.a = LPGEN("Network");
+ odp.szTitle.a = MODULENAME;
odp.pfnDlgProc = DlgProcOpt;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
@@ -304,7 +304,7 @@ static int OptInitialise(WPARAM wParam, LPARAM) // if popup service exists
if ((ServiceExists(MS_POPUP_ADDPOPUPT))) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.pwszGroup = LPGENW("Popups");
+ odp.szGroup.w = LPGENW("Popups");
odp.pfnDlgProc = DlgPopUpOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index f2e6619413..b7420a583e 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -46,8 +46,8 @@ static int OnOptionsInitialise(WPARAM wParam, LPARAM) odp.position = 100000000;
odp.hInstance = hInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_WWI);
- odp.pwszTitle = LPGENW("Birthdays");
- odp.pwszGroup = LPGENW("Contacts");
+ odp.szTitle.w = LPGENW("Birthdays");
+ odp.szGroup.w = LPGENW("Contacts");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pfnDlgProc = DlgProcOptions;
diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index acf8f278b7..54643218f3 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -472,9 +472,9 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.position = 945000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pszTitle = LPGEN("Who uses my files");
+ odp.szTitle.a = LPGEN("Who uses my files");
odp.pfnDlgProc = OptionsDlgProc;
- odp.pszGroup = LPGEN("Services");
+ odp.szGroup.a = LPGEN("Services");
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wparam, &odp);
return 0;
diff --git a/plugins/WinterSpeak/src/main.cpp b/plugins/WinterSpeak/src/main.cpp index 270563dd43..109887b3ab 100644 --- a/plugins/WinterSpeak/src/main.cpp +++ b/plugins/WinterSpeak/src/main.cpp @@ -71,18 +71,18 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = g_hInst;
- odp.pwszGroup = LPGENW("Speak");
+ odp.szGroup.w = LPGENW("Speak");
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
if (g_speak_config)
{
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CONFIG);
- odp.pwszTitle = LPGENW("Engine/Voice");
+ odp.szTitle.w = LPGENW("Engine/Voice");
odp.pfnDlgProc = DialogConfigEngine::process;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ACTIVEMODES);
- odp.pwszTitle = LPGENW("Active Modes");
+ odp.szTitle.w = LPGENW("Active Modes");
odp.pfnDlgProc = DialogConfigActive::process;
Options_AddPage(wParam, &odp);
}
@@ -90,7 +90,7 @@ int dialogOptionsInitialise(WPARAM wParam, LPARAM) if (g_speak_announce)
{
odp.pszTemplate = MAKEINTRESOURCEA(IDD_ANNOUNCE);
- odp.pwszTitle = LPGENW("Announce");
+ odp.szTitle.w = LPGENW("Announce");
odp.pfnDlgProc = AnnounceDialog::process;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp index 1fab9fedf2..62ff836c1e 100644 --- a/plugins/XSoundNotify/src/options.cpp +++ b/plugins/XSoundNotify/src/options.cpp @@ -244,8 +244,8 @@ INT OptInit(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
- odp.pwszGroup = LPGENW("Sounds");
- odp.pwszTitle = LPGENW("XSound Notify");
+ odp.szGroup.w = LPGENW("Sounds");
+ odp.szTitle.w = LPGENW("XSound Notify");
odp.pfnDlgProc = OptsProc;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 14d242106f..16fda3be2c 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -157,28 +157,28 @@ int YAMNOptInitSvc(WPARAM wParam, LPARAM) {
OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = YAMNVar.hInst;
- odp.pszGroup = LPGEN("Network");
- odp.pszTitle = LPGEN("YAMN");
+ odp.szGroup.a = LPGEN("Network");
+ odp.szTitle.a = LPGEN("YAMN");
odp.flags = ODPF_BOLDGROUPS;
- odp.pszTab = LPGEN("Accounts");
+ odp.szTab.a = LPGEN("Accounts");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTOPT);
odp.pfnDlgProc = DlgProcPOP3AccOpt;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("General");
+ odp.szTab.a = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_YAMNOPT);
odp.pfnDlgProc = DlgProcYAMNOpt;
Options_AddPage(wParam, &odp);
- odp.pszTab = LPGEN("Plugins");
+ odp.szTab.a = LPGEN("Plugins");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PLUGINOPT);
odp.pfnDlgProc = DlgProcPluginOpt;
Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.pszGroup = LPGEN("Popups");
- odp.pszTab = LPGEN("YAMN");
+ odp.szGroup.a = LPGEN("Popups");
+ odp.szTab.a = LPGEN("YAMN");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP);
odp.pfnDlgProc = DlgProcPOP3AccPopup;
Options_AddPage(wParam, &odp);
diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp index 748e73dfc8..ccf5046923 100644 --- a/plugins/YAPP/src/notify_imp.cpp +++ b/plugins/YAPP/src/notify_imp.cpp @@ -97,7 +97,7 @@ int NotifyOptionsInitialize(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
- odp.pszTitle = LPGEN("YAPP Popups");
+ odp.szTitle.a = LPGEN("YAPP Popups");
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = DlgProcPopups;
CallService(MS_NOTIFY_OPT_ADDPAGE, wParam, (LPARAM)&odp);
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index ef7a83f2ee..47720f25a9 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -477,15 +477,15 @@ int OptInit(WPARAM wParam, LPARAM) odp.flags = ODPF_BOLDGROUPS;
odp.position = -790000000;
odp.hInstance = hInst;
- odp.pszTitle = LPGEN("Popups");
+ odp.szTitle.a = LPGEN("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
- odp.pszTab = LPGEN("Settings");
+ odp.szTab.a = LPGEN("Settings");
odp.pfnDlgProc = DlgProcOpts1;
Options_AddPage(wParam, &odp);
odp.pszTemplate = MAKEINTRESOURCEA(IDD_CLASSES);
- odp.pszTab = LPGEN("Classes");
+ odp.szTab.a = LPGEN("Classes");
odp.pfnDlgProc = DlgProcOptsClasses;
Options_AddPage(wParam, &odp);
return 0;
diff --git a/plugins/YARelay/src/options.cpp b/plugins/YARelay/src/options.cpp index a0222e0bef..5749ea1549 100644 --- a/plugins/YARelay/src/options.cpp +++ b/plugins/YARelay/src/options.cpp @@ -194,9 +194,9 @@ int OptionsInit(WPARAM wParam, LPARAM) OPTIONSDIALOGPAGE odp = { 0 };
odp.hInstance = hInst;
odp.position = -1;
- odp.pszGroup = LPGEN("Message sessions");
+ odp.szGroup.a = LPGEN("Message sessions");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_SETTINGS);
- odp.pszTitle = LPGEN("Messages forwarding");
+ odp.szTitle.a = LPGEN("Messages forwarding");
odp.pfnDlgProc = OptionsFrameProc;
odp.flags = ODPF_BOLDGROUPS;
Options_AddPage(wParam, &odp);
diff --git a/plugins/ZeroNotification/src/main.cpp b/plugins/ZeroNotification/src/main.cpp index 4f0f58d421..7dc4995d7e 100644 --- a/plugins/ZeroNotification/src/main.cpp +++ b/plugins/ZeroNotification/src/main.cpp @@ -208,8 +208,8 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.hInstance = hInst;
odp.flags = ODPF_UNICODE;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOSOUND);
- odp.pwszTitle = LPGENW("Zero Notifications");
- odp.pwszGroup = LPGENW("Plugins");
+ odp.szTitle.w = LPGENW("Zero Notifications");
+ odp.szGroup.w = LPGENW("Plugins");
odp.groupPosition = 100000000;
odp.pfnDlgProc = DlgProcNoSoundOpts;
Options_AddPage(wParam, &odp);
diff --git a/plugins/mRadio/i_myservice.inc b/plugins/mRadio/i_myservice.inc index 303aef72c1..d6d7eaa9d9 100644 --- a/plugins/mRadio/i_myservice.inc +++ b/plugins/mRadio/i_myservice.inc @@ -63,15 +63,9 @@ begin end;
function Service_RadioSettings(wParam:WPARAM;lParam:LPARAM):int;cdecl;
-var
- ood:TOPENOPTIONSDIALOG;
begin
result:=0;
- ood.cbSize:=SizeOf(ood);
- ood.pszGroup:='Network';
- ood.pszPage :=PluginName;
- ood.pszTab :=Translate('Advanced');
- CallService(MS_OPT_OPENOPTIONS,0,tlparam(@ood));
+ Options_Open('Network','mRadio','Advanced');
end;
function Service_RadioRecord(wParam:WPARAM;lParam:LPARAM):int;cdecl;
diff --git a/plugins/mRadio/i_optdlg.inc b/plugins/mRadio/i_optdlg.inc index 69e9ab3971..a48d987989 100644 --- a/plugins/mRadio/i_optdlg.inc +++ b/plugins/mRadio/i_optdlg.inc @@ -629,12 +629,12 @@ begin odp.pszTemplate:=MAKEINTRESOURCEA(IDD_SETTING);
odp.pfnDlgProc :=@DlgProcOpt;
odp.szTab.a :='Common';
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
odp.pszTemplate:=MAKEINTRESOURCEA(IDD_SETTING_TECH);
odp.pfnDlgProc :=@DlgProcOptTech;//!!
odp.szTab.a :=Translate('Advanced');
- CallService(MS_OPT_ADDPAGE,wParam,tlparam(@odp));
+ Options_AddPage(wParam,@odp);
result:=0;
end;
diff --git a/plugins/wbOSD/src/options.cpp b/plugins/wbOSD/src/options.cpp index f0d278b074..bfb913ff8a 100644 --- a/plugins/wbOSD/src/options.cpp +++ b/plugins/wbOSD/src/options.cpp @@ -414,8 +414,8 @@ int OptionsInit(WPARAM wparam, LPARAM) odp.groupPosition = 950000000;
odp.hInstance = hI;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_DIALOG1);
- odp.pwszGroup = LPGENW("Plugins");
- odp.pwszTitle = LPGENW("OSD");
+ odp.szGroup.w = LPGENW("Plugins");
+ odp.szTitle.w = LPGENW("OSD");
odp.pfnDlgProc = OptDlgProc;
odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE;
Options_AddPage(wparam, &odp);
|