"PopUp" everywhere was replaced to "Popup"

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

11 files changed, 38 insertions, 33 deletions

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index 81ce3559ca..99ec5177f8 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -144,7 +144,7 @@ static void __stdcall ShowRoomFromPopup(void * pi)
 static void TSAPI Chat_OpenPopup(SESSION_INFO* si, HWND hwndPopup)

 {

 	CallFunctionAsync(ShowRoomFromPopup, si);

-	PUDeletePopUp(hwndPopup);

+	PUDeletePopup(hwndPopup);

 }

 

 static void TSAPI Chat_DismissPopup(const SESSION_INFO* si, HWND hwndPopup)

@@ -156,7 +156,7 @@ static void TSAPI Chat_DismissPopup(const SESSION_INFO* si, HWND hwndPopup)
 	if (si->hWnd && KillTimer(si->hWnd, TIMERID_FLASHWND))

 		FlashWindow(si->hWnd, FALSE);

 

-	PUDeletePopUp(hwndPopup);

+	PUDeletePopup(hwndPopup);

 }

 

 static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)

@@ -226,7 +226,7 @@ static int ShowPopup(HANDLE hContact, SESSION_INFO* si, HICON hIcon,  char* pszP
 

 	pd.PluginWindowProc = (WNDPROC)PopupDlgProc;

 	pd.PluginData = si;

-	return PUAddPopUpT(&pd);

+	return PUAddPopupT(&pd);

 }

 

 static BOOL DoTrayIcon(SESSION_INFO* si, GCEVENT * gce)

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 76c525af53..68e8f0b421 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -111,7 +111,7 @@ int TSAPI NEN_ReadOptions(NEN_OPTIONS *options)
 	options->iDelayMsg = (int)M->GetDword(MODULE, OPT_DELAY_MESSAGE, (DWORD)DEFAULT_DELAY);

 	options->iDelayOthers = (int)M->GetDword(MODULE, OPT_DELAY_OTHERS, (DWORD)DEFAULT_DELAY);

 	options->iDelayErr = (int)M->GetDword(MODULE, OPT_DELAY_ERR, (DWORD)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->bShowHeaders = (BYTE)M->GetByte(MODULE, OPT_SHOW_HEADERS, FALSE);

 	options->bNoRSS = (BOOL)M->GetByte(MODULE, OPT_NORSS, FALSE);

 	options->iDisable = (BYTE)M->GetByte(MODULE, OPT_DISABLE, 0);

@@ -438,7 +438,7 @@ static int PopupAct(HWND hWnd, UINT mask, PLUGIN_DATAT* pdata)
 	}

 	if (mask & MASK_DISMISS)

 	{

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 		if (pdata->hContainer)

 		{

 			FLASHWINFO fwi;

@@ -724,7 +724,7 @@ static int PopupShowT(NEN_OPTIONS *pluginOptions, HANDLE hContact, HANDLE hEvent
 	pdata->nrMerged = 1;

 

 	// fix for broken popups -- process failures

-	if ( PUAddPopUpT(&pud) < 0) {

+	if ( PUAddPopupT(&pud) < 0) {

 		mir_free(pdata->eventData);

 		mir_free(pdata);

 	}

@@ -926,6 +926,6 @@ void TSAPI DeletePopupsForContact(HANDLE hContact, DWORD dwMask)
 	while ((_T = const_cast<PLUGIN_DATAT *>(PU_GetByContact(hContact))) != 0) {

 		_T->hContact = 0;									// make sure, it never "comes back"

 		if (_T->hWnd != 0 && IsWindow(_T->hWnd))

-			PUDeletePopUp(_T->hWnd);

+			PUDeletePopup(_T->hWnd);

 	}

 }

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 3193b37a21..b3f2e212f2 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -510,7 +510,10 @@ void TSAPI UpdateStatusBar(const TWindowData *dat)
 {

 	if (dat && dat->pContainer->hwndStatus && dat->pContainer->hwndActive == dat->hwnd) {

 		if (dat->bType == SESSIONTYPE_IM) {

-			if (dat->szStatusBar[0]) {

+			/*if (dat->szStatusBarCustom[0]) {

+				SendMessage(dat->pContainer->hwndStatus, SB_SETICON, 0, 0);

+				SendMessage(dat->pContainer->hwndStatus, SB_SETTEXT, 0, (LPARAM)dat->szStatusBarCustom);

+			} else*/ if (dat->szStatusBar[0]) {

 				SendMessage(dat->pContainer->hwndStatus, SB_SETICON, 0, (LPARAM)PluginConfig.g_buttonBarIcons[ICON_DEFAULT_TYPING]);

 				SendMessage(dat->pContainer->hwndStatus, SB_SETTEXT, 0, (LPARAM)dat->szStatusBar);

 			}

diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index f7367f58d6..4206a0c6ad 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1305,7 +1305,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam)
 	if (ServiceExists(MS_POPUP_ADDPOPUP)) {

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPT);

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

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

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

 		odp.pfnDlgProc  = DlgProcPopupOpts;

 		Options_AddPage(wParam, &odp);

 	}

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index 1e37931afa..d83b9ac409 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -161,6 +161,7 @@ static INT_PTR SetStatusText(WPARAM wParam, LPARAM lParam)
 			return 1;

 	}

 

+	SendMessage(pContainer->hwndStatus, SB_SETICON, 0, 0);

 	SendMessage(pContainer->hwndStatus, SB_SETTEXT, 0, lParam);

 	return 0;

 }

diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h
index 34f6e27f3e..8932d182f4 100644
--- a/plugins/TabSRMM/src/msgs.h
+++ b/plugins/TabSRMM/src/msgs.h
@@ -262,6 +262,7 @@ struct TWindowData
    char   *szProto;

    TCHAR   szMyNickname[130];

    TCHAR   szStatusBar[100];

+   TCHAR   szStatusBarCustom[100];

    TCHAR   newtitle[130];        // tab title...

    TCHAR   szStatus[50];

    WORD    wStatus;

diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp
index 9132ad10bd..98a16d5ce4 100644
--- a/plugins/TabSRMM/src/sendlater.cpp
+++ b/plugins/TabSRMM/src/sendlater.cpp
@@ -160,7 +160,7 @@ CSendLaterJob::~CSendLaterJob()
 				ppd.lchIcon = fFailed ? PluginConfig.g_iconErr : PluginConfig.g_IconMsgEvent;

 				ppd.PluginData = (void*)hContact;

 				ppd.iSeconds = fFailed ? -1 : nen_options.iDelayMsg;

-				PUAddPopUpT(&ppd);

+				PUAddPopupT(&ppd);

 			}

 		}

 		if (fFailed && (bCode == JOB_AGE || bCode == JOB_REMOVABLE) && szId[0] == 'S')

diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp
index d4a3941f7b..95b864f06d 100644
--- a/plugins/TabSRMM/src/sendqueue.cpp
+++ b/plugins/TabSRMM/src/sendqueue.cpp
@@ -634,7 +634,7 @@ void SendQueue::NotifyDeliveryFailure(const TWindowData *dat)
 	ppd.lchIcon = PluginConfig.g_iconErr;

 	ppd.PluginData = (void*)dat->hContact;

 	ppd.iSeconds = (int)M->GetDword(MODULE, OPT_DELAY_ERR, (DWORD)DEFAULT_DELAY);

-	PUAddPopUpT(&ppd);

+	PUAddPopupT(&ppd);

 }

 

 /*

diff --git a/plugins/TabSRMM/src/typingnotify.cpp b/plugins/TabSRMM/src/typingnotify.cpp
index 1b13fb3fea..81e55921f3 100644
--- a/plugins/TabSRMM/src/typingnotify.cpp
+++ b/plugins/TabSRMM/src/typingnotify.cpp
@@ -4,9 +4,9 @@ HANDLE hTypingNotify;
 

 static HGENMENU hDisableMenu = NULL;

 

-static HANDLE hPopUpsList = NULL;

+static HANDLE hPopupsList = NULL;

 

-static BYTE   OnePopUp;

+static BYTE   OnePopup;

 static BYTE   ShowMenu;

 static BYTE   StartDisabled;

 static BYTE   StopDisabled;

@@ -69,21 +69,21 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 	case WM_COMMAND:

 		if (HIWORD(wParam) == STN_CLICKED) {

 			CallService(MS_MSG_SENDMESSAGE "W", (WPARAM)PUGetContact(hWnd), 0);

-			PUDeletePopUp(hWnd);

+			PUDeletePopup(hWnd);

 			return 1;

 		}

 		break;

 

 	case WM_CONTEXTMENU:

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 		return 1;

 

 	case UM_INITPOPUP: 

-		WindowList_Add(hPopUpsList, hWnd, PUGetContact(hWnd));

+		WindowList_Add(hPopupsList, hWnd, PUGetContact(hWnd));

 		return 1;

 

 	case UM_FREEPLUGINDATA:

-		WindowList_Remove(hPopUpsList, hWnd);

+		WindowList_Remove(hPopupsList, hWnd);

 		return 1;

 	}

 	return DefWindowProc(hWnd, message, wParam, lParam);

@@ -100,11 +100,11 @@ void TN_TypingMessage(HANDLE hContact, int iMode)
 

 	TCHAR *szContactName = (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, WPARAM(hContact), GSMDF_TCHAR);

 

-	if (OnePopUp) {

-		HWND hPopUpWnd = WindowList_Find(hPopUpsList, hContact);

-		while (hPopUpWnd) {

-			PUDeletePopUp(hPopUpWnd);

-			hPopUpWnd = WindowList_Find(hPopUpsList, hContact);

+	if (OnePopup) {

+		HWND hPopupWnd = WindowList_Find(hPopupsList, hContact);

+		while (hPopupWnd) {

+			PUDeletePopup(hPopupWnd);

+			hPopupWnd = WindowList_Find(hPopupsList, hContact);

 		}

 	}

 

@@ -222,7 +222,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 		CheckDlgButton(hwndDlg, IDC_START, (StartDisabled) ? BST_UNCHECKED : BST_CHECKED);

 		CheckDlgButton(hwndDlg, IDC_STOP, (StopDisabled) ? BST_UNCHECKED : BST_CHECKED);

 

-		CheckDlgButton(hwndDlg, IDC_ONEPOPUP, (OnePopUp) ? BST_CHECKED : BST_UNCHECKED);

+		CheckDlgButton(hwndDlg, IDC_ONEPOPUP, (OnePopup) ? BST_CHECKED : BST_UNCHECKED);

 		CheckDlgButton(hwndDlg, IDC_SHOWMENU, (ShowMenu) ? BST_CHECKED : BST_UNCHECKED);

 

 		Utils::enableDlgControl(hwndDlg, IDC_ONEPOPUP, PluginConfig.g_PopupAvail);

@@ -366,7 +366,7 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 						ppd.lchContact = (HANDLE) wParam;

 						ppd.PluginWindowProc = NULL;

 						ppd.PluginData = NULL;

-						PUAddPopUpT(&ppd);

+						PUAddPopupT(&ppd);

 					}

 				}

 				break;

@@ -482,10 +482,10 @@ static INT_PTR CALLBACK DlgProcOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 

 				StartDisabled = IsDlgButtonChecked(hwndDlg, IDC_START) ? 0 : 2;

 				StopDisabled = IsDlgButtonChecked(hwndDlg, IDC_STOP) ? 0 : 4;

-				OnePopUp = IsDlgButtonChecked(hwndDlg, IDC_ONEPOPUP);

+				OnePopup = IsDlgButtonChecked(hwndDlg, IDC_ONEPOPUP);

 				ShowMenu = IsDlgButtonChecked(hwndDlg, IDC_SHOWMENU);

 

-				M->WriteByte(Module, SET_ONEPOPUP, OnePopUp);

+				M->WriteByte(Module, SET_ONEPOPUP, OnePopup);

 				M->WriteByte(Module, SET_SHOWDISABLEMENU, ShowMenu);

 				M->WriteByte(Module, SET_DISABLED, (BYTE) (StartDisabled | StopDisabled));

 				M->WriteByte(Module, SET_COLOR_MODE, ColorMode);

@@ -509,7 +509,7 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam)
 		odp.hInstance = g_hInst;

 		odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_TYPINGNOTIFYPOPUP);

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

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

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

 		odp.groupPosition = 910000000;

 		odp.flags = ODPF_BOLDGROUPS;

 		odp.pfnDlgProc = DlgProcOpts;

@@ -520,9 +520,9 @@ int TN_OptionsInitialize(WPARAM wParam, LPARAM lParam)
 

 int TN_ModuleInit()

 {

-	hPopUpsList = (HANDLE) CallService(MS_UTILS_ALLOCWINDOWLIST,0,0);

+	hPopupsList = (HANDLE) CallService(MS_UTILS_ALLOCWINDOWLIST,0,0);

 

-	OnePopUp = M->GetByte(Module,SET_ONEPOPUP,DEF_ONEPOPUP);

+	OnePopup = M->GetByte(Module,SET_ONEPOPUP,DEF_ONEPOPUP);

 	ShowMenu = M->GetByte(Module,SET_SHOWDISABLEMENU,DEF_SHOWDISABLEMENU);

 

 	int i = M->GetByte(Module,SET_DISABLED,DEF_DISABLED);

@@ -556,7 +556,7 @@ int TN_ModuleInit()
 			mi.hIcon = LoadIcon(g_hInst, MAKEINTRESOURCE(IDI_DISABLED));

 		}

 		mi.pszService = "TypingNotify/EnableDisableMenuCommand";

-		mi.pszPopupName = LPGEN("PopUps");

+		mi.pszPopupName = LPGEN("Popups");

 		hDisableMenu = Menu_AddMainMenuItem(&mi);

 	}

 

diff --git a/plugins/TabSRMM/src/typingnotify.h b/plugins/TabSRMM/src/typingnotify.h
index e825002b73..c851c51991 100644
--- a/plugins/TabSRMM/src/typingnotify.h
+++ b/plugins/TabSRMM/src/typingnotify.h
@@ -30,5 +30,5 @@
 #define DEF_ICON_SETID       0

 #define SET_SHOWDISABLEMENU  "ShowDisableMenu"

 #define DEF_SHOWDISABLEMENU  1

-#define SET_ONEPOPUP         "OnePopUp"

+#define SET_ONEPOPUP         "OnePopup"

 #define DEF_ONEPOPUP         1

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 0ecf80e2d1..c26bc17a5b 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -695,11 +695,11 @@ INT_PTR CALLBACK Utils::PopupDlgProcError(HWND hWnd, UINT message, WPARAM wParam
 	switch (message) {

 	case WM_COMMAND:

 		PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_HANDLECLISTEVENT, (WPARAM)hContact, 0);

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 		break;

 	case WM_CONTEXTMENU:

 		PostMessage(PluginConfig.g_hwndHotkeyHandler, DM_HANDLECLISTEVENT, (WPARAM)hContact, 0);

-		PUDeletePopUp(hWnd);

+		PUDeletePopup(hWnd);

 		break;

 	case WM_MOUSEWHEEL:

 		break;