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/UserInfoEx/src/commonheaders.h | 2 +- plugins/UserInfoEx/src/dlg_msgbox.cpp | 6 +++--- plugins/UserInfoEx/src/init.cpp | 2 +- plugins/UserInfoEx/src/psp_options.cpp | 10 +++++----- plugins/UserInfoEx/src/svc_refreshci.cpp | 4 ++-- plugins/UserInfoEx/src/svc_reminder.cpp | 6 +++--- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'plugins/UserInfoEx') diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index 32d50e43c9..85cc866c83 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -174,7 +174,7 @@ typedef struct _MGLOBAL DWORD mirandaVersion; // mirandaVersion BYTE CanChangeDetails : 1; // is service to upload own contact information for icq present? BYTE TzIndexExist : 1; // Win Reg has Timzone Index Info - BYTE PopUpActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist + BYTE PopupActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist BYTE ShowPropsheetColours : 1; // cached SET_PROPSHEET_SHOWCOLOURS database value BYTE WantAeroAdaption : 1; // reserved for later use BYTE UseDbxTree : 1; // use dbx_tree ? diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 3cb45cd696..7ddcab2ac9 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -690,7 +690,7 @@ static LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP EndDialog(pmpd->hDialog, IDCANCEL); } } - PUDeletePopUp(hDlg); + PUDeletePopup(hDlg); } break; @@ -721,8 +721,8 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) // Shall the MessageBox displayed as popup? if (!(pMsgBox->uType & (MB_INFOBAR|MB_NOPOPUP)) && // message box can be a popup? ServiceExists(MS_POPUP_ADDPOPUPT) && // popups exist? - myGlobals.PopUpActionsExist == 1 && // popup support ext stuct? - (DB::Setting::GetDWord(NULL, "PopUp","Actions", 0) & 1) && // popup++ actions on? + myGlobals.PopupActionsExist == 1 && // popup support ext stuct? + (DB::Setting::GetDWord(NULL, "Popup","Actions", 0) & 1) && // popup++ actions on? DB::Setting::GetByte(SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX)) // user likes popups? return DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOXDUMMI), pMsgBox->hParent, MsgBoxPop, lParam); diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index ea02f62a8e..1d8966691f 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -69,7 +69,7 @@ static int OnTopToolBarLoaded(WPARAM wParam, LPARAM lParam) **/ static int OnModulesLoaded(WPARAM wParam, LPARAM lParam) { - myGlobals.PopUpActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); + myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS); // init meta contacts INT_PTR ptr = CallService(MS_MC_GETPROTOCOLNAME, 0, 0); diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 5ae5c14471..e47d87f5b6 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -954,11 +954,11 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR DBGetCheckBtn(hDlg, CHECK_OPT_POPUP_MSGBOX, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX); DBGetCheckBtn(hDlg, CHECK_OPT_POPUP_PROGRESS, "PopupProgress", FALSE); // disable if popup plugin dos not sopport buttons inside popop - if (!myGlobals.PopUpActionsExist) { + if (!myGlobals.PopupActionsExist) { EnableDlgItem(hDlg, CHECK_OPT_POPUP_MSGBOX, FALSE); EnableDlgItem(hDlg, CHECK_OPT_POPUP_PROGRESS, FALSE); } - else if (!(DB::Setting::GetDWord(0, "PopUp","Actions", 0) & 1)) { + else if (!(DB::Setting::GetDWord(0, "Popup","Actions", 0) & 1)) { EnableDlgItem(hDlg, CHECK_OPT_POPUP_MSGBOX, FALSE); } @@ -1102,7 +1102,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR ppd.colorBack = SendDlgItemMessage(hDlg, CLR_BBACK, CPM_GETCOLOUR, 0, 0); ppd.colorText = SendDlgItemMessage(hDlg, CLR_BTEXT, CPM_GETCOLOUR, 0, 0); } - PUAddPopUpT(&ppd); + PUAddPopupT(&ppd); // Anniversary mir_tcsncpy(ppd.lptzContactName, TranslateT("Anniversary"), SIZEOF(ppd.lptzContactName)); @@ -1119,7 +1119,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR ppd.colorBack = SendDlgItemMessage(hDlg, CLR_ABACK, CPM_GETCOLOUR, 0, 0); ppd.colorText = SendDlgItemMessage(hDlg, CLR_ATEXT, CPM_GETCOLOUR, 0, 0); } - PUAddPopUpT(&ppd); + PUAddPopupT(&ppd); } break; @@ -1272,7 +1272,7 @@ static int OnInitOptions(WPARAM wParam, LPARAM lParam) // Popups page if (ServiceExists(MS_POPUP_ADDPOPUPT)) { odp.pszTitle = MODNAME; - odp.pszGroup = LPGEN("PopUps"); + odp.pszGroup = LPGEN("Popups"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP); odp.pfnDlgProc = DlgProc_Popups; odp.flags = ODPF_BOLDGROUPS; diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index e2c5674a6f..1224c8f9ec 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -397,7 +397,7 @@ public: : CUpdProgress(data) { _szText = NULL; - _bBBCode = DB::Setting::GetByte("PopUp", "UseMText", FALSE); + _bBBCode = DB::Setting::GetByte("Popup", "UseMText", FALSE); _popupButtons[0].cbSize = sizeof(POPUPACTION); _popupButtons[0].flags = PAF_ENABLED; @@ -449,7 +449,7 @@ public: { if (_hWnd) { - PUDeletePopUp(_hWnd); + PUDeletePopup(_hWnd); _hWnd = NULL; } MIR_FREE(_szText); diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 390a1215c0..a52b513c3d 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -219,7 +219,7 @@ static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA { if (HIWORD(wParam) == STN_CLICKED) { - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return TRUE; } break; @@ -227,7 +227,7 @@ static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA case WM_CONTEXTMENU: { - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return TRUE; } } @@ -292,7 +292,7 @@ static int NotifyWithPopup(HANDLE hContact, CEvent::EType eventType, int DaysToA break; } } - return PUAddPopUpT(&ppd); + return PUAddPopupT(&ppd); } return 1; } -- cgit v1.2.3