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 --- protocols/AimOscar/src/popup.cpp | 4 ++-- protocols/FacebookRM/res/facebook.rc | 3 ++- protocols/FacebookRM/src/events.cpp | 8 ++++---- protocols/FacebookRM/src/proto.cpp | 2 +- protocols/GTalkExt/src/notifications.cpp | 4 ++-- protocols/GTalkExt/src/options.cpp | 2 +- protocols/Gadu-Gadu/src/popups.cpp | 4 ++-- protocols/IcqOscarJ/src/fam_03buddy.cpp | 2 +- protocols/IcqOscarJ/src/fam_04message.cpp | 2 +- protocols/IcqOscarJ/src/icq_opts.cpp | 6 +++--- protocols/IcqOscarJ/src/icq_popups.cpp | 20 ++++++++++---------- protocols/IcqOscarJ/src/icq_popups.h | 2 +- protocols/IcqOscarJ/src/icq_proto.h | 2 +- protocols/IcqOscarJ/src/init.cpp | 4 ++-- protocols/IcqOscarJ/src/log.cpp | 6 +++--- protocols/MRA/Mra_10.vcxproj | 4 ++-- protocols/MRA/Mra_10.vcxproj.filters | 4 ++-- protocols/MRA/Mra_11.vcxproj | 4 ++-- protocols/MRA/Mra_11.vcxproj.filters | 4 ++-- protocols/MRA/src/Mra.h | 2 +- protocols/MRA/src/MraAntiSpam.cpp | 14 +++++++------- protocols/MRA/src/MraPopUp.cpp | 14 +++++++------- protocols/MRA/src/Mra_functions.cpp | 2 +- protocols/MSN/src/msn_mail.cpp | 12 ++++++------ protocols/MSN/src/msn_misc.cpp | 4 ++-- protocols/MSN/src/msn_opts.cpp | 8 ++++---- protocols/Skype/src/skype_utils.cpp | 4 ++-- protocols/Tlen/src/jabber_opt.cpp | 2 +- protocols/Tlen/src/jabber_thread.cpp | 2 +- protocols/Twitter/src/connection.cpp | 2 +- protocols/Twitter/src/proto.cpp | 6 +++--- protocols/Twitter/src/ui.cpp | 2 +- protocols/WinPopup/src/messagebox.cpp | 2 +- protocols/Xfire/src/main.cpp | 16 ++++++++-------- protocols/Xfire/src/tools.cpp | 2 +- protocols/Yahoo/src/options.h | 2 +- protocols/Yahoo/src/util.cpp | 6 +++--- 37 files changed, 95 insertions(+), 94 deletions(-) (limited to 'protocols') diff --git a/protocols/AimOscar/src/popup.cpp b/protocols/AimOscar/src/popup.cpp index 96c2a936b4..2d9489c5ac 100644 --- a/protocols/AimOscar/src/popup.cpp +++ b/protocols/AimOscar/src/popup.cpp @@ -43,13 +43,13 @@ LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM if (p->url != NULL) ShellExecuteA(NULL, "open", p->url, NULL, NULL, SW_SHOW); - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return 0; } break; case WM_CONTEXTMENU: - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; case UM_FREEPLUGINDATA: diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc index 3cf23fd4c8..803a7f2103 100644 --- a/protocols/FacebookRM/res/facebook.rc +++ b/protocols/FacebookRM/res/facebook.rc @@ -267,7 +267,8 @@ END // // Generated from the TEXTINCLUDE 3 resource. // - + + ///////////////////////////////////////////////////////////////////////////// #endif // not APSTUDIO_INVOKED diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp index 7944090c1f..89a78842e6 100644 --- a/protocols/FacebookRM/src/events.cpp +++ b/protocols/FacebookRM/src/events.cpp @@ -48,17 +48,17 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa { case WM_COMMAND: { - //Get the plugin data (we need the PopUp service to do it) + //Get the plugin data (we need the Popup service to do it) popup_data *data = (popup_data *)PUGetPluginData(hwnd); if (data != NULL) data->proto->OpenUrl(data->url); // After a click, destroy popup - PUDeletePopUp(hwnd); + PUDeletePopup(hwnd); } break; case WM_CONTEXTMENU: - PUDeletePopUp(hwnd); + PUDeletePopup(hwnd); break; case UM_FREEPLUGINDATA: @@ -149,7 +149,7 @@ void FacebookProto::NotifyEvent(TCHAR* title, TCHAR* info, HANDLE contact, DWORD pd.PluginWindowProc = (WNDPROC)PopupDlgProc; lstrcpy(pd.lptzContactName, title); lstrcpy(pd.lptzText, info); - ret = PUAddPopUpT(&pd); + ret = PUAddPopupT(&pd); if (ret == 0) return; diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 110dc14377..c5ecfea06d 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -404,7 +404,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.position = 271830; if (ServiceExists(MS_POPUP_ADDPOPUPT)) - odp.ptszGroup = LPGENT("PopUps"); + odp.ptszGroup = LPGENT("Popups"); odp.ptszTab = LPGENT("Events"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS); odp.pfnDlgProc = FBEventsProc; diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp index 343112cca9..c128079ad3 100644 --- a/protocols/GTalkExt/src/notifications.cpp +++ b/protocols/GTalkExt/src/notifications.cpp @@ -70,7 +70,7 @@ LRESULT CALLBACK PopupProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) LPCSTR acc; if (MESSAGE_CLOSEPOPUP == msg) - PUDeletePopUp(wnd); + PUDeletePopup(wnd); switch (msg) { case UM_INITPOPUP: @@ -115,7 +115,7 @@ static bool DoAddPopup(POPUPDATAT *data) ShowWindow(handle, SW_RESTORE); } } - result = PUAddPopUpT(data) == 0; + result = PUAddPopupT(data) == 0; if (handle) DestroyWindow(handle); diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 1d2fb700d3..c780fb4f38 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -26,7 +26,7 @@ static const LPTSTR ACCOUNT_PROP_NAME = _T("{BF447EBA-27AE-4DB7-893C-FC42A3F74D75}"); static const LPTSTR DIALOG_INITIALIZED_PROP_NAME = _T("{5EE59FE5-679A-4A29-B0A1-03092E7AC20E}"); -static const LPTSTR POPUPS_OPTIONS_GROUP = LPGENT("PopUps"); +static const LPTSTR POPUPS_OPTIONS_GROUP = LPGENT("Popups"); static const LPTSTR NETWORK_OPTIONS_GROUP = LPGENT("Network"); static const LPSTR NOTIFY_SETTINGS_FROM_MOD_NAME = SHORT_PLUGIN_NAME ".NotifySettingsFromModName"; diff --git a/protocols/Gadu-Gadu/src/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp index fcd58ea3e9..9343f75bb5 100644 --- a/protocols/Gadu-Gadu/src/popups.cpp +++ b/protocols/Gadu-Gadu/src/popups.cpp @@ -43,12 +43,12 @@ LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar if (puData->flags & GG_POPUP_MULTILOGON) puData->gg->sessions_view(0, 0); } - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; } case WM_CONTEXTMENU: - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; case UM_FREEPLUGINDATA: diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp index 813a223306..97cbc22653 100644 --- a/protocols/IcqOscarJ/src/fam_03buddy.cpp +++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp @@ -572,7 +572,7 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info) icq_sendRemoveContact(dwUIN, NULL); AddToSpammerList(dwUIN); if (getSettingByte(NULL, "PopupsSpamEnabled", DEFAULT_SPAM_POPUPS_ENABLED)) - ShowPopUpMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM); + ShowPopupMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM); CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0); NetLog_Server("Contact %u deleted", dwUIN); diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp index 2a4766d1a8..ac3a7c9795 100644 --- a/protocols/IcqOscarJ/src/fam_04message.cpp +++ b/protocols/IcqOscarJ/src/fam_04message.cpp @@ -2959,7 +2959,7 @@ void CIcqProto::handleTypingNotification(BYTE *buf, WORD wLen, WORD wFlags, DWOR char *nick = NickFromHandleUtf(hContact); null_snprintf(szMsg, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" has closed the message window."), szFormat, MAX_PATH), nick); - ShowPopUpMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE); + ShowPopupMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE); SAFE_FREE((void**)&nick); NetLog_Server("%s has closed the message window.", strUID(dwUin, szUid)); diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index e43d1dc719..166f81ce79 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -31,7 +31,7 @@ #include -extern BOOL bPopUpService; +extern BOOL bPopupService; static const char* szLogLevelDescr[] = { LPGEN("Display all problems"), @@ -606,12 +606,12 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcIcqPrivacyOpts; Options_AddPage(wParam, &odp); - if (bPopUpService) { + if (bPopupService) { odp.position = 100000000; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.groupPosition = 900000000; odp.pfnDlgProc = DlgProcIcqPopupOpts; - odp.ptszGroup = LPGENT("PopUps"); + odp.ptszGroup = LPGENT("Popups"); odp.ptszTab = NULL; Options_AddPage(wParam, &odp); } diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp index e978f6e5af..bef035a294 100644 --- a/protocols/IcqOscarJ/src/icq_popups.cpp +++ b/protocols/IcqOscarJ/src/icq_popups.cpp @@ -24,12 +24,12 @@ // ----------------------------------------------------------------------------- // DESCRIPTION: // -// PopUp Plugin stuff +// Popup Plugin stuff // // ----------------------------------------------------------------------------- #include "icqoscar.h" -extern BOOL bPopUpService; +extern BOOL bPopupService; static const UINT icqPopupsControls[] = { IDC_POPUPS_LOG_ENABLED, IDC_POPUPS_SPAM_ENABLED, IDC_PREVIEW, IDC_USESYSICONS, IDC_POPUP_LOG0_TIMEOUT, @@ -102,11 +102,11 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR switch (LOWORD(wParam)) { case IDC_PREVIEW: { - ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"), LOG_NOTE); - ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING); - ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"), LOG_ERROR); - ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"), LOG_FATAL); - ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM); + ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"), LOG_NOTE); + ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING); + ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"), LOG_ERROR); + ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"), LOG_FATAL); + ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM); } return FALSE; @@ -200,9 +200,9 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR return FALSE; } -int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType) +int CIcqProto::ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType) { - if (bPopUpService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED)) + if (bPopupService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED)) { POPUPDATAT ppd = { 0 }; LPCTSTR rsIcon; @@ -284,7 +284,7 @@ int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *sz ppd.PluginWindowProc = NULL; ppd.PluginData = NULL; ppd.iSeconds = ppd.iSeconds; - return PUAddPopUpT(&ppd); + return PUAddPopupT(&ppd); } return -1; // Failure } diff --git a/protocols/IcqOscarJ/src/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h index 95e997a826..5214329cbd 100644 --- a/protocols/IcqOscarJ/src/icq_popups.h +++ b/protocols/IcqOscarJ/src/icq_popups.h @@ -24,7 +24,7 @@ // ----------------------------------------------------------------------------- // DESCRIPTION: // -// Headers for PopUp Plugin support +// Headers for Popup Plugin support // // ----------------------------------------------------------------------------- #ifndef __ICQ_POPUPS_H diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 561fe3e60b..81d15edf0e 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -553,7 +553,7 @@ struct CIcqProto : public PROTO_INTERFACE BOOL unpackUID(BYTE **ppBuf, WORD *pwLen, DWORD *pdwUIN, uid_str *ppszUID); //----| icq_popups.cpp |-------------------------------------------------------------- - int ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType); + int ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType); //----| icq_proto.cpp |-------------------------------------------------------------- void __cdecl CheekySearchThread( void* ); diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 017025ea03..58f71046f4 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -35,7 +35,7 @@ HINSTANCE hInst; int hLangpack; CLIST_INTERFACE *pcli; -BOOL bPopUpService = FALSE; +BOOL bPopupService = FALSE; HANDLE hExtraXStatus; @@ -91,7 +91,7 @@ IconItem g_IconsList[4] = int ModuleLoad(WPARAM wParam, LPARAM lParam) { - bPopUpService = ServiceExists(MS_POPUP_ADDPOPUP); + bPopupService = ServiceExists(MS_POPUP_ADDPOPUP); return 0; } diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp index 402863a456..881fe82cba 100644 --- a/protocols/IcqOscarJ/src/log.cpp +++ b/protocols/IcqOscarJ/src/log.cpp @@ -29,7 +29,7 @@ // ----------------------------------------------------------------------------- #include "icqoscar.h" -extern BOOL bPopUpService; +extern BOOL bPopupService; static const char *szLevelDescr[] = {LPGEN("ICQ Note"), LPGEN("ICQ Warning"), LPGEN("ICQ Error"), LPGEN("ICQ Fatal")}; @@ -46,9 +46,9 @@ void __cdecl CIcqProto::icq_LogMessageThread(void* arg) if (!err) return; - if (bPopUpService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED)) + if (bPopupService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED)) { - ShowPopUpMsg(NULL, err->szTitle, err->szMsg, err->bLevel); + ShowPopupMsg(NULL, err->szTitle, err->szMsg, err->bLevel); SAFE_FREE((void**)&err->szMsg); SAFE_FREE((void**)&err); diff --git a/protocols/MRA/Mra_10.vcxproj b/protocols/MRA/Mra_10.vcxproj index 9188457595..cc70c00144 100644 --- a/protocols/MRA/Mra_10.vcxproj +++ b/protocols/MRA/Mra_10.vcxproj @@ -204,7 +204,7 @@ - + @@ -223,7 +223,7 @@ - + diff --git a/protocols/MRA/Mra_10.vcxproj.filters b/protocols/MRA/Mra_10.vcxproj.filters index f53bbf5b56..ed7f4006e4 100644 --- a/protocols/MRA/Mra_10.vcxproj.filters +++ b/protocols/MRA/Mra_10.vcxproj.filters @@ -57,7 +57,7 @@ Source Files - + Source Files @@ -113,7 +113,7 @@ Header Files - + Header Files diff --git a/protocols/MRA/Mra_11.vcxproj b/protocols/MRA/Mra_11.vcxproj index bab448a697..10b1d70212 100644 --- a/protocols/MRA/Mra_11.vcxproj +++ b/protocols/MRA/Mra_11.vcxproj @@ -207,7 +207,7 @@ - + @@ -226,7 +226,7 @@ - + diff --git a/protocols/MRA/Mra_11.vcxproj.filters b/protocols/MRA/Mra_11.vcxproj.filters index f53bbf5b56..ed7f4006e4 100644 --- a/protocols/MRA/Mra_11.vcxproj.filters +++ b/protocols/MRA/Mra_11.vcxproj.filters @@ -57,7 +57,7 @@ Source Files - + Source Files @@ -113,7 +113,7 @@ Header Files - + Header Files diff --git a/protocols/MRA/src/Mra.h b/protocols/MRA/src/Mra.h index 0f1234d663..253dbfc9b3 100644 --- a/protocols/MRA/src/Mra.h +++ b/protocols/MRA/src/Mra.h @@ -143,7 +143,7 @@ extern GUI_DISPLAY_ITEM gdiExtraStatusIconsItems[]; #include "MraMRIMProxy.h" #include "MraSendQueue.h" #include "MraFilesQueue.h" -#include "MraPopUp.h" +#include "MraPopup.h" #include "MraAvatars.h" #include "MraIcons.h" #include "MraSelectEMail.h" diff --git a/protocols/MRA/src/MraAntiSpam.cpp b/protocols/MRA/src/MraAntiSpam.cpp index 0650dfe833..96cc711d9b 100644 --- a/protocols/MRA/src/MraAntiSpam.cpp +++ b/protocols/MRA/src/MraAntiSpam.cpp @@ -97,7 +97,7 @@ INT_PTR CALLBACK MraAntiSpamDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, L CHECK_DLG_BUTTON(hWndDlg, IDC_DELETE_SPAMBOT_CONTACT, ppro->mraGetByte(NULL, "AntiSpamDeteleSpamBotContacts", MRA_ANTISPAM_DEFAULT_DELETE_SPAMBOT_CONTACT)); CHECK_DLG_BUTTON(hWndDlg, IDC_CLN_NON_ALPHNUM, ppro->mraGetByte(NULL, "AntiSpamCleanNonAlphaNumeric", MRA_ANTISPAM_DEFAULT_CLN_NON_ALPHNUM)); SetDlgItemInt(hWndDlg, IDC_MAX_LANG_CHANGES, ppro->mraGetDword(NULL, "AntiSpamMaxLangChanges", MRA_ANTISPAM_DEFAULT_MAX_LNG_CHANGES), FALSE); - CHECK_DLG_BUTTON(hWndDlg, IDC_SHOWPOPUP, ppro->mraGetByte(NULL, "AntiSpamShowPopUp", MRA_ANTISPAM_DEFAULT_SHOWPOP)); + CHECK_DLG_BUTTON(hWndDlg, IDC_SHOWPOPUP, ppro->mraGetByte(NULL, "AntiSpamShowPopup", MRA_ANTISPAM_DEFAULT_SHOWPOP)); CHECK_DLG_BUTTON(hWndDlg, IDC_WRITETOSYSTEMHISTORY, ppro->mraGetByte(NULL, "AntiSpamWriteToSystemHistory", MRA_ANTISPAM_DEFAULT_WRITETOSYSTEMHISTORY)); CHECK_DLG_BUTTON(hWndDlg, IDC_SEND_SPAM_REPORT_TO_SERVER, ppro->mraGetByte(NULL, "AntiSpamSendSpamReportToSrv", MRA_ANTISPAM_DEFAULT_SEND_SPAM_REPORT_TO_SERVER)); { @@ -175,7 +175,7 @@ INT_PTR CALLBACK MraAntiSpamDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, L ppro->mraSetByte(NULL, "AntiSpamDeteleSpamBotContacts", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_DELETE_SPAMBOT_CONTACT)); ppro->mraSetByte(NULL, "AntiSpamCleanNonAlphaNumeric", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_CLN_NON_ALPHNUM)); ppro->mraSetDword(NULL, "AntiSpamMaxLangChanges", (DWORD)GetDlgItemInt(hWndDlg, IDC_MAX_LANG_CHANGES, NULL, FALSE)); - ppro->mraSetByte(NULL, "AntiSpamShowPopUp", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_SHOWPOPUP)); + ppro->mraSetByte(NULL, "AntiSpamShowPopup", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_SHOWPOPUP)); ppro->mraSetByte(NULL, "AntiSpamWriteToSystemHistory", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_WRITETOSYSTEMHISTORY)); ppro->mraSetByte(NULL, "AntiSpamSendSpamReportToSrv", IS_DLG_BUTTON_CHECKED(hWndDlg, IDC_SEND_SPAM_REPORT_TO_SERVER)); @@ -370,13 +370,13 @@ DWORD CMraProto::MraAntiSpamReceivedMessageW(LPSTR lpszEMail, size_t dwEMailSize dwRet = MESSAGE_NOT_SPAM; if (dwRet == MESSAGE_SPAM) { - BOOL bAntiSpamShowPopUp, bAntiSpamWriteToSystemHistory, bAntiSpamDeteleSpamBotContacts; + BOOL bAntiSpamShowPopup, bAntiSpamWriteToSystemHistory, bAntiSpamDeteleSpamBotContacts; - bAntiSpamShowPopUp = (BOOL)mraGetByte(NULL, "AntiSpamShowPopUp", MRA_ANTISPAM_DEFAULT_SHOWPOP); + bAntiSpamShowPopup = (BOOL)mraGetByte(NULL, "AntiSpamShowPopup", MRA_ANTISPAM_DEFAULT_SHOWPOP); bAntiSpamWriteToSystemHistory = (BOOL)mraGetByte(NULL, "AntiSpamWriteToSystemHistory", MRA_ANTISPAM_DEFAULT_WRITETOSYSTEMHISTORY); bAntiSpamDeteleSpamBotContacts = (BOOL)mraGetByte(NULL, "AntiSpamDeteleSpamBotContacts", MRA_ANTISPAM_DEFAULT_DELETE_SPAMBOT_CONTACT); - if (bAntiSpamShowPopUp || bAntiSpamWriteToSystemHistory) { + if (bAntiSpamShowPopup || bAntiSpamWriteToSystemHistory) { char szEMail[MAX_EMAIL_LEN]; WCHAR wszBuff[MRA_MAXLENOFMESSAGE*2]; size_t dwDBMessageSize; @@ -391,7 +391,7 @@ DWORD CMraProto::MraAntiSpamReceivedMessageW(LPSTR lpszEMail, size_t dwEMailSize (*((DWORD*)(wszBuff+dwDBMessageSize))) = 0; dwDBMessageSize += sizeof(DWORD); - if (bAntiSpamShowPopUp) + if (bAntiSpamShowPopup) MraPopupShowFromAgentW(MRA_POPUP_TYPE_INFORMATION, 0, wszBuff); if (bAntiSpamWriteToSystemHistory) { @@ -411,7 +411,7 @@ DWORD CMraProto::MraAntiSpamReceivedMessageW(LPSTR lpszEMail, size_t dwEMailSize if (hContact && bAntiSpamDeteleSpamBotContacts) { dwDBMessageSize = mir_sntprintf(wszBuff, SIZEOF(wszBuff), L"%s: %S", TranslateW(L"Spam bot contact deleted"), szEMail); - if (bAntiSpamShowPopUp) + if (bAntiSpamShowPopup) MraPopupShowFromAgentW(MRA_POPUP_TYPE_INFORMATION, 0, wszBuff); if (bAntiSpamWriteToSystemHistory) { diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index fb284c9114..0f301ade1c 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -1,5 +1,5 @@ #include "Mra.h" -#include "MraPopUp.h" +#include "MraPopup.h" #define POPUPS_TYPES_COUNT 7 static LPCWSTR lpcwszPopupsTypes[] = @@ -134,7 +134,7 @@ int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM lParam) odp.hInstance = masMraSettings.hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.pszTitle = m_szModuleName; - odp.pszGroup = LPGEN("PopUps"); + odp.pszGroup = LPGEN("Popups"); odp.groupPosition = 900000000; odp.flags = ODPF_BOLDGROUPS; odp.pfnDlgProc = MraPopupDlgProcOpts; @@ -161,7 +161,7 @@ void CALLBACK MraPopupThreadMarandaCallback(ULONG_PTR dwParam) if (dat->iPopupType == MRA_POPUP_TYPE_EMAIL_STATUS && dat->ppro->hWndEMailPopupStatus) PUChangeTextW(dat->ppro->hWndEMailPopupStatus, ((POPUPDATAW*)dwParam)->lpwzText); else - PUAddPopUpW((POPUPDATAW*)dwParam); + PUAddPopupW((POPUPDATAW*)dwParam); mir_free((void*)dwParam); } @@ -181,7 +181,7 @@ LRESULT CALLBACK MraPopupDlgProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM l // delete old email popup if (dat->ppro->hWndEMailPopupStatus) - PUDeletePopUp(dat->ppro->hWndEMailPopupStatus); + PUDeletePopup(dat->ppro->hWndEMailPopupStatus); dat->ppro->hWndEMailPopupStatus = hWndDlg; } @@ -194,13 +194,13 @@ LRESULT CALLBACK MraPopupDlgProc(HWND hWndDlg, UINT msg, WPARAM wParam, LPARAM l dat->ppro->hWndEMailPopupStatus = NULL; } } - PUDeletePopUp(hWndDlg); + PUDeletePopup(hWndDlg); break; case WM_CONTEXTMENU: if (dat->iPopupType == MRA_POPUP_TYPE_EMAIL_STATUS) dat->ppro->hWndEMailPopupStatus = NULL; - PUDeletePopUp(hWndDlg); + PUDeletePopup(hWndDlg); break; case UM_FREEPLUGINDATA: @@ -239,7 +239,7 @@ void CMraProto::MraPopupShowW(HANDLE hContact, DWORD dwType, DWORD dwFlags, LPWS //if ( ServiceExists(MS_POPUP2_SHOW) == FALSE)// yapp used if (dwType == MRA_POPUP_TYPE_EMAIL_STATUS && hWndEMailPopupStatus) { // delete old email popup - PUDeletePopUp(hWndEMailPopupStatus); + PUDeletePopup(hWndEMailPopupStatus); hWndEMailPopupStatus = NULL; } diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index 1d2c70fde8..6572e3307b 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -778,7 +778,7 @@ void CMraProto::MraUpdateEmailStatus(LPSTR lpszFrom, size_t dwFromSize, LPSTR lp if (mraGetByte(NULL, "IncrementalNewMailNotify", MRA_DEFAULT_INC_NEW_MAIL_NOTIFY)) { if (bTrayIconNewMailNotify) CallService(MS_CLIST_REMOVEEVENT, 0, (LPARAM)m_szModuleName); - PUDeletePopUp(hWndEMailPopupStatus); + PUDeletePopup(hWndEMailPopupStatus); hWndEMailPopupStatus = NULL; }else { mir_sntprintf(szStatusText, SIZEOF(szStatusText), TranslateW(L"No unread mail is available\r\nTotal messages: %lu"), dwEmailMessagesTotal); diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index cbd45e8f92..87d6dbebed 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -220,7 +220,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) TCHAR tBuffer2[512]; int UnreadMessages = mUnreadMessages; int UnreadJunkEmails = mUnreadJunkEmails; - bool ShowPopUp = isInitial; + bool ShowPopup = isInitial; MimeHeaders tFileInfo; tFileInfo.readFromBuffer(msgBody); @@ -277,7 +277,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) mir_sntprintf(tBuffer, SIZEOF(tBuffer), msgtxt, mimeFromW, Fromaddr); mir_free(mimeFromW); mir_free(mimeSubjectW); - ShowPopUp = true; + ShowPopup = true; } else { @@ -292,7 +292,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) if (UnreadMessages == mUnreadMessages && UnreadJunkEmails == mUnreadJunkEmails && !isInitial) return; - ShowPopUp &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0)); + ShowPopup &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0)); HANDLE hContact = MSN_HContactFromEmail(MyOptions.szEmail); if (hContact) @@ -300,7 +300,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); displayEmailCount(hContact); - if (ShowPopUp && !getByte("DisableHotmailTray", 1)) + if (ShowPopup && !getByte("DisableHotmailTray", 1)) { CLISTEVENT cle = {0}; @@ -321,7 +321,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) SendBroadcast(NULL, ACKTYPE_EMAIL, ACKRESULT_STATUS, NULL, 0); // Disable to notify receiving hotmail - if (ShowPopUp && !getByte("DisableHotmail", 0)) + if (ShowPopup && !getByte("DisableHotmail", 0)) { SkinPlaySound(mailsoundname); @@ -342,7 +342,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) szUrl); } - if (!getByte("RunMailerOnHotmail", 0) || !ShowPopUp || isInitial) + if (!getByte("RunMailerOnHotmail", 0) || !ShowPopup || isInitial) return; char mailerpath[MAX_PATH]; diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 9e110b8fd0..bf31569fd8 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -941,7 +941,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara else if (tData->url != NULL) CallService(MS_UTILS_OPENURL, 1, (LPARAM)tData->url); } - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; case WM_CONTEXTMENU: @@ -950,7 +950,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara if (hContact) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1); } - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; case UM_FREEPLUGINDATA: diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 644fddaa6e..37c9ec9db6 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -474,9 +474,9 @@ static INT_PTR CALLBACK DlgProcMsnConnOpts(HWND hwndDlg, UINT msg, WPARAM wParam } ///////////////////////////////////////////////////////////////////////////////////////// -// PopUp Options Dialog: style, position, color, font... +// Popup Options Dialog: style, position, color, font... -static INT_PTR CALLBACK DlgProcHotmailPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +static INT_PTR CALLBACK DlgProcHotmailPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { static bool bEnabled; @@ -717,7 +717,7 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Notifications"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY); - odp.pfnDlgProc = DlgProcHotmailPopUpOpts; + odp.pfnDlgProc = DlgProcHotmailPopupOpts; Options_AddPage(wParam, &odp); return 0; @@ -737,7 +737,7 @@ void CMsnProto::LoadOptions(void) { memset(&MyOptions, 0, sizeof(MyOptions)); - //PopUp Options + //Popup Options MyOptions.ManageServer = getByte("ManageServer", TRUE) != 0; MyOptions.ShowErrorsAsPopups = getByte("ShowErrorsAsPopups", TRUE) != 0; MyOptions.SlowSend = getByte("SlowSend", FALSE) != 0; diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index 69c99a37ec..0d171b9b17 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -368,7 +368,7 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag { if (::Miranda_Terminated()) return; - if ( !::ServiceExists(MS_POPUP_ADDPOPUPT) || !::db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1)) + if ( !::ServiceExists(MS_POPUP_ADDPOPUPT) || !::db_get_b(NULL, "Popup", "ModuleIsEnabled", 1)) ::MessageBoxW(NULL, message, caption, MB_OK | flags); else { @@ -381,7 +381,7 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag ::wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE); ppd.lchIcon = ::Skin_GetIcon("Skype_main"); - PUAddPopUpW(&ppd); + PUAddPopupW(&ppd); } } diff --git a/protocols/Tlen/src/jabber_opt.cpp b/protocols/Tlen/src/jabber_opt.cpp index fb0e68de1d..7201c3d2b5 100644 --- a/protocols/Tlen/src/jabber_opt.cpp +++ b/protocols/Tlen/src/jabber_opt.cpp @@ -587,7 +587,7 @@ static void MailPopupPreview(DWORD colorBack, DWORD colorText, char *title, char ppd.colorText = colorText; ppd.iSeconds = delay; if ( ServiceExists(MS_POPUP_ADDPOPUP)) - PUAddPopUp(&ppd); + PUAddPopup(&ppd); } static INT_PTR CALLBACK TlenPopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/jabber_thread.cpp index fa3022279a..fbf25a6de8 100644 --- a/protocols/Tlen/src/jabber_thread.cpp +++ b/protocols/Tlen/src/jabber_thread.cpp @@ -1140,7 +1140,7 @@ static void TlenMailPopup(TlenProtocol *proto, char *title, char *emailInfo) ppd.iSeconds = db_get_dw(NULL, proto->m_szModuleName, "MailPopupDelay", 4); else if (delayMode == 2) ppd.iSeconds = -1; - PUAddPopUp(&ppd); + PUAddPopup(&ppd); } /* * Incoming e-mail notification diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 0e39bdf63c..27c46541e3 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -554,7 +554,7 @@ void TwitterProto::ShowContactPopup(HANDLE hContact,const std::string &text) } mbcs_to_tcs(CP_UTF8,text.c_str(),popup.lptzText,MAX_SECONDLINE); - PUAddPopUpT(&popup); + PUAddPopupT(&popup); } void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg) diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index deeb0f88c7..105210bf4d 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -337,7 +337,7 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM) if(ServiceExists(MS_POPUP_ADDPOPUPT)) { - odp.ptszTab = LPGENT("PopUps"); + odp.ptszTab = LPGENT("Popups"); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS); odp.pfnDlgProc = popup_options_proc; Options_AddPage(wParam, &odp); @@ -433,7 +433,7 @@ void TwitterProto::ShowPopup(const wchar_t *text, int Error) } if(ServiceExists(MS_POPUP_ADDPOPUPT)) - PUAddPopUpT(&popup); + PUAddPopupT(&popup); else MessageBox(0,popup.lptzText,popup.lptzContactName,0); } @@ -450,7 +450,7 @@ void TwitterProto::ShowPopup(const char *text, int Error) } if(ServiceExists(MS_POPUP_ADDPOPUPT)) - PUAddPopUpT(&popup); + PUAddPopupT(&popup); else MessageBox(0,popup.lptzText,popup.lptzContactName,0); } diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index eb0a8b2543..4843d8c6e0 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -406,7 +406,7 @@ namespace popup_options popup.colorText = get_text_color(hwndDlg,false); popup.colorBack = get_back_color(hwndDlg,false); - PUAddPopUpT(&popup); + PUAddPopupT(&popup); } } diff --git a/protocols/WinPopup/src/messagebox.cpp b/protocols/WinPopup/src/messagebox.cpp index eb99d07d74..80ddd5471a 100644 --- a/protocols/WinPopup/src/messagebox.cpp +++ b/protocols/WinPopup/src/messagebox.cpp @@ -183,7 +183,7 @@ void GetErrorMessage (DWORD dwLastError, CString &msg) static void PopupOrMessageBox (LPPOPUPDATAT ppdp) { - if (CALLSERVICE_NOTFOUND == PUAddPopUpT (ppdp)) + if (CALLSERVICE_NOTFOUND == PUAddPopupT (ppdp)) { MSGBOXPARAMS mbp = { 0 }; mbp.cbSize = sizeof (MSGBOXPARAMS); diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index a0b336ffd6..06c431353f 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -2537,13 +2537,13 @@ void gamedetectiont(LPVOID lparam) if(disabledpopups) if(db_get_b(NULL,protocolname,"nopopups",0)) { - if(ServiceExists("PopUp/EnableDisableMenuCommand")) + if(ServiceExists("Popup/EnableDisableMenuCommand")) { - CallService("PopUp/EnableDisableMenuCommand",NULL,NULL); + CallService("Popup/EnableDisableMenuCommand",NULL,NULL); } - else if(ServiceExists("PopUp/ToggleEnabled")) + else if(ServiceExists("Popup/ToggleEnabled")) { - CallService("PopUp/ToggleEnabled",NULL,NULL); + CallService("Popup/ToggleEnabled",NULL,NULL); } disabledpopups=FALSE; } @@ -2677,15 +2677,15 @@ void gamedetectiont(LPVOID lparam) //popup abschalten, menuservice funk aufrufen if(db_get_b(NULL,protocolname,"nopopups",0)) { - if(ServiceExists("PopUp/EnableDisableMenuCommand")&&db_get_b(NULL,"PopUp","ModuleIsEnabled",0)==1) /**/ + if(ServiceExists("Popup/EnableDisableMenuCommand")&&db_get_b(NULL,"Popup","ModuleIsEnabled",0)==1) /**/ { disabledpopups=TRUE; - CallService("PopUp/EnableDisableMenuCommand",NULL,NULL); + CallService("Popup/EnableDisableMenuCommand",NULL,NULL); } - else if(ServiceExists("PopUp/ToggleEnabled")&&db_get_b(NULL,"YAPP","Enabled",0)==1) + else if(ServiceExists("Popup/ToggleEnabled")&&db_get_b(NULL,"YAPP","Enabled",0)==1) { disabledpopups=TRUE; - CallService("PopUp/ToggleEnabled",NULL,NULL); + CallService("Popup/ToggleEnabled",NULL,NULL); } } //sound abschalten diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 9dff6e4d61..77f63ac661 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -119,7 +119,7 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,HICON hi ppd.colorText = RGB(0,0,0); } - PUAddPopUp(&ppd); + PUAddPopup(&ppd); } return IDOK; diff --git a/protocols/Yahoo/src/options.h b/protocols/Yahoo/src/options.h index d707509ec8..8916ee2ed4 100644 --- a/protocols/Yahoo/src/options.h +++ b/protocols/Yahoo/src/options.h @@ -16,7 +16,7 @@ BOOL CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); BOOL CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); BOOL CALLBACK DlgProcYahooOptsIgnore(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -//BOOL CALLBACK DlgProcYahooPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +//BOOL CALLBACK DlgProcYahooPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); int YahooOptInit(WPARAM wParam,LPARAM lParam); #endif diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index 0a02e6b498..a022d3e598 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -206,14 +206,14 @@ static LRESULT CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, if (szURL != NULL) CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szURL); - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return 0; } break; case WM_CONTEXTMENU: DebugLog("[PopupWindowProc] WM_CONTEXTMENU"); - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return TRUE; case UM_FREEPLUGINDATA: @@ -248,7 +248,7 @@ int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char * DebugLog("[MS_POPUP_ADDPOPUP] Generating a popup for [%S] %S", nickname, msg); - PUAddPopUpT(&ppd); + PUAddPopupT(&ppd); return 1; } -- cgit v1.2.3