From 8bbf210610804623aa581f3a547fc782fed9c118 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Sun, 19 May 2013 12:36:06 +0000 Subject: "PopUp" everywhere was replaced to "Popup" git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/DbEditorPP/src/headers.h | 2 +- plugins/DbEditorPP/src/main.cpp | 8 ++++---- plugins/DbEditorPP/src/options.cpp | 6 +++--- plugins/DbEditorPP/src/watchedvars.cpp | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'plugins/DbEditorPP/src') diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 6bbc0b84cc..e8bf749c18 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -168,7 +168,7 @@ extern int Mode; extern int Hex; extern int Order; -extern BOOL usePopUps; +extern BOOL usePopups; #define NAMEORDERCOUNT 8 diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 9dbef4d387..11641cc3bb 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -4,7 +4,7 @@ HINSTANCE hInst = NULL; HANDLE hTTBButt = NULL; BOOL bServiceMode = FALSE; -BOOL usePopUps; +BOOL usePopups; HWND hwnd2watchedVarsWindow; int hLangpack; BYTE nameOrder[NAMEORDERCOUNT]; @@ -85,7 +85,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam) } } // watch list - if (!hwnd2watchedVarsWindow && !usePopUps) return 0; + if (!hwnd2watchedVarsWindow && !usePopups) return 0; for (i=0; iszSetting, WatchListArray.item[i].setting)) { - if (usePopUps) + if (usePopups) popupWatchedVar(hContact, cws->szModule, cws->szSetting); if (hwnd2watchedVarsWindow) PopulateWatchedWindow(GetDlgItem(hwnd2watchedVarsWindow, IDC_VARS)); @@ -221,7 +221,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) db_free(&dbv); UnhookEvent(hModulesLoadedHook); - usePopUps = db_get_b(NULL,modname,"UsePopUps",0); + usePopups = db_get_b(NULL,modname,"UsePopups",0); // Load the name order for(i=0; i < NAMEORDERCOUNT; i++) diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index 17d69981d6..e877ae6411 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -14,7 +14,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) CheckDlgButton(hwnd,IDC_USEKNOWNMODS,db_get_b(NULL,modname,"UseKnownModList",0)); 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); + CheckDlgButton(hwnd,IDC_POPUPS,usePopups); if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ) SetDlgItemText(hwnd,IDC_MODULES,dbv.pszVal); db_free(&dbv); @@ -57,8 +57,8 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) db_set_b(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL)); db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU)); db_set_b(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS)); - usePopUps = IsDlgButtonChecked(hwnd,IDC_POPUPS); - db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopUps); + usePopups = IsDlgButtonChecked(hwnd,IDC_POPUPS); + db_set_b(NULL,modname,"UsePopups",(BYTE)usePopups); if (GetDlgItemText(hwnd,IDC_MODULES,mods,4096)) db_set_s(NULL,modname,"CoreModules",mods); db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0)); diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index 865029c358..fd11054e49 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -336,5 +336,5 @@ void popupWatchedVar(HANDLE hContact,const char* module,const char* setting) ppd.colorBack = colorBack; ppd.colorText = colorText; ppd.iSeconds = timeout ? timeout : -1; - PUAddPopUp(&ppd); + PUAddPopup(&ppd); } -- cgit v1.2.3