"PopUp" everywhere was replaced to "Popup"

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

4 files changed, 13 insertions, 13 deletions

diff --git a/plugins/NewEventNotify/src/main.cpp b/plugins/NewEventNotify/src/main.cpp
index b690c55478..82e282302c 100644
--- a/plugins/NewEventNotify/src/main.cpp
+++ b/plugins/NewEventNotify/src/main.cpp
@@ -26,7 +26,7 @@
 

 int g_IsSrmmServiceAvail = 0;

 int g_IsSrmmWindowAPI = 0;

-extern PLUGIN_DATA* PopUpList[20];

+extern PLUGIN_DATA* PopupList[20];

 

 //---------------------------

 //---Some global variables for the plugin

@@ -100,7 +100,7 @@ int HookedNewEvent(WPARAM wParam, LPARAM lParam)
 	{

 		if (pluginOptions.bHideSend && NumberPopupData(hContact, EVENTTYPE_MESSAGE) != -1)

 		{ // JK, only message event, do not influence others

-			pdata = PopUpList[NumberPopupData(hContact, EVENTTYPE_MESSAGE)];

+			pdata = PopupList[NumberPopupData(hContact, EVENTTYPE_MESSAGE)];

 			PopupAct(pdata->hWnd, MASK_DISMISS, pdata); // JK, only dismiss, i.e. do not kill event (e.g. file transfer)

 		}		

 		return 0; 

diff --git a/plugins/NewEventNotify/src/menuitem.cpp b/plugins/NewEventNotify/src/menuitem.cpp
index e1745df966..f23cfb3557 100644
--- a/plugins/NewEventNotify/src/menuitem.cpp
+++ b/plugins/NewEventNotify/src/menuitem.cpp
@@ -58,7 +58,7 @@ int MenuitemInit(BOOL bStatus)
 	CLISTMENUITEM mi = { sizeof(mi) };

 	mi.position = 1;

 	mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_ENABLED));

-	mi.ptszPopupName = TranslateT("PopUps");

+	mi.ptszPopupName = TranslateT("Popups");

 	mi.pszService = MS_NEN_MENUNOTIFY;

 	mi.flags = CMIF_KEEPUNTRANSLATED | CMIF_TCHAR;

 	hMenuitemNotify = Menu_AddMainMenuItem(&mi);

diff --git a/plugins/NewEventNotify/src/options.cpp b/plugins/NewEventNotify/src/options.cpp
index 2bbe91f843..291eaa444d 100644
--- a/plugins/NewEventNotify/src/options.cpp
+++ b/plugins/NewEventNotify/src/options.cpp
@@ -55,7 +55,7 @@ int OptionsRead(void)
   options->iDelayUrl = (int)db_get_dw(NULL, MODULE, OPT_DELAY_URL, DEFAULT_DELAY);

   options->iDelayFile = (int)db_get_dw(NULL, MODULE, OPT_DELAY_FILE, DEFAULT_DELAY);

   options->iDelayOthers = (int)db_get_dw(NULL, MODULE, OPT_DELAY_OTHERS, DEFAULT_DELAY);

-  options->iDelayDefault = (int)DBGetContactSettingRangedWord(NULL, "PopUp", "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);

+  options->iDelayDefault = (int)DBGetContactSettingRangedWord(NULL, "Popup", "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);

   options->bShowDate = db_get_b(NULL, MODULE, OPT_SHOW_DATE, TRUE);

   options->bShowTime = db_get_b(NULL, MODULE, OPT_SHOW_TIME, TRUE);

   options->bShowHeaders = db_get_b(NULL, MODULE, OPT_SHOW_HEADERS, TRUE);

@@ -301,7 +301,7 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)
 		odp.hInstance = hInst;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT);

 		odp.pszTitle = LPGEN("Event Notify");

-		odp.pszGroup = LPGEN("PopUps");

+		odp.pszGroup = LPGEN("Popups");

 		odp.flags = ODPF_BOLDGROUPS;

 		odp.pfnDlgProc = OptionsDlgProc;

 		Options_AddPage( addInfo, &odp);

diff --git a/plugins/NewEventNotify/src/popup.cpp b/plugins/NewEventNotify/src/popup.cpp
index 3dd32db00d..b98b4f969e 100644
--- a/plugins/NewEventNotify/src/popup.cpp
+++ b/plugins/NewEventNotify/src/popup.cpp
@@ -28,15 +28,15 @@ extern int g_IsServiceAvail;
 

 static int PopupCount = 0;

 

-PLUGIN_DATA* PopUpList[MAX_POPUPS];

+PLUGIN_DATA* PopupList[MAX_POPUPS];

 

 int NumberPopupData(HANDLE hContact, int eventType)

 {

 	for (int n=0; n < MAX_POPUPS; n++) {

-		if (!PopUpList[n] && !hContact && eventType == -1)

+		if (!PopupList[n] && !hContact && eventType == -1)

 			return n;

 

-		if (PopUpList[n] && (PopUpList[n]->hContact == hContact) && (PopUpList[n]->iLock == 0) && (eventType == -1 || PopUpList[n]->eventType == (UINT)eventType))

+		if (PopupList[n] && (PopupList[n]->hContact == hContact) && (PopupList[n]->iLock == 0) && (eventType == -1 || PopupList[n]->eventType == (UINT)eventType))

 			return n;

 	}

 	return -1;

@@ -45,7 +45,7 @@ int NumberPopupData(HANDLE hContact, int eventType)
 static int FindPopupData(PLUGIN_DATA* pdata)

 {

 	for (int n=0; n < MAX_POPUPS; n++)

-		if (PopUpList[n] == pdata) 

+		if (PopupList[n] == pdata) 

 			return n;

 

 	return -1;

@@ -69,7 +69,7 @@ static void FreePopupEventData(PLUGIN_DATA* pdata)
 	pdata->lastEventData = pdata->firstEventData = pdata->firstShowEventData = NULL;

 	// remove from popup list if present

 	if (FindPopupData(pdata) != -1)

-		PopUpList[FindPopupData(pdata)] = NULL;

+		PopupList[FindPopupData(pdata)] = NULL;

 }

 

 int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATA* pdata)

@@ -119,7 +119,7 @@ int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATA* pdata)
 	if (mask & MASK_DISMISS) {

 		KillTimer(hWnd, TIMER_TO_ACTION);

 		FreePopupEventData(pdata);

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 	}

 

 	return 0;

@@ -488,7 +488,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 

 	PopupCount++;

 

-	PopUpList[NumberPopupData(NULL, -1)] = pdata;

+	PopupList[NumberPopupData(NULL, -1)] = pdata;

 	// send data to popup plugin

 

 	if (ServiceExists(MS_POPUP_ADDPOPUPT))

@@ -516,7 +516,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 	int doReverse = 0;

 

 	// merge only message popups

-	pdata = (PLUGIN_DATA*)PopUpList[NumberPopupData(hContact, EVENTTYPE_MESSAGE)];

+	pdata = (PLUGIN_DATA*)PopupList[NumberPopupData(hContact, EVENTTYPE_MESSAGE)];

 

 	if (hEvent) {

 		pdata->countEvent++;