summaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'plugins')
-rw-r--r--plugins/DbEditorPP/res/resource.rc27
-rw-r--r--plugins/DbEditorPP/src/headers.h1
-rw-r--r--plugins/DbEditorPP/src/main.cpp2
-rw-r--r--plugins/DbEditorPP/src/options.cpp7
-rw-r--r--plugins/DbEditorPP/src/resource.h3
5 files changed, 16 insertions, 24 deletions
diff --git a/plugins/DbEditorPP/res/resource.rc b/plugins/DbEditorPP/res/resource.rc
index 4b17ab649d..8abcd2d75d 100644
--- a/plugins/DbEditorPP/res/resource.rc
+++ b/plugins/DbEditorPP/res/resource.rc
@@ -13,7 +13,7 @@
#undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// Английский (США) resources
+// English (United States) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -54,7 +54,7 @@ BEGIN
CONTROL "Entirely",IDC_ENTIRELY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,262,74,67,10
END
-IDD_OPTIONS DIALOGEX 0, 0, 314, 239
+IDD_OPTIONS DIALOGEX 0, 0, 314, 92
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE
EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x0
@@ -64,13 +64,12 @@ BEGIN
CONTROL "Automatically expand ""settings"" when Database Editor ++ starts",IDC_EXPANDSETTINGS,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,26,283,10
CONTROL "Warn when deleting modules",IDC_WARNONDEL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,39,280,10
- CONTROL """Open user tree in DBE++"" menu item",IDC_MENU,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,52,280,10
CONTROL "Use popups when watched settings change values",IDC_POPUPS,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,65,275,10
- EDITTEXT IDC_POPUPTIMEOUT,144,76,20,12,ES_NUMBER
- CONTROL "",IDC_COLOUR,"ColourPicker",WS_TABSTOP,257,76,26,12
- RTEXT "Popup timeout (0 for infinite)",IDC_STATIC,35,78,103,8
- RTEXT "Background color",IDC_STATIC,177,78,77,8
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,57,275,10
+ EDITTEXT IDC_POPUPTIMEOUT,144,68,20,12,ES_NUMBER
+ CONTROL "",IDC_COLOUR,"ColourPicker",WS_TABSTOP,257,68,26,12
+ RTEXT "Popup timeout (0 for infinite)",IDC_STATIC,35,70,103,8
+ RTEXT "Background color",IDC_STATIC,177,70,77,8
END
IDD_ADD_MODULE DIALOGEX 0, 0, 186, 67
@@ -186,7 +185,7 @@ BEGIN
RIGHTMARGIN, 307
VERTGUIDE, 12
TOPMARGIN, 7
- BOTTOMMARGIN, 232
+ BOTTOMMARGIN, 85
HORZGUIDE, 68
END
@@ -246,11 +245,11 @@ END
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
+ICO_REGEDIT ICON "Icon_1.ico"
ICO_KNOWN ICON "Yellow.ico"
ICO_KNOWNOPEN ICON "Yellow_open.ico"
ICO_SETTINGS ICON "Icon_4.ico"
ICO_ONLINE ICON "online2.ico"
-ICO_REGEDIT ICON "Icon_1.ico"
ICO_DBE_BUTT ICON "dbepp.ico"
ICO_REGUSER ICON "usermenu.ico"
ICO_STRING ICON "Icon_14.ico"
@@ -263,10 +262,6 @@ ICO_OFFLINE ICON "offline2.ico"
ICO_UNICODE ICON "unicode.ico"
ICO_HANDLE ICON "handle.ico"
-#endif // Английский (США) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
#ifdef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
//
@@ -459,6 +454,10 @@ BEGIN
END
END
+#endif // English (United States) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
#ifndef APSTUDIO_INVOKED
/////////////////////////////////////////////////////////////////////////////
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 10:02:57 +0000