From 218ce60228981746b57531bb2dcb1bdb4a0f96b5 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Sun, 2 Dec 2012 21:40:05 +0000
Subject: useless options dialog removed

git-svn-id: http://svn.miranda-ng.org/main/trunk@2614 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 src/modules/options/filter.cpp  | 67 -----------------------------------------
 src/modules/options/filter.h    |  3 --
 src/modules/options/options.cpp | 15 +++------
 3 files changed, 5 insertions(+), 80 deletions(-)

(limited to 'src/modules/options')

diff --git a/src/modules/options/filter.cpp b/src/modules/options/filter.cpp
index 13799b602f..c4cad5a70f 100644
--- a/src/modules/options/filter.cpp
+++ b/src/modules/options/filter.cpp
@@ -24,8 +24,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "..\..\core\commonheaders.h"
 #include "filter.h"
 
-HANDLE hOptionsInitialize;
-
 CPageList filterStrings(1);
 
 void AddFilterString(const PageHash key, TCHAR *data)
@@ -152,68 +150,3 @@ void GetDialogStrings(int enableKeywordFiltering, const PageHash key, TCHAR *plu
 		EnumChildWindows(hWnd, GetDialogStringsCallback, (LPARAM) key);
 	}
 }
-
-static INT_PTR CALLBACK DlgProcOptSearch(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-	switch (msg) {
-	case WM_INITDIALOG:
-		TranslateDialogDefault(hWnd);
-		
-		CheckDlgButton(hWnd, IDC_ENABLE_KEYWORDFILTERING, db_get_w(NULL, "Options", "EnableKeywordFiltering", TRUE) ? BST_CHECKED : BST_UNCHECKED);
-		return TRUE;
-	
-	case WM_COMMAND:
-		switch (LOWORD(wParam)) {
-		case IDC_ENABLE_KEYWORDFILTERING:
-			SendMessage(GetParent(hWnd), PSM_CHANGED, 0, 0);
-			break;
-		}
-		break;
-
-	case WM_SETFOCUS:
-		SetFocus( GetDlgItem(hWnd, IDC_ENABLE_KEYWORDFILTERING));
-		break;
-
-	case WM_NOTIFY:
-		switch(((LPNMHDR)lParam)->idFrom) {
-		case 0:
-			switch (((LPNMHDR)lParam)->code) {
-			case PSN_APPLY:
-				DBWriteContactSettingWord(NULL, "Options", "EnableKeywordFiltering", IsDlgButtonChecked(hWnd, IDC_ENABLE_KEYWORDFILTERING));
-				break;
-			}
-		}
-		break;
-	}
-	
-	return 0;
-}
-
-static int OnOptionsInitialise(WPARAM wParam, LPARAM)
-{
-	OPTIONSDIALOGPAGE odp = {0};
-
-	odp.cbSize = sizeof(odp);
-	odp.position = -190000000;
-	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_KEYWORDFILTER);
-	odp.pszTitle = LPGEN("Options search");
-	odp.pszGroup = LPGEN("Customize");
-	odp.groupPosition = 810000000;
-	odp.flags = ODPF_BOLDGROUPS;
-	odp.pfnDlgProc = DlgProcOptSearch;
-	Options_AddPage(wParam, &odp);
-	return 0;
-}
-
-int HookFilterEvents()
-{
-	hOptionsInitialize = HookEvent(ME_OPT_INITIALISE, OnOptionsInitialise);
-	return 0;
-}
-
-int UnhookFilterEvents()
-{
-	UnhookEvent(hOptionsInitialize);
-	return 0;
-}
diff --git a/src/modules/options/filter.h b/src/modules/options/filter.h
index a0ee0f8851..c8a62665d3 100644
--- a/src/modules/options/filter.h
+++ b/src/modules/options/filter.h
@@ -26,9 +26,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 extern HANDLE hOptionsInitialize;
 
-int HookFilterEvents();
-int UnhookFilterEvents();
-
 typedef DWORD PageHash;
 
 void	AddFilterString(const PageHash key, const TCHAR *data);
diff --git a/src/modules/options/options.cpp b/src/modules/options/options.cpp
index 4af9638e87..27b9baa06d 100644
--- a/src/modules/options/options.cpp
+++ b/src/modules/options/options.cpp
@@ -773,12 +773,11 @@ static INT_PTR CALLBACK OptionsDlgProc(HWND hdlg, UINT message, WPARAM wParam, L
 			MapWindowPoints(NULL, hdlg, (LPPOINT)&dat->rcTab, 2);
 			TabCtrl_AdjustRect( GetDlgItem(hdlg, IDC_TAB), FALSE, &dat->rcTab);
 
-			//!!!!!!!!!! int enableKeywordFiltering = db_get_w(NULL, "Options", "EnableKeywordFiltering", TRUE); 
-			FillFilterCombo(0, hdlg, dat); //!!!!!!!!!!  enableKeywordFiltering, 
+			FillFilterCombo(0, hdlg, dat);
 			SendMessage(hdlg, DM_REBUILDPAGETREE, 0, 0);
-
-			return TRUE;
 		}
+		return TRUE;
+
 	case DM_REBUILDPAGETREE:
 		{	
 			BOOL bRemoveFocusFromFilter = FALSE;
@@ -1429,11 +1428,9 @@ static int OptModulesLoaded(WPARAM, LPARAM)
 
 int ShutdownOptionsModule(WPARAM, LPARAM)
 {
-	if (IsWindow(hwndOptions)) DestroyWindow(hwndOptions);
+	if ( IsWindow(hwndOptions))
+		DestroyWindow(hwndOptions);
 	hwndOptions = NULL;
-	
-	//!!!!!!!!!! UnhookFilterEvents();
-	
 	return 0;
 }
 
@@ -1447,7 +1444,5 @@ int LoadOptionsModule(void)
 	CreateServiceFunction("Options/OptionsCommand", OpenOptionsDialog);
 	HookEvent(ME_SYSTEM_MODULESLOADED, OptModulesLoaded);
 	HookEvent(ME_SYSTEM_PRESHUTDOWN, ShutdownOptionsModule);
-	
-	//!!!!!!!!!! HookFilterEvents();
 	return 0;
 }
-- 
cgit v1.2.3