removed unneeded option (fixes #590)

git-svn-id: http://svn.miranda-ng.org/main/trunk@8204 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 3 insertions, 10 deletions

diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h
index d6e0c7006a..75a3830f6a 100644
--- a/plugins/DbEditorPP/src/headers.h
+++ b/plugins/DbEditorPP/src/headers.h
@@ -58,7 +58,6 @@ int AddIconToList(HIMAGELIST hil, HICON hIcon);
 void AddProtoIconsToList(HIMAGELIST hil, int newshift);

 int GetProtoIcon(char *szProto);

 extern MCONTACT hRestore;

-extern HGENMENU hUserMenu;

 /////////////////////

 

 #ifndef NDEBUG

diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp
index 1e934e4ca7..f523686d96 100644
--- a/plugins/DbEditorPP/src/main.cpp
+++ b/plugins/DbEditorPP/src/main.cpp
@@ -158,7 +158,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam)
 	ZeroMemory(&mi, sizeof(mi));

 	mi.cbSize = sizeof(mi);

 	mi.position = 1900000001;

-	mi.flags = db_get_b(NULL, modname, "UserMenuItem", 0) ? 0 : CMIF_HIDDEN;

+	mi.flags = 0;

 	mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGUSER));

 	mi.pszName = LPGEN("Open user tree in DBE++");

 	mi.pszService = "DBEditorpp/MenuCommand";

diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp
index d30e3b7e97..7247405b9e 100644
--- a/plugins/DbEditorPP/src/options.cpp
+++ b/plugins/DbEditorPP/src/options.cpp
@@ -11,7 +11,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			CheckDlgButton(hwnd,IDC_EXPANDSETTINGS,db_get_b(NULL,modname,"ExpandSettingsOnOpen",0));

 			CheckDlgButton(hwnd,IDC_RESTORESETTINGS,db_get_b(NULL,modname,"RestoreOnOpen",1));

 			CheckDlgButton(hwnd,IDC_WARNONDEL,db_get_b(NULL,modname,"WarnOnDelete",1));

-			CheckDlgButton(hwnd,IDC_MENU,db_get_b(NULL,modname,"UserMenuItem",0));

 			CheckDlgButton(hwnd,IDC_POPUPS,usePopups);

 			SetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,db_get_w(NULL,modname,"PopupDelay",4),0);

 			SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_SETCOLOUR, 0, (LPARAM)db_get_dw(NULL,modname,"PopupColour",RGB(255,0,0)));

@@ -24,7 +23,6 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			{

 				case IDC_RESTORESETTINGS:

 				case IDC_EXPANDSETTINGS:

-				case IDC_MENU:

 				case IDC_POPUPS:

 				case IDC_WARNONDEL:

 				case IDC_COLOUR:

@@ -47,13 +45,10 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 								db_set_b(NULL,modname,"ExpandSettingsOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_EXPANDSETTINGS));

 								db_set_b(NULL,modname,"RestoreOnOpen",(BYTE)IsDlgButtonChecked(hwnd,IDC_RESTORESETTINGS));

 								db_set_b(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL));

-								db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU));

 								usePopups = IsDlgButtonChecked(hwnd,IDC_POPUPS);

 								db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopups);

 								db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0));

 								db_set_dw(NULL,modname,"PopupColour",(DWORD)SendDlgItemMessage(hwnd, IDC_COLOUR, CPM_GETCOLOUR, 0, 0));

-

-								Menu_ShowItem(hUserMenu, IsDlgButtonChecked(hwnd,IDC_MENU));

 							}

 							return TRUE;

 					}

@@ -64,7 +59,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 	return FALSE;

 }

 

-INT OptInit(WPARAM wParam,LPARAM lParam)

+INT OptInit(WPARAM wParam,LPARAM)

 {

 	OPTIONSDIALOGPAGE odp = { sizeof(odp) };

 	odp.hInstance = hInst;

diff --git a/plugins/DbEditorPP/src/resource.h b/plugins/DbEditorPP/src/resource.h
index 708b4195a1..6c2cafe832 100644
--- a/plugins/DbEditorPP/src/resource.h
+++ b/plugins/DbEditorPP/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}

 // Microsoft Visual C++ generated include file.

-// Used by resource.rc

+// Used by ..\res\resource.rc

 //

 #define ICO_REGEDIT                     1

 #define ICO_UNICODE                     2

@@ -33,7 +33,6 @@
 #define ICO_ONLINE                      129

 #define IDC_MODULES                     1000

 #define IDC_SETTINGS                    1001

-#define IDC_MENU                        1002

 #define IDC_MODNAME                     1004

 #define CHK_ADD2ALL                     1005

 #define IDC_MODNAME2                    1005