summaryrefslogtreecommitdiff
path: root/plugins/TabSRMM
diff options
context:
space:
mode:
authorGeorge Hazan <ghazan@miranda.im>2016-10-28 16:18:50 +0300
committerGeorge Hazan <ghazan@miranda.im>2016-10-28 16:18:50 +0300
commitcf9de21af3073e29cb7b149fbd8427241de70729 (patch)
tree2a0b17f49d14d4a51bc942f15bf3747509f0c3cf /plugins/TabSRMM
parent3de431cc811a1fbf9cd0d520fe33b6163c73e919 (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/TabSRMM')
-rw-r--r--plugins/TabSRMM/src/msgdlgutils.cpp8
-rw-r--r--plugins/TabSRMM/src/msgoptions.cpp42
-rw-r--r--plugins/TabSRMM/src/typingnotify.cpp4
3 files changed, 24 insertions, 30 deletions
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;