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/Weather/src/weather.h | 2 +- plugins/Weather/src/weather_contacts.cpp | 4 ++-- plugins/Weather/src/weather_opt.cpp | 12 ++++++------ plugins/Weather/src/weather_popup.cpp | 14 +++++++------- plugins/Weather/src/weather_svcs.cpp | 4 ++-- plugins/Weather/src/weather_update.cpp | 2 +- 6 files changed, 19 insertions(+), 19 deletions(-) (limited to 'plugins/Weather/src') diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h index 84d1b2b888..b60a90559a 100644 --- a/plugins/Weather/src/weather.h +++ b/plugins/Weather/src/weather.h @@ -476,7 +476,7 @@ void RemoveIconSettings(); BOOL CALLBACK TextOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); BOOL CALLBACK AdvOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam); INT_PTR CALLBACK DlgProcText(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -INT_PTR CALLBACK DlgPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +INT_PTR CALLBACK DlgPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); // functions in weather_popup.c int WeatherPopup(WPARAM wParam, LPARAM lParam); diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 2cc4187bf1..c8b50a49a2 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -202,7 +202,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE), (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External)); // other checkbox options - CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE)); + CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopup", FALSE)); CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE)); CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0)); @@ -389,7 +389,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa db_set_b(hContact, WEATHERPROTONAME, "History", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Internal)); db_set_b(hContact, WEATHERPROTONAME, "Overwrite", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Overwrite)); db_set_b(hContact, WEATHERPROTONAME, "File", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External)); - db_set_b(hContact, WEATHERPROTONAME, "DPopUp", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop)); + db_set_b(hContact, WEATHERPROTONAME, "DPopup", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop)); db_set_b(hContact, WEATHERPROTONAME, "DAutoUpdate", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DAutoUpdate)); // re-enable the protocol and update the data for the station diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 6a3e7a00da..b1fdff274b 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -185,10 +185,10 @@ void LoadOptions(void) // advanced opt.DisCondIcon = db_get_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", false); // popup options - opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopUp", true); + opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopup", true); opt.UpdatePopup = db_get_b(NULL, WEATHERPROTONAME, "UpdatePopup", true); opt.AlertPopup = db_get_b(NULL, WEATHERPROTONAME, "AlertPopup", true); - opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopUpOnChange", true); + opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopupOnChange", true); opt.ShowWarnings = db_get_b(NULL, WEATHERPROTONAME, "ShowWarnings", true); // popup colors opt.BGColour = db_get_dw(NULL, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE)); @@ -254,10 +254,10 @@ void SaveOptions(void) // advanced db_set_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon); // popup options - db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup); + db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup); db_set_b(NULL, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup); db_set_b(NULL, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup); - db_set_b(NULL, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange); + db_set_b(NULL, WEATHERPROTONAME, "PopupOnChange", (BYTE)opt.PopupOnChange); db_set_b(NULL, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings); // popup colors db_set_dw(NULL, WEATHERPROTONAME, "BackgroundColour", opt.BGColour); @@ -304,10 +304,10 @@ int OptInit(WPARAM wParam,LPARAM lParam) { if (( ServiceExists(MS_POPUP_ADDPOPUPT))) { odp.position = 100000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP); - odp.ptszGroup = LPGENT("PopUps"); + odp.ptszGroup = LPGENT("Popups"); odp.groupPosition = 910000000; odp.ptszTab = NULL; - odp.pfnDlgProc = DlgPopUpOpts; + odp.pfnDlgProc = DlgPopupOpts; Options_AddPage(wParam, &odp); } diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index 2a3e3580e5..0ad926e5a1 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -36,7 +36,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam) { // determine if the popup should display or not if (opt.UsePopup && opt.UpdatePopup && (!opt.PopupOnChange || (BOOL)lParam) && - !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopUp", 0)) + !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopup", 0)) { POPUPDATAT ppd = {0}; WEATHERINFO winfo; @@ -59,7 +59,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam) ppd.colorBack = (opt.UseWinColors)?GetSysColor(COLOR_BTNFACE):opt.BGColour; ppd.colorText = (opt.UseWinColors)?GetSysColor(COLOR_WINDOWTEXT):opt.TextColour; ppd.iSeconds = opt.pDelay; - PUAddPopUpT( &ppd ); + PUAddPopupT( &ppd ); } return 0; } @@ -105,7 +105,7 @@ int WeatherError(WPARAM wParam, LPARAM lParam) ppd.colorBack = (opt.UseWinColors)?GetSysColor(COLOR_BTNFACE):opt.BGColour; ppd.colorText = (opt.UseWinColors)?GetSysColor(COLOR_WINDOWTEXT):opt.TextColour; ppd.iSeconds = opt.pDelay; - PUAddPopUpT( &ppd ); + PUAddPopupT( &ppd ); } return 0; } @@ -135,13 +135,13 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa switch(message) { case WM_COMMAND: ID = opt.LeftClickAction; - if (ID != IDM_M7) PUDeletePopUp(hWnd); + if (ID != IDM_M7) PUDeletePopup(hWnd); SendMessage(hPopupWindow, ID, (WPARAM)hContact, 0); return TRUE; case WM_CONTEXTMENU: ID = opt.RightClickAction; - if (ID != IDM_M7) PUDeletePopUp(hWnd); + if (ID != IDM_M7) PUDeletePopup(hWnd); SendMessage(hPopupWindow, ID, (WPARAM)hContact, 0); return TRUE; @@ -250,7 +250,7 @@ void ReadPopupOpt(HWND hdlg) } // copied and modified from NewStatusNotify -INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) +INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) { int ID; TCHAR str[512]; @@ -375,7 +375,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) break; case IDC_PD1: - // Popup delay setting from PopUp plugin + // Popup delay setting from Popup plugin SetDlgItemText(hdlg, IDC_DELAY, _T("0")); CheckRadioButton(hdlg, IDC_PD1, IDC_PD3, IDC_PD1); break; diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index 0185b78072..34e026b0d5 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -250,7 +250,7 @@ void UpdatePopupMenu(BOOL State) { // update option setting opt.UsePopup = State; - db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup); + db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup); CLISTMENUITEM mi = { sizeof(mi) }; if (State) @@ -371,7 +371,7 @@ void AddMenuItems(void) mi.pszName = LPGEN("Weather Notification"); mi.icolibItem = GetIconHandle("popup"); mi.position = 0; - mi.pszPopupName = LPGEN("PopUps"); + mi.pszPopupName = LPGEN("Popups"); mi.pszService = WEATHERPROTONAME "/PopupMenu"; hEnableDisablePopupMenu = Menu_AddMainMenuItem(&mi); UpdatePopupMenu(opt.UsePopup); diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index a6cee642ff..95777c3fd5 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -102,7 +102,7 @@ int UpdateWeather(HANDLE hContact) // have weather alert issued? dbres = db_get_ts(hContact, WEATHERCONDITION, "Alert", &dbv); if ( !dbres && dbv.ptszVal[0] != 0) { - if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopUp", 0) && Ch) { + if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopup", 0) && Ch) { // display alert popup wsprintf(str, _T("Alert for %s%c%s"), winfo.city, 255, dbv.ptszVal); WPShowMessage(str, SM_WEATHERALERT); -- cgit v1.2.3