From c494390841abd3b70e832f7f6f07ccadfeece96c Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 27 Feb 2014 17:26:54 +0000
Subject: - removed option for copying mc history; - removed SavedDefault; -
 removed a bunch of terrors; - LPGEN for menu items returned back instead of
 Translate

git-svn-id: http://svn.miranda-ng.org/main/trunk@8303 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/metacontacts/meta_options.cpp | 38 +++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 7 deletions(-)

(limited to 'src/modules/metacontacts/meta_options.cpp')

diff --git a/src/modules/metacontacts/meta_options.cpp b/src/modules/metacontacts/meta_options.cpp
index e51b4b63bc..8e87d8a22b 100644
--- a/src/modules/metacontacts/meta_options.cpp
+++ b/src/modules/metacontacts/meta_options.cpp
@@ -69,7 +69,9 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 			EnableWindow(hw, FALSE);
 		}
 
-		CheckDlgButton(hwndDlg, IDC_CHK_COPYHISTORY, options_changes.copy_subcontact_history ? TRUE : FALSE);
+		EnableWindow(GetDlgItem(hwndDlg, IDC_CHK_COPYHISTORY), FALSE);
+		CheckDlgButton(hwndDlg, IDC_CHK_COPYHISTORY, FALSE);
+
 		hw = GetDlgItem(hwndDlg, IDC_ED_DAYS);
 		_itot(options_changes.days_history, buff, 10);
 		SetWindowText(hw, buff);
@@ -95,10 +97,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 				options_changes.suppress_status = IsDlgButtonChecked(hwndDlg, IDC_CHK_SUPPRESSSTATUS);
 				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);
 				break;
-			case IDC_CHK_COPYHISTORY:
-				options_changes.copy_subcontact_history = IsDlgButtonChecked(hwndDlg, IDC_CHK_COPYHISTORY);
-				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);
-				break;
 			case IDC_CHK_METAHISTORY:
 				options_changes.metahistory = IsDlgButtonChecked(hwndDlg, IDC_CHK_METAHISTORY);
 				SendMessage( GetParent(hwndDlg), PSM_CHANGED, 0, 0);
@@ -220,7 +218,6 @@ int Meta_WriteOptions(MetaOptions *opt)
 	db_set_w(NULL, META_PROTO, "MenuContactLabel", (WORD)opt->menu_contact_label);
 	db_set_w(NULL, META_PROTO, "MenuContactFunction", (WORD)opt->menu_function);
 	db_set_w(NULL, META_PROTO, "CListContactName", (WORD)opt->clist_contact_name);
-	db_set_b(NULL, META_PROTO, "CopyHistory", (BYTE)(opt->copy_subcontact_history ? 1 : 0));
 	db_set_dw(NULL, META_PROTO, "DaysHistory", (DWORD)(opt->days_history));
 	db_set_dw(NULL, META_PROTO, "SetStatusFromOfflineDelay", (DWORD)(opt->set_status_from_offline_delay));
 	db_set_b(NULL, META_PROTO, "SubcontactWindows", (BYTE)(opt->subcontact_windows ? 1 : 0));
@@ -252,7 +249,6 @@ int Meta_ReadOptions(MetaOptions *opt)
 	opt->menu_contact_label = (int)db_get_w(NULL, META_PROTO, "MenuContactLabel", DNT_UID);
 	opt->menu_function = (int)db_get_w(NULL, META_PROTO, "MenuContactFunction", FT_MENU);
 	opt->clist_contact_name = (int)db_get_w(NULL, META_PROTO, "CListContactName", CNNT_NICK);
-	opt->copy_subcontact_history = (db_get_b(NULL, META_PROTO, "CopyHistory", 1) == 1 ? TRUE : FALSE);
 	opt->days_history = (int)db_get_dw(NULL, META_PROTO, "DaysHistory", 0);
 	opt->set_status_from_offline_delay = (int)db_get_dw(NULL, META_PROTO, "SetStatusFromOfflineDelay", DEFAULT_SET_STATUS_SLEEP_TIME);
 	opt->subcontact_windows = (db_get_b(NULL, META_PROTO, "SubcontactWindows", 0) == 1 ? TRUE : FALSE);
@@ -604,3 +600,31 @@ INT_PTR CALLBACK DlgProcOptsPriorities(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 
 	return FALSE;
 }
+
+/////////////////////////////////////////////////////////////////////////////////////////
+
+int Meta_OptInit(WPARAM wParam, LPARAM lParam)
+{
+	OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+	odp.position = -790000000;
+	odp.hInstance = hInst;
+	odp.flags = ODPF_BOLDGROUPS;
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAOPTIONS);
+	odp.pszTitle = LPGEN("MetaContacts");
+	odp.pszGroup = LPGEN("Contacts");
+	odp.pszTab = LPGEN("General");
+	odp.pfnDlgProc = DlgProcOpts;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAPRIORITIES);
+	odp.pszTab = LPGEN("Priorities");
+	odp.pfnDlgProc = DlgProcOptsPriorities;
+	Options_AddPage(wParam, &odp);
+
+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_METAHISTORY);
+	odp.pszTab = LPGEN("History");
+	odp.pfnDlgProc = DlgProcOpts;
+	Options_AddPage(wParam, &odp);
+	return 0;
+}
-- 
cgit v1.2.3