From c8e8e884a6a632c5766eddab2d84c6a6b2216d6c Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 6 Dec 2016 14:22:46 +0300
Subject: StdMsg & Scriver: - switched to the toolbar buttons instead of the
 fixed button set; - switched to the shared windows list

---
 plugins/Scriver/src/msgoptions.cpp | 71 ++++++++++++++++++++++++--------------
 1 file changed, 45 insertions(+), 26 deletions(-)

(limited to 'plugins/Scriver/src/msgoptions.cpp')

diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 6beeab12ce..0dfdb2d36a 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -23,28 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "stdafx.h"
 
-static INT_PTR CALLBACK DlgProcOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static INT_PTR CALLBACK DlgProcTabsOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-static INT_PTR CALLBACK DlgProcLayoutOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-
-struct TabDef
-{
-	DLGPROC dlgProc;
-	DWORD dlgId;
-	const char *tabName;
-};
-
-static const TabDef tabPages[] = {
-	{ DlgProcOptions, IDD_OPT_MSGDLG, LPGEN("General") },
-	{ DlgProcTabsOptions, IDD_OPT_MSGTABS, LPGEN("Tabs") },
-	{ DlgProcLayoutOptions, IDD_OPT_LAYOUT, LPGEN("Layout") },
-	{ DlgProcLogOptions, IDD_OPT_MSGLOG, LPGEN("Event log") },
-	{ DlgProcOptions1, IDD_OPTIONS1, LPGEN("Group chat") },
-	{ DlgProcOptions2, IDD_OPTIONS2, LPGEN("Group chat log") }
-};
+INT_PTR CALLBACK DlgProcOptionsPopup(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 #define FONTF_BOLD		1
 #define FONTF_ITALIC	2
@@ -946,6 +927,8 @@ static INT_PTR CALLBACK DlgProcTypeOptions(HWND hwndDlg, UINT msg, WPARAM wParam
 	return FALSE;
 }
 
+/////////////////////////////////////////////////////////////////////////////////////////
+
 int OptInitialise(WPARAM wParam, LPARAM)
 {
 	OPTIONSDIALOGPAGE odp = { 0 };
@@ -953,12 +936,36 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	odp.hInstance = g_hInst;
 	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.szTab.a = (char *)tabPages[i].tabName;
-		Options_AddPage(wParam, &odp);
-	}
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGDLG);
+	odp.pfnDlgProc = DlgProcOptions;
+	odp.szTab.a = LPGEN("General");
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTABS);
+	odp.pfnDlgProc = DlgProcTabsOptions;
+	odp.szTab.a = LPGEN("Tabs");
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_LAYOUT);
+	odp.pfnDlgProc = DlgProcLayoutOptions;
+	odp.szTab.a = LPGEN("Layout");
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGLOG);
+	odp.pfnDlgProc = DlgProcLogOptions;
+	odp.szTab.a = LPGEN("Event log");
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);
+	odp.pfnDlgProc = DlgProcOptions1;
+	odp.szTab.a = LPGEN("Group chat");
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS2);
+	odp.pfnDlgProc = DlgProcOptions2;
+	odp.szTab.a = LPGEN("Group chat log");
+	Options_AddPage(wParam, &odp);
 
 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGTYPE);
 	odp.szGroup.a = LPGEN("Message sessions");
@@ -966,5 +973,17 @@ int OptInitialise(WPARAM wParam, LPARAM)
 	odp.pfnDlgProc = DlgProcTypeOptions;
 	odp.szTab.a = NULL;
 	Options_AddPage(wParam, &odp);
+
+	if (g_dat.popupInstalled) {
+		OPTIONSDIALOGPAGE odp = { 0 };
+		odp.position = 910000002;
+		odp.hInstance = g_hInst;
+		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
+		odp.szTitle.a = LPGEN("Messaging");
+		odp.szGroup.a = LPGEN("Popups");
+		odp.pfnDlgProc = DlgProcOptionsPopup;
+		odp.flags = ODPF_BOLDGROUPS;
+		Options_AddPage(wParam, &odp);
+	}
 	return 0;
 }
-- 
cgit v1.2.3