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/Scriver/src/chat/chat.h | 2 +- plugins/Scriver/src/chat/options.cpp | 32 ++++++++++++++++---------------- plugins/Scriver/src/chat/tools.cpp | 10 +++++----- 3 files changed, 22 insertions(+), 22 deletions(-) (limited to 'plugins/Scriver/src/chat') diff --git a/plugins/Scriver/src/chat/chat.h b/plugins/Scriver/src/chat/chat.h index c1f6427781..23322099b3 100644 --- a/plugins/Scriver/src/chat/chat.h +++ b/plugins/Scriver/src/chat/chat.h @@ -245,7 +245,7 @@ struct GlobalLogSettings_t { BOOL LogIndentEnabled; BOOL StripFormat; BOOL SoundsFocus; - BOOL PopUpInactiveOnly; + BOOL PopupInactiveOnly; BOOL TrayIconInactiveOnly; BOOL AddColonToAutoComplete; BOOL LogLimitNames; diff --git a/plugins/Scriver/src/chat/options.cpp b/plugins/Scriver/src/chat/options.cpp index a2cefc7614..78a809e907 100644 --- a/plugins/Scriver/src/chat/options.cpp +++ b/plugins/Scriver/src/chat/options.cpp @@ -90,19 +90,19 @@ static struct branch_t branch4[] = { }; static struct branch_t branch6[] = { - {LPGENT("Show pop-ups only when the chat room is not active"), "PopUpInactiveOnly", 0, 1, NULL}, - {LPGENT("Show pop-up for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0, NULL}, - {LPGENT("Show pop-up for users joining"), "PopupFlags", GC_EVENT_JOIN, 0, NULL}, - {LPGENT("Show pop-up for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0, NULL}, - {LPGENT("Show pop-up for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0, NULL}, - {LPGENT("Show pop-up for actions"), "PopupFlags", GC_EVENT_ACTION, 0, NULL}, - {LPGENT("Show pop-up for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0, NULL}, - {LPGENT("Show pop-up for users leaving"), "PopupFlags", GC_EVENT_PART, 0, NULL}, - {LPGENT("Show pop-up for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0, NULL}, - {LPGENT("Show pop-up for notices "), "PopupFlags", GC_EVENT_NOTICE, 0, NULL}, - {LPGENT("Show pop-up for name changes"), "PopupFlags", GC_EVENT_NICK, 0, NULL}, - {LPGENT("Show pop-up for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0, NULL}, - {LPGENT("Show pop-up for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0, NULL}, + {LPGENT("Show Popups only when the chat room is not active"), "PopupInactiveOnly", 0, 1, NULL}, + {LPGENT("Show Popup for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0, NULL}, + {LPGENT("Show Popup for users joining"), "PopupFlags", GC_EVENT_JOIN, 0, NULL}, + {LPGENT("Show Popup for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0, NULL}, + {LPGENT("Show Popup for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0, NULL}, + {LPGENT("Show Popup for actions"), "PopupFlags", GC_EVENT_ACTION, 0, NULL}, + {LPGENT("Show Popup for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0, NULL}, + {LPGENT("Show Popup for users leaving"), "PopupFlags", GC_EVENT_PART, 0, NULL}, + {LPGENT("Show Popup for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0, NULL}, + {LPGENT("Show Popup for notices "), "PopupFlags", GC_EVENT_NOTICE, 0, NULL}, + {LPGENT("Show Popup for name changes"), "PopupFlags", GC_EVENT_NICK, 0, NULL}, + {LPGENT("Show Popup for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0, NULL}, + {LPGENT("Show Popup for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0, NULL}, }; static HTREEITEM InsertBranch(HWND hwndTree, TCHAR* pszDescr, BOOL bExpanded) @@ -618,7 +618,7 @@ INT_PTR CALLBACK DlgProcOptions2(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPARAM lPa g_Settings.dwPopupFlags = db_get_dw(NULL, "Chat", "PopupFlags", 0x0000); g_Settings.StripFormat = (BOOL)db_get_b(NULL, "Chat", "TrimFormatting", 0); g_Settings.TrayIconInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1); - g_Settings.PopUpInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopUpInactiveOnly", 1); + g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1); g_Settings.LogIndentEnabled = (db_get_b(NULL, "Chat", "LogIndentEnabled", 1) != 0)?TRUE:FALSE; MM_FontsChanged(); @@ -759,7 +759,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM lParam) odp.hInstance = g_hInst; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP); odp.pszTitle = LPGEN("Messaging"); - odp.pszGroup = LPGEN("PopUps"); + odp.pszGroup = LPGEN("Popups"); odp.pfnDlgProc = DlgProcOptionsPopup; odp.flags = ODPF_BOLDGROUPS; odp.ptszTab = NULL; @@ -793,7 +793,7 @@ void LoadGlobalSettings(void) g_Settings.crLogBackground = db_get_dw(NULL, "Chat", "ColorLogBG", GetSysColor(COLOR_WINDOW)); g_Settings.StripFormat = (BOOL)db_get_b(NULL, "Chat", "StripFormatting", 0); g_Settings.TrayIconInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "TrayIconInactiveOnly", 1); - g_Settings.PopUpInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopUpInactiveOnly", 1); + g_Settings.PopupInactiveOnly = (BOOL)db_get_b(NULL, "Chat", "PopupInactiveOnly", 1); g_Settings.AddColonToAutoComplete = (BOOL)db_get_b(NULL, "Chat", "AddColonToAutoComplete", 1); g_Settings.iPopupStyle = db_get_b(NULL, "Chat", "PopupStyle", 1); g_Settings.iPopupTimeout = db_get_w(NULL, "Chat", "PopupTimeout", 3); diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp index 7f20935f2d..b8edb1d1c5 100644 --- a/plugins/Scriver/src/chat/tools.cpp +++ b/plugins/Scriver/src/chat/tools.cpp @@ -86,7 +86,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA CallFunctionAsync(ShowRoomFromPopup, si); - PUDeletePopUp(hWnd); + PUDeletePopup(hWnd); return TRUE; } break; @@ -97,7 +97,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA if (CallService(MS_CLIST_GETEVENT, (WPARAM)si->windowData.hContact, 0)) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)si->windowData.hContact, (LPARAM)"chaticon"); - PUDeletePopUp( hWnd ); + PUDeletePopup( hWnd ); } break; } @@ -144,7 +144,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) @@ -288,7 +288,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT * gce, BOOL bHighligh db_unset(si->windowData.hContact, "CList", "Hidden"); if (bInactive) DoTrayIcon(si, gce); - if (bInactive || !g_Settings.PopUpInactiveOnly) + if (bInactive || !g_Settings.PopupInactiveOnly) DoPopup(si, gce); if (bInactive && si->hWnd) SendMessage(si->hWnd, GC_SETMESSAGEHIGHLIGHT, 0, 0); @@ -302,7 +302,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO *si, GCEVENT * gce, BOOL bHighligh // stupid thing to not create multiple popups for a QUIT event for instance if (bManyFix == 0) { // do popups - if (bInactive || !g_Settings.PopUpInactiveOnly) + if (bInactive || !g_Settings.PopupInactiveOnly) DoPopup(si, gce); // do sounds and flashing -- cgit v1.2.3