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/WhoUsesMyFiles/src/wumf.cpp | 2 +- plugins/WhoUsesMyFiles/src/wumf.h | 4 ++-- plugins/WhoUsesMyFiles/src/wumfplug.cpp | 34 ++++++++++++++++----------------- 3 files changed, 20 insertions(+), 20 deletions(-) (limited to 'plugins/WhoUsesMyFiles') diff --git a/plugins/WhoUsesMyFiles/src/wumf.cpp b/plugins/WhoUsesMyFiles/src/wumf.cpp index 9b88a75155..416a37196c 100644 --- a/plugins/WhoUsesMyFiles/src/wumf.cpp +++ b/plugins/WhoUsesMyFiles/src/wumf.cpp @@ -221,7 +221,7 @@ void process_file(SESSION_INFO_1 s_info, FILE_INFO_3 f_info) if (!add_cell(&list, w)) msg(TranslateT("Error memory allocation")); - if (WumfOptions.PopupsEnabled) ShowWumfPopUp(w); + if (WumfOptions.PopupsEnabled) ShowWumfPopup(w); if (WumfOptions.LogToFile) LogWumf(w); } else w->mark = FALSE; diff --git a/plugins/WhoUsesMyFiles/src/wumf.h b/plugins/WhoUsesMyFiles/src/wumf.h index f1fac9ab4b..a60fb23404 100644 --- a/plugins/WhoUsesMyFiles/src/wumf.h +++ b/plugins/WhoUsesMyFiles/src/wumf.h @@ -122,8 +122,8 @@ void FreeAll(); VOID CALLBACK TimerProc(HWND, UINT, UINT_PTR, DWORD); INT_PTR CALLBACK ConnDlgProc(HWND, UINT, WPARAM, LPARAM); -void ShowThePopUp(PWumf w, LPTSTR, LPTSTR); -void ShowWumfPopUp(PWumf w); +void ShowThePopup(PWumf w, LPTSTR, LPTSTR); +void ShowWumfPopup(PWumf w); void process_session(SESSION_INFO_1 s_info); void process_file(SESSION_INFO_1 s_info, FILE_INFO_3 f_info); diff --git a/plugins/WhoUsesMyFiles/src/wumfplug.cpp b/plugins/WhoUsesMyFiles/src/wumfplug.cpp index 662d922fc2..52d76d7bd2 100644 --- a/plugins/WhoUsesMyFiles/src/wumfplug.cpp +++ b/plugins/WhoUsesMyFiles/src/wumfplug.cpp @@ -87,7 +87,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA case IDM_ABOUT: break; case IDM_EXIT: - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); break; case IDM_SHOW: CallService(MS_WUMF_CONNECTIONSSHOW, (WPARAM)0, (LPARAM)0); @@ -96,7 +96,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA switch (HIWORD(wParam)) { case STN_CLICKED: - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return TRUE; } break; @@ -111,17 +111,17 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA return DefWindowProc(hWnd, message, wParam, lParam); } -void ShowWumfPopUp(PWumf w) +void ShowWumfPopup(PWumf w) { TCHAR text[512], title[512]; if (!WumfOptions.AlertFolders && (w->dwAttr & FILE_ATTRIBUTE_DIRECTORY)) return; mir_sntprintf(title, SIZEOF(title), _T("%s (%s)"), w->szComp, w->szUser); mir_sntprintf(text, SIZEOF(text), _T("%s (%s)"), w->szPath, w->szPerm); - ShowThePopUp(w, title, text); + ShowThePopup(w, title, text); } -void ShowThePopUp(PWumf w, LPTSTR title, LPTSTR text) +void ShowThePopup(PWumf w, LPTSTR title, LPTSTR text) { POPUPDATAT ppd = {0}; ppd.lchContact = NULL; @@ -147,39 +147,39 @@ void ShowThePopUp(PWumf w, LPTSTR title, LPTSTR text) ppd.PluginWindowProc = PopupDlgProc; ppd.PluginData = w; - PUAddPopUpT(&ppd); + PUAddPopupT(&ppd); } void ShowThePreview() { if ( !ServiceExists(MS_POPUP_ADDPOPUPT)) { - MessageBox(NULL, TranslateT("PopUp plugin not found!"), TranslateT("WUMF plugin"), MB_OK|MB_ICONSTOP); + MessageBox(NULL, TranslateT("Popup plugin not found!"), TranslateT("WUMF plugin"), MB_OK|MB_ICONSTOP); return; } if (WumfOptions.AlertFolders) { - ShowThePopUp(NULL, _T("Guest"), _T("C:\\My Share")); + ShowThePopup(NULL, _T("Guest"), _T("C:\\My Share")); Sleep(300); - ShowThePopUp(NULL, _T("Guest"), _T("C:\\My Share\\Photos")); + ShowThePopup(NULL, _T("Guest"), _T("C:\\My Share\\Photos")); Sleep(300); } - ShowThePopUp(NULL, _T("Guest"), _T("C:\\Share\\My Photos\\photo.jpg")); + ShowThePopup(NULL, _T("Guest"), _T("C:\\Share\\My Photos\\photo.jpg")); Sleep(300); if (WumfOptions.AlertFolders) { - ShowThePopUp(NULL, _T("User"), _T("C:\\My Share")); + ShowThePopup(NULL, _T("User"), _T("C:\\My Share")); Sleep(300); - ShowThePopUp(NULL, _T("User"), _T("C:\\My Share\\Movies")); + ShowThePopup(NULL, _T("User"), _T("C:\\My Share\\Movies")); Sleep(300); } - ShowThePopUp(NULL, _T("User"), _T("C:\\My Share\\Movies\\The Two Towers.avi")); + ShowThePopup(NULL, _T("User"), _T("C:\\My Share\\Movies\\The Two Towers.avi")); Sleep(300); if (WumfOptions.AlertFolders) { - ShowThePopUp(NULL, _T("Administrator"), _T("C:\\Distributives")); + ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives")); Sleep(300); - ShowThePopUp(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k")); + ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k")); Sleep(300); } - ShowThePopUp(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k\\setup.exe")); + ShowThePopup(NULL, _T("Administrator"), _T("C:\\Distributives\\Win2k\\setup.exe")); } BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) @@ -505,7 +505,7 @@ extern "C" __declspec(dllexport) int Load(void) } mi.pszService = MS_WUMF_SWITCHPOPUP; mi.popupPosition = 1999990000; - mi.pszPopupName = LPGEN("PopUps"); + mi.pszPopupName = LPGEN("Popups"); hMenuItem = Menu_AddMainMenuItem(&mi); mi.pszName = LPGEN("WUMF: Show connections"); -- cgit v1.2.3