"PopUp" everywhere was replaced to "Popup"

git-svn-id: http://svn.miranda-ng.org/main/trunk@4730 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

8 files changed, 24 insertions, 24 deletions

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 @@
     <ClCompile Include="src\MraMPop.cpp" />

     <ClCompile Include="src\MraMRIMProxy.cpp" />

     <ClCompile Include="src\MraOfflineMsg.cpp" />

-    <ClCompile Include="src\MraPopUp.cpp" />

+    <ClCompile Include="src\MraPopup.cpp" />

     <ClCompile Include="src\MraRTFMsg.cpp" />

     <ClCompile Include="src\MraSelectEMail.cpp" />

     <ClCompile Include="src\MraSendCommand.cpp" />

@@ -223,7 +223,7 @@
     <ClInclude Include="src\MraMRIMProxy.h" />

     <ClInclude Include="src\MraOfflineMsg.h" />

     <ClInclude Include="src\MraPlaces.h" />

-    <ClInclude Include="src\MraPopUp.h" />

+    <ClInclude Include="src\MraPopup.h" />

     <ClInclude Include="src\MraProto.h" />

     <ClInclude Include="src\MraRTFMsg.h" />

     <ClInclude Include="src\MraSelectEMail.h" />

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 @@
     <ClCompile Include="src\MraOfflineMsg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\MraPopUp.cpp">

+    <ClCompile Include="src\MraPopup.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\MraRTFMsg.cpp">

@@ -113,7 +113,7 @@
     <ClInclude Include="src\MraPlaces.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\MraPopUp.h">

+    <ClInclude Include="src\MraPopup.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\MraRTFMsg.h">

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 @@
     <ClCompile Include="src\MraMPop.cpp" />

     <ClCompile Include="src\MraMRIMProxy.cpp" />

     <ClCompile Include="src\MraOfflineMsg.cpp" />

-    <ClCompile Include="src\MraPopUp.cpp" />

+    <ClCompile Include="src\MraPopup.cpp" />

     <ClCompile Include="src\MraRTFMsg.cpp" />

     <ClCompile Include="src\MraSelectEMail.cpp" />

     <ClCompile Include="src\MraSendCommand.cpp" />

@@ -226,7 +226,7 @@
     <ClInclude Include="src\MraMRIMProxy.h" />

     <ClInclude Include="src\MraOfflineMsg.h" />

     <ClInclude Include="src\MraPlaces.h" />

-    <ClInclude Include="src\MraPopUp.h" />

+    <ClInclude Include="src\MraPopup.h" />

     <ClInclude Include="src\MraProto.h" />

     <ClInclude Include="src\MraRTFMsg.h" />

     <ClInclude Include="src\MraSelectEMail.h" />

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 @@
     <ClCompile Include="src\MraOfflineMsg.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="src\MraPopUp.cpp">

+    <ClCompile Include="src\MraPopup.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="src\MraRTFMsg.cpp">

@@ -113,7 +113,7 @@
     <ClInclude Include="src\MraPlaces.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="src\MraPopUp.h">

+    <ClInclude Include="src\MraPopup.h">

       <Filter>Header Files</Filter>

     </ClInclude>

     <ClInclude Include="src\MraRTFMsg.h">

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);