diff options
185 files changed, 1406 insertions, 1400 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln index 89605c14c8..e0b6c2f7c7 100644 --- a/bin10/mir_full.sln +++ b/bin10/mir_full.sln @@ -94,7 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Nudge", "..\plugins\Nudge\nudge_10.vcxproj", "{8190CFAA-3B73-43D8-9101-8368E21F1864}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PopUp", "..\plugins\Popup\PopUp_10.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Popup", "..\plugins\Popup\Popup_10.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickMessages", "..\plugins\QuickMessages\quickmessages_10.vcxproj", "{DD76B998-ED0D-4BFD-9660-3ADC3A334872}"
EndProject
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln index f9c6a2176d..bfb7042520 100644 --- a/bin10/mir_full_pro.sln +++ b/bin10/mir_full_pro.sln @@ -94,7 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Nudge", "..\plugins\Nudge\nudge_10.vcxproj", "{8190CFAA-3B73-43D8-9101-8368E21F1864}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PopUp", "..\plugins\Popup\PopUp_10.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Popup", "..\plugins\Popup\Popup_10.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickMessages", "..\plugins\QuickMessages\quickmessages_10.vcxproj", "{DD76B998-ED0D-4BFD-9660-3ADC3A334872}"
EndProject
@@ -207,7 +207,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataBase Crypto Modules", " EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Message Windows and Dialogs", "Message Windows and Dialogs", "{87D96006-542C-4396-87EF-68E3C3D2797F}"
EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PopUp Modules", "PopUp Modules", "{31B8FE37-AC37-40AC-85AC-78B04C2CAC17}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Popup Modules", "Popup Modules", "{31B8FE37-AC37-40AC-85AC-78B04C2CAC17}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Service Modules", "Service Modules", "{A93476F5-9C4C-48A6-A8A4-C79D804A3228}"
EndProject
diff --git a/bin11/mir_full.sln b/bin11/mir_full.sln index f0e357991d..cf58141ef0 100644 --- a/bin11/mir_full.sln +++ b/bin11/mir_full.sln @@ -94,7 +94,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "NewXstatusNotify", "..\plug EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Nudge", "..\plugins\Nudge\nudge_11.vcxproj", "{8190CFAA-3B73-43D8-9101-8368E21F1864}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PopUp", "..\plugins\Popup\PopUp_11.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Popup", "..\plugins\Popup\Popup_11.vcxproj", "{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QuickMessages", "..\plugins\QuickMessages\quickmessages_11.vcxproj", "{DD76B998-ED0D-4BFD-9660-3ADC3A334872}"
EndProject
diff --git a/include/m_popup.h b/include/m_popup.h index 1a633ac14b..84bc5de878 100644 --- a/include/m_popup.h +++ b/include/m_popup.h @@ -1,12 +1,12 @@ /*
============================================================================== =
- PopUp plugin
-Plugin Name: PopUp
+ Popup plugin
+Plugin Name: Popup
Plugin authors: Luca Santarelli aka hrk (hrk@users.sourceforge.net)
Victor Pavlychko aka zazoo (nullbie@gmail.com)
============================================================================== =
The purpose of this plugin is to give developers a common "platform/interface"
-to show PopUps. It is born from the source code of NewStatusNotify, another
+to show Popups. It is born from the source code of NewStatusNotify, another
plugin I've made.
Remember that users *must* have this plugin enabled, or they won't get any
@@ -19,10 +19,10 @@ them! #define M_POPUP_H
/*
-NOTE! Since Popup 1.0.1.2 there is a main meun group called "PopUps" where I
+NOTE! Since Popup 1.0.1.2 there is a main meun group called "Popups" where I
have put a "Enable/Disable" item. You can add your own "enable/disable" items
by adding these lines before you call MS_CLIST_ADDMAINMENUITEM:
-mi.pszPopUpName = Translate("PopUps");
+mi.pszPopupName = Translate("Popups");
mi.position = 0; //You don't need it and it's better if you put it to zero.
*/
@@ -83,14 +83,14 @@ typedef struct typedef LPPOPUPDATA LPPOPUPDATAT;
#endif
-/* PopUp/AddPopup
+/* Popup/AddPopup
Creates, adds and shows a popup, given a (valid) POPUPDATA structure pointer.
-wParam = (WPARAM)(*POPUPDATA)PopUpDataAddress
+wParam = (WPARAM)(*POPUPDATA)PopupDataAddress
lParam = 0
-Returns: > 0 on success, 0 if creation went bad, -1 if the PopUpData contained unacceptable values.
-NOTE: it returns -1 if the PopUpData was not valid, if there were already too many popups, if the module was disabled.
+Returns: > 0 on success, 0 if creation went bad, -1 if the PopupData contained unacceptable values.
+NOTE: it returns -1 if the PopupData was not valid, if there were already too many popups, if the module was disabled.
Otherwise, it can return anything else...
Popup Plus 2.0.4.0+
@@ -102,42 +102,42 @@ You may pass additional creation flags via lParam: #define APF_RETURN_HWND 0x1
#define APF_CUSTOM_POPUP 0x2
-#define MS_POPUP_ADDPOPUP "PopUp/AddPopUpEx"
-static INT_PTR __inline PUAddPopUp(POPUPDATA* ppdp) {
+#define MS_POPUP_ADDPOPUP "Popup/AddPopupEx"
+static INT_PTR __inline PUAddPopup(POPUPDATA* ppdp) {
return CallService(MS_POPUP_ADDPOPUP, (WPARAM)ppdp, 0);
}
-#define MS_POPUP_ADDPOPUPW "PopUp/AddPopUpW"
-static INT_PTR __inline PUAddPopUpW(POPUPDATAW* ppdp) {
+#define MS_POPUP_ADDPOPUPW "Popup/AddPopupW"
+static INT_PTR __inline PUAddPopupW(POPUPDATAW* ppdp) {
return CallService(MS_POPUP_ADDPOPUPW, (WPARAM)ppdp, 0);
}
#if defined(_UNICODE) || defined(UNICODE)
#define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUPW
- #define PUAddPopUpT PUAddPopUpW
+ #define PUAddPopupT PUAddPopupW
#else
#define MS_POPUP_ADDPOPUPT MS_POPUP_ADDPOPUP
- #define PUAddPopUpT PUAddPopUp
+ #define PUAddPopupT PUAddPopup
#endif
-/* PopUp/GetContact
-Returns the handle to the contact associated to the specified PopUpWindow.
+/* Popup/GetContact
+Returns the handle to the contact associated to the specified PopupWindow.
-wParam = (WPARAM)(HWND)hPopUpWindow
+wParam = (WPARAM)(HWND)hPopupWindow
lParam = 0;
Returns: the HANDLE of the contact. Can return NULL, meaning it's the main contact. -1 means failure.
*/
-#define MS_POPUP_GETCONTACT "PopUp/GetContact"
-static HANDLE __inline PUGetContact(HWND hPopUpWindow) {
- return (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hPopUpWindow, 0);
+#define MS_POPUP_GETCONTACT "Popup/GetContact"
+static HANDLE __inline PUGetContact(HWND hPopupWindow) {
+ return (HANDLE)CallService(MS_POPUP_GETCONTACT, (WPARAM)hPopupWindow, 0);
}
-/* PopUp/GetPluginData
+/* Popup/GetPluginData
Returns custom plugin date associated with popup
-wParam = (WPARAM)(HWND)hPopUpWindow
+wParam = (WPARAM)(HWND)hPopupWindow
lParam = (LPARAM)(PLUGINDATA*)PluginDataAddress;
Returns: the address of the PLUGINDATA structure. Can return NULL, meaning nothing was given. -1 means failure.
@@ -147,16 +147,16 @@ CallService(..., (LPARAM)aPointerToAStruct); and then use that struct.
Do this, instead:
aPointerToStruct = CallService(..., (LPARAM)aPointerToAStruct);
-and it will work. Just look at the example I've written above (PopUpDlgProc).
+and it will work. Just look at the example I've written above (PopupDlgProc).
*/
-#define MS_POPUP_GETPLUGINDATA "PopUp/GetPluginData"
-static void __inline * PUGetPluginData(HWND hPopUpWindow) {
+#define MS_POPUP_GETPLUGINDATA "Popup/GetPluginData"
+static void __inline * PUGetPluginData(HWND hPopupWindow) {
long * uselessPointer = NULL;
- return (void*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hPopUpWindow, (LPARAM)uselessPointer);
+ return (void*)CallService(MS_POPUP_GETPLUGINDATA, (WPARAM)hPopupWindow, (LPARAM)uselessPointer);
}
-/* PopUp/IsSecondLineShown
+/* Popup/IsSecondLineShown
Checks if second line is enable
wParam = 0
@@ -164,14 +164,14 @@ lParam = 0 Returns: 0 if the user has chosen not to have the second line, 1 if he choose to have the second line.
*/
-#define MS_POPUP_ISSECONDLINESHOWN "PopUp/IsSecondLineShown"
+#define MS_POPUP_ISSECONDLINESHOWN "Popup/IsSecondLineShown"
static BOOL __inline PUIsSecondLineShown() {
return (BOOL)CallService(MS_POPUP_ISSECONDLINESHOWN, 0, 0);
}
-/* PopUp/Query
+/* Popup/Query
-Requests an action or an answer from PopUp module.
+Requests an action or an answer from Popup module.
wParam = (WPARAM)wpQuery
@@ -182,7 +182,7 @@ returns 0 on success, -1 on error, 1 on stupid calls ;-) #define PUQS_DISABLEPOPUPS 2 // " "
#define PUQS_GETSTATUS 3 //Returns 1 (TRUE) if popups are enabled, 0 (FALSE) if popups are disabled.
-#define MS_POPUP_QUERY "PopUp/Query"
+#define MS_POPUP_QUERY "Popup/Query"
/* UM_FREEPLUGINDATA
Process this message if you have allocated your own memory. (i.e.: POPUPDATA.PluginData != NULL)
@@ -199,33 +199,33 @@ wParam = 0 lParam = 0
*/
#define UM_DESTROYPOPUP (WM_USER + 0x0201)
-static int __inline PUDeletePopUp(HWND hWndPopUp) {
- return (int)SendMessage(hWndPopUp, UM_DESTROYPOPUP, 0, 0);
+static int __inline PUDeletePopup(HWND hWndPopup) {
+ return (int)SendMessage(hWndPopup, UM_DESTROYPOPUP, 0, 0);
}
/* UM_INITPOPUP
-This message is sent to the PopUp when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.
+This message is sent to the Popup when its creation has been finished, so POPUPDATA (and thus your PluginData) is reachable.
Catch it if you needed to catch WM_CREATE or WM_INITDIALOG, which you'll never ever get in your entire popup-life.
Return value: if you process this message, return 0. If you don't process it, return 0. Do whatever you like ;-)
-wParam = (WPARAM)(HWND)hPopUpWindow (this is useless, you get message inside your popup window)
+wParam = (WPARAM)(HWND)hPopupWindow (this is useless, you get message inside your popup window)
lParam = 0
*/
#define UM_INITPOPUP (WM_USER + 0x0202)
-/* PopUp/Changetext
+/* Popup/Changetext
Changes the text displayed in the second line of the popup.
-wParam = (WPARAM)(HWND)hPopUpWindow
+wParam = (WPARAM)(HWND)hPopupWindow
lParam = (LPARAM)(char*)lpzNewText
returns: > 0 for success, -1 for failure, 0 if the failure is due to second line not being shown. (but you could call
PUIsSecondLineShown() before changing the text...)
*/
-#define MS_POPUP_CHANGETEXTW "PopUp/ChangetextW"
-static int __inline PUChangeTextW(HWND hWndPopUp, LPCWSTR lpwzNewText) {
- return (int)CallService(MS_POPUP_CHANGETEXTW, (WPARAM)hWndPopUp, (LPARAM)lpwzNewText);
+#define MS_POPUP_CHANGETEXTW "Popup/ChangetextW"
+static int __inline PUChangeTextW(HWND hWndPopup, LPCWSTR lpwzNewText) {
+ return (int)CallService(MS_POPUP_CHANGETEXTW, (WPARAM)hWndPopup, (LPARAM)lpwzNewText);
}
#if defined(_UNICODE) || defined(UNICODE)
@@ -233,16 +233,16 @@ static int __inline PUChangeTextW(HWND hWndPopUp, LPCWSTR lpwzNewText) { #define PUChangeTextT PUChangeTextW
#endif
-/* PopUp/Change
+/* Popup/Change
Changes the entire popup
-wParam = (WPARAM)(HWND)hPopUpWindow
+wParam = (WPARAM)(HWND)hPopupWindow
lParam = (LPARAM)(POPUPDATA*)newData
*/
-#define MS_POPUP_CHANGEW "PopUp/ChangeW"
-static int __inline PUChangeW(HWND hWndPopUp, POPUPDATAW *newData) {
- return (int)CallService(MS_POPUP_CHANGEW, (WPARAM)hWndPopUp, (LPARAM)newData);
+#define MS_POPUP_CHANGEW "Popup/ChangeW"
+static int __inline PUChangeW(HWND hWndPopup, POPUPDATAW *newData) {
+ return (int)CallService(MS_POPUP_CHANGEW, (WPARAM)hWndPopup, (LPARAM)newData);
}
#if defined(_UNICODE) || defined(UNICODE)
@@ -271,9 +271,9 @@ lParam = value of type defined by wParam #define CPT_DATAT CPT_DATAW
#endif
-/* PopUp/ShowMessage
+/* Popup/ShowMessage
This is mainly for developers.
-Shows a warning message in a PopUp. It's useful if you need a "MessageBox" like function, but you don't want a modal
+Shows a warning message in a Popup. It's useful if you need a "MessageBox" like function, but you don't want a modal
window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.
wParam = (char *)lpzMessage
@@ -283,8 +283,8 @@ Returns: 0 if the popup was shown, -1 in case of failure. */
#define SM_WARNING 0x01 //Triangle icon.
#define SM_NOTIFY 0x02 //Exclamation mark icon.
-#define MS_POPUP_SHOWMESSAGE "PopUp/ShowMessage"
-#define MS_POPUP_SHOWMESSAGEW "PopUp/ShowMessageW"
+#define MS_POPUP_SHOWMESSAGE "Popup/ShowMessage"
+#define MS_POPUP_SHOWMESSAGEW "Popup/ShowMessageW"
static int __inline PUShowMessage(char *lpzText, DWORD kind) {
return (int)CallService(MS_POPUP_SHOWMESSAGE, (WPARAM)lpzText, (LPARAM)kind);
@@ -332,7 +332,7 @@ typedef struct { // wParam = 0
// lParam = (POPUPCLASS *)&pc
-#define MS_POPUP_REGISTERCLASS "PopUp/RegisterClass"
+#define MS_POPUP_REGISTERCLASS "Popup/RegisterClass"
HANDLE __forceinline Popup_RegisterClass(POPUPCLASS *pc)
{
@@ -341,7 +341,7 @@ HANDLE __forceinline Popup_RegisterClass(POPUPCLASS *pc) return (HANDLE)CallService(MS_POPUP_REGISTERCLASS, 0, LPARAM(pc));
}
-#define MS_POPUP_UNREGISTERCLASS "PopUp/UnregisterClass"
+#define MS_POPUP_UNREGISTERCLASS "Popup/UnregisterClass"
void __forceinline Popup_UnregisterClass(HANDLE ppc)
{
@@ -368,7 +368,7 @@ typedef struct { // wParam = 0
// lParam = (POPUPDATACLASS *)&pdc
-#define MS_POPUP_ADDPOPUPCLASS "PopUp/AddPopupClass"
+#define MS_POPUP_ADDPOPUPCLASS "Popup/AddPopupClass"
static INT_PTR __inline ShowClassPopup(char *name, char *title, char *text) {
POPUPDATACLASS d = {sizeof(d), name};
diff --git a/plugins/!Deprecated/NewAwaySysMod/Common.h b/plugins/!Deprecated/NewAwaySysMod/Common.h index 7e261d875d..4fe6d2d50f 100644 --- a/plugins/!Deprecated/NewAwaySysMod/Common.h +++ b/plugins/!Deprecated/NewAwaySysMod/Common.h @@ -222,7 +222,7 @@ // options dialog
#define OPT_TITLE LPGENT("Away System")
#define OPT_MAINGROUP LPGEN("Status")
-#define OPT_POPUPGROUP LPGEN("PopUps")
+#define OPT_POPUPGROUP LPGEN("Popups")
#define MRM_MAX_GENERATED_TITLE_LEN 35 // maximum length of automatically generated title for recent messages
diff --git a/plugins/!Deprecated/NewAwaySysMod/Notification.cpp b/plugins/!Deprecated/NewAwaySysMod/Notification.cpp index ce35017c8f..389b17eae3 100644 --- a/plugins/!Deprecated/NewAwaySysMod/Notification.cpp +++ b/plugins/!Deprecated/NewAwaySysMod/Notification.cpp @@ -129,7 +129,7 @@ void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata) } break;
case PCA_CLOSEPOPUP: // close popup
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
} break;
case PCA_DONOTHING: // do nothing
break;
diff --git a/plugins/!NotAdopted/mDynDNS/mDynDNS.cpp b/plugins/!NotAdopted/mDynDNS/mDynDNS.cpp index 102ce286bb..7ec3471094 100644 --- a/plugins/!NotAdopted/mDynDNS/mDynDNS.cpp +++ b/plugins/!NotAdopted/mDynDNS/mDynDNS.cpp @@ -240,7 +240,7 @@ static int mdyndns_options_init(WPARAM wParam, LPARAM lParam) odp.cbSize = sizeof(odp);
odp.position = 100000000;
odp.hInstance = hInst;
- odp.pszGroup = Translate("PopUps");
+ odp.pszGroup = Translate("Popups");
odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT_POPUPS);
odp.pszTitle = title; //PLUGNAME;
odp.pfnDlgProc = DnsPopupsDlgProc;
diff --git a/plugins/Alarms/src/alarmlist.cpp b/plugins/Alarms/src/alarmlist.cpp index 05a3e73d67..0076292e50 100644 --- a/plugins/Alarms/src/alarmlist.cpp +++ b/plugins/Alarms/src/alarmlist.cpp @@ -482,11 +482,11 @@ static LRESULT CALLBACK PopupAlarmDlgProc(HWND hWnd, UINT message, WPARAM wParam append_to_list(mpd);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
case UM_FREEPLUGINDATA:
@@ -514,7 +514,7 @@ void ShowPopup(ALARM *alarm) ppd.PluginWindowProc = PopupAlarmDlgProc;
ppd.PluginData = data;
ppd.iSeconds = -1;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
}
diff --git a/plugins/Alarms/src/alarms.cpp b/plugins/Alarms/src/alarms.cpp index 6fe54250fe..33c4751dc9 100644 --- a/plugins/Alarms/src/alarms.cpp +++ b/plugins/Alarms/src/alarms.cpp @@ -54,7 +54,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA switch(message) {
case WM_COMMAND:
if (HIWORD(wParam) == STN_CLICKED) { //It was a click on the Popup.
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
break;
@@ -81,7 +81,7 @@ void ShowPopup(HANDLE hContact, const TCHAR *msg) ppd.iSeconds = 3;
//Now that every field has been filled, we want to see the popup.
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
}
diff --git a/plugins/AvatarHistory/src/options.cpp b/plugins/AvatarHistory/src/options.cpp index 73940baeee..0820278639 100644 --- a/plugins/AvatarHistory/src/options.cpp +++ b/plugins/AvatarHistory/src/options.cpp @@ -156,7 +156,7 @@ int OptInit(WPARAM wParam, LPARAM lParam) Options_AddPage(wParam, &odp);
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTitle = LPGENT("Avatar Change");
odp.pfnDlgProc = PopupsDlgProc;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
diff --git a/plugins/AvatarHistory/src/popup.cpp b/plugins/AvatarHistory/src/popup.cpp index ee46cfb67b..dbdd6821ca 100644 --- a/plugins/AvatarHistory/src/popup.cpp +++ b/plugins/AvatarHistory/src/popup.cpp @@ -170,7 +170,7 @@ void ShowPopupEx(HANDLE hContact, const TCHAR *title, const TCHAR *description, }
// Now that every field has been filled, we want to see the popup.
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
else
{
@@ -210,7 +210,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA PostMessage(hPopupWindow, WMU_ACTION, (WPARAM)popup->plugin_data, opts.popup_left_click_action);
if (opts.popup_left_click_action != POPUP_ACTION_DONOTHING)
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
@@ -221,7 +221,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA PostMessage(hPopupWindow, WMU_ACTION, (WPARAM)popup->plugin_data, opts.popup_right_click_action);
if (opts.popup_right_click_action != POPUP_ACTION_DONOTHING)
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
@@ -248,13 +248,13 @@ static LRESULT CALLBACK DumbPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, switch(message) {
case WM_COMMAND:
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
case WM_CONTEXTMENU:
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
diff --git a/plugins/BossKeyPlus/src/BossKey.cpp b/plugins/BossKeyPlus/src/BossKey.cpp index c4ab8cbd71..ed662b5057 100644 --- a/plugins/BossKeyPlus/src/BossKey.cpp +++ b/plugins/BossKeyPlus/src/BossKey.cpp @@ -801,15 +801,15 @@ extern "C" int __declspec(dllexport) Load(void) if ((g_bOldSetting & OLD_POPUP) && !(g_wMaskAdv & OPT_RESTORE)) // Restore popup settings if Miranda was crushed or killed in hidden mode and "Restore hiding on startup after failure" option is disabled
{
- if (db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) == 0)
- db_set_b(NULL, "PopUp", "ModuleIsEnabled", 1);
+ if (db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) == 0)
+ db_set_b(NULL, "Popup", "ModuleIsEnabled", 1);
if (db_get_b(NULL, "YAPP", "Enabled", 1) == 0)
db_set_b(NULL, "YAPP", "Enabled", 1);
}
- if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled
+ if (g_wMaskAdv & OPT_HIDEONSTART && db_get_b(NULL, "Popup", "ModuleIsEnabled", 0)) // hack for disabling popup on startup if "Hide Miranda on startup" is enabled
{
g_bOldSetting |= OLD_POPUP;
- db_set_b(NULL, "PopUp", "ModuleIsEnabled", 0);
+ db_set_b(NULL, "Popup", "ModuleIsEnabled", 0);
}
Icon_Register(g_hInstance, "BossKey", iconList, SIZEOF(iconList));
diff --git a/plugins/BuddyExpectator/src/BuddyExpectator.cpp b/plugins/BuddyExpectator/src/BuddyExpectator.cpp index 8ea3387b04..8fd0bcede9 100644 --- a/plugins/BuddyExpectator/src/BuddyExpectator.cpp +++ b/plugins/BuddyExpectator/src/BuddyExpectator.cpp @@ -93,7 +93,7 @@ time_t getLastInputMsg(HANDLE hContact) }
/**
- * PopUp window procedures
+ * Popup window procedures
*/
LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -102,23 +102,23 @@ LRESULT CALLBACK HidePopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM case WM_COMMAND:
if (HIWORD(wParam) == STN_CLICKED) {
db_set_b(PUGetContact(hWnd), "CList", "Hidden", 1);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
case WM_CONTEXTMENU:
db_set_b(PUGetContact(hWnd), MODULE_NAME, "NeverHide", 1);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_POPUPACTION:
if (wParam == 2) {
db_set_b(PUGetContact(hWnd), "CList", "Hidden", 1);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
if (wParam == 3) {
db_set_b(PUGetContact(hWnd), MODULE_NAME, "NeverHide", 1);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
@@ -139,12 +139,12 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA if (options.MissYouIcon)
ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd));
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_POPUPACTION:
@@ -152,7 +152,7 @@ LRESULT CALLBACK MissYouPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA db_set_b(PUGetContact(hWnd), MODULE_NAME, "MissYou", 0);
if (options.MissYouIcon)
ExtraIcon_Clear(hExtraIcon, PUGetContact(hWnd));
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
@@ -169,14 +169,14 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa if (HIWORD(wParam) == STN_CLICKED) {
CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)PUGetContact(hWnd), 0);
CallServiceSync("BuddyExpectator/actionReturned", (WPARAM)PUGetContact(hWnd), 0);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
case WM_CONTEXTMENU:
CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)PUGetContact(hWnd), 0);
setLastSeen(PUGetContact(hWnd));
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
@@ -194,13 +194,13 @@ LRESULT CALLBACK PopupDlgProcNoSet(HWND hWnd, UINT message, WPARAM wParam, LPARA if (HIWORD(wParam) == STN_CLICKED) {
CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)PUGetContact(hWnd), 0);
CallServiceSync("BuddyExpectator/actionStillAbsent", (WPARAM)PUGetContact(hWnd), 0);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
case WM_CONTEXTMENU:
CallServiceSync(MS_CLIST_REMOVEEVENT, (WPARAM)PUGetContact(hWnd), 0);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
@@ -239,8 +239,8 @@ bool isContactGoneFor(HANDLE hContact, int days) mir_sntprintf(ppd.lptzText, MAX_SECONDLINE, TranslateT("%d days since last message"), daysSinceMessage);
if (!options.iUsePopupColors) {
- ppd.colorBack = options.iPopUpColorBack;
- ppd.colorText = options.iPopUpColorFore;
+ ppd.colorBack = options.iPopupColorBack;
+ ppd.colorText = options.iPopupColorFore;
}
ppd.PluginWindowProc = HidePopupDlgProc;
ppd.iSeconds = -1;
@@ -264,21 +264,21 @@ void ReturnNotify(HANDLE hContact, TCHAR *message) SkinPlaySound("buddyExpectatorReturn");
- if (options.iShowPopUp > 0) {
- // Display PopUp
+ if (options.iShowPopup > 0) {
+ // Display Popup
POPUPDATAT ppd = { 0 };
ppd.lchContact = hContact;
ppd.lchIcon = hIcon;
_tcsncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GCDNF_TCHAR), MAX_CONTACTNAME);
_tcsncpy(ppd.lptzText, message, MAX_SECONDLINE);
if (!options.iUsePopupColors) {
- ppd.colorBack = options.iPopUpColorBack;
- ppd.colorText = options.iPopUpColorFore;
+ ppd.colorBack = options.iPopupColorBack;
+ ppd.colorText = options.iPopupColorFore;
}
ppd.PluginWindowProc = PopupDlgProc;
ppd.PluginData = NULL;
- ppd.iSeconds = options.iPopUpDelay;
- PUAddPopUpT(&ppd);
+ ppd.iSeconds = options.iPopupDelay;
+ PUAddPopupT(&ppd);
}
if (options.iShowEvent > 0) {
@@ -302,22 +302,22 @@ void GoneNotify(HANDLE hContact, TCHAR *message) if (db_get_b(hContact, "CList", "NotOnList", 0) == 1 || db_get_b(hContact, "CList", "Hidden", 0) == 1)
return;
- if (options.iShowPopUp2 > 0) {
- // Display PopUp
+ if (options.iShowPopup2 > 0) {
+ // Display Popup
POPUPDATAT ppd = {0};
ppd.lchContact = hContact;
ppd.lchIcon = hIcon;
_tcsncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GCDNF_TCHAR), MAX_CONTACTNAME);
_tcsncpy(ppd.lptzText, message, MAX_SECONDLINE);
if (!options.iUsePopupColors) {
- ppd.colorBack = options.iPopUpColorBack;
- ppd.colorText = options.iPopUpColorFore;
+ ppd.colorBack = options.iPopupColorBack;
+ ppd.colorText = options.iPopupColorFore;
}
ppd.PluginWindowProc = PopupDlgProcNoSet;
ppd.PluginData = NULL;
- ppd.iSeconds = options.iPopUpDelay;
+ ppd.iSeconds = options.iPopupDelay;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
if (options.iShowEvent2 > 0) {
@@ -499,7 +499,7 @@ int SettingChanged(WPARAM wParam, LPARAM lParam) if (prevStatus == ID_STATUS_OFFLINE) {
if (db_get_b(hContact, MODULE_NAME, "MissYou", 0)) {
- // Display PopUp
+ // Display Popup
POPUPDATAT_V2 ppd = {0};
ppd.cbSize = sizeof(ppd);
@@ -508,8 +508,8 @@ int SettingChanged(WPARAM wParam, LPARAM lParam) _tcsncpy(ppd.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME,(WPARAM)hContact,GCDNF_TCHAR), MAX_CONTACTNAME);
_tcsncpy(ppd.lptzText, TranslateT("You awaited this contact!"), MAX_SECONDLINE);
if (!options.iUsePopupColors) {
- ppd.colorBack = options.iPopUpColorBack;
- ppd.colorText = options.iPopUpColorFore;
+ ppd.colorBack = options.iPopupColorBack;
+ ppd.colorText = options.iPopupColorFore;
}
ppd.PluginWindowProc = MissYouPopupDlgProc;
ppd.PluginData = NULL;
@@ -555,7 +555,7 @@ int SettingChanged(WPARAM wParam, LPARAM lParam) ReturnNotify(hContact, message);
- if ((options.iShowMessageWindow == 0 && options.iShowUDetails == 0) || (options.iShowEvent == 0 && options.iShowPopUp == 0))
+ if ((options.iShowMessageWindow == 0 && options.iShowUDetails == 0) || (options.iShowEvent == 0 && options.iShowPopup == 0))
setLastSeen(hContact);
}
else setLastSeen(hContact);
diff --git a/plugins/BuddyExpectator/src/options.cpp b/plugins/BuddyExpectator/src/options.cpp index 18fe4fb056..1df594b9ed 100644 --- a/plugins/BuddyExpectator/src/options.cpp +++ b/plugins/BuddyExpectator/src/options.cpp @@ -36,19 +36,19 @@ void LoadOptions() options.iAbsencePeriod2 = db_get_dw(NULL, MODULE_NAME, "iAbsencePeriod2", 30 * 3);
options.iSilencePeriod = db_get_dw(NULL, MODULE_NAME, "iSilencePeriod", 30);
- options.iShowPopUp = db_get_b(NULL, MODULE_NAME, "iShowPopUp", 1);
+ options.iShowPopup = db_get_b(NULL, MODULE_NAME, "iShowPopup", 1);
options.iShowEvent = db_get_b(NULL, MODULE_NAME, "iShowEvent", 0);
options.iShowUDetails = db_get_b(NULL, MODULE_NAME, "iShowUDetails", 0);
options.iShowMessageWindow = db_get_b(NULL, MODULE_NAME, "iShowMessageWindow", 1);
- options.iPopUpColorBack = db_get_dw(NULL, MODULE_NAME, "iPopUpColorBack", DEF_COLOR_BACK);
- options.iPopUpColorFore = db_get_dw(NULL, MODULE_NAME, "iPopUpColorFore", DEF_COLOR_FORE);
+ options.iPopupColorBack = db_get_dw(NULL, MODULE_NAME, "iPopupColorBack", DEF_COLOR_BACK);
+ options.iPopupColorFore = db_get_dw(NULL, MODULE_NAME, "iPopupColorFore", DEF_COLOR_FORE);
options.iUsePopupColors = db_get_b(NULL, MODULE_NAME, "iUsePopupColors", 0);
options.iUseWinColors = db_get_b(NULL, MODULE_NAME, "iUseWinColors", 0);
- options.iPopUpDelay = db_get_b(NULL, MODULE_NAME, "iPopUpDelay", 0);
+ options.iPopupDelay = db_get_b(NULL, MODULE_NAME, "iPopupDelay", 0);
- options.iShowPopUp2 = db_get_b(NULL, MODULE_NAME, "iShowPopUp2", 1);
+ options.iShowPopup2 = db_get_b(NULL, MODULE_NAME, "iShowPopup2", 1);
options.iShowEvent2 = db_get_b(NULL, MODULE_NAME, "iShowEvent2", 0);
options.action2 = (GoneContactAction)db_get_b(NULL, MODULE_NAME, "Action2", (BYTE)GCA_NOACTION);
options.notifyFirstOnline = db_get_b(NULL, MODULE_NAME, "bShowFirstSight", 0) ? true : false;
@@ -63,12 +63,12 @@ void SaveOptions() db_set_dw(NULL, MODULE_NAME, "iAbsencePeriod2", options.iAbsencePeriod2);
db_set_dw(NULL, MODULE_NAME, "iSilencePeriod", options.iSilencePeriod);
- db_set_b(NULL, MODULE_NAME, "iShowPopUp", options.iShowPopUp);
+ db_set_b(NULL, MODULE_NAME, "iShowPopup", options.iShowPopup);
db_set_b(NULL, MODULE_NAME, "iShowEvent", options.iShowEvent);
db_set_b(NULL, MODULE_NAME, "iShowUDetails", options.iShowUDetails);
db_set_b(NULL, MODULE_NAME, "iShowMessageWindow", options.iShowMessageWindow);
- db_set_b(NULL, MODULE_NAME, "iShowPopUp2", options.iShowPopUp2);
+ db_set_b(NULL, MODULE_NAME, "iShowPopup2", options.iShowPopup2);
db_set_b(NULL, MODULE_NAME, "iShowEvent2", options.iShowEvent2);
db_set_b(NULL, MODULE_NAME, "Action2", (BYTE)options.action2);
db_set_b(NULL, MODULE_NAME, "bShowFirstSight", options.notifyFirstOnline ? 1 : 0);
@@ -78,12 +78,12 @@ void SaveOptions() void SavePopupOptions()
{
- db_set_dw(NULL, MODULE_NAME, "iPopUpColorBack", options.iPopUpColorBack);
- db_set_dw(NULL, MODULE_NAME, "iPopUpColorFore", options.iPopUpColorFore);
+ db_set_dw(NULL, MODULE_NAME, "iPopupColorBack", options.iPopupColorBack);
+ db_set_dw(NULL, MODULE_NAME, "iPopupColorFore", options.iPopupColorFore);
db_set_b(NULL, MODULE_NAME, "iUsePopupColors", options.iUsePopupColors);
db_set_b(NULL, MODULE_NAME, "iUseWinColors", options.iUseWinColors);
- db_set_b(NULL, MODULE_NAME, "iPopUpDelay", options.iPopUpDelay);
+ db_set_b(NULL, MODULE_NAME, "iPopupDelay", options.iPopupDelay);
}
/**
@@ -169,7 +169,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, SendMessage(GetDlgItem(hwndDlg, IDC_COMBO_PERIOD3), CB_SETCURSEL, 0, 0);
}
- SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP), BM_SETCHECK, options.iShowPopUp > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
+ SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP), BM_SETCHECK, options.iShowPopup > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_FLASHICON), BM_SETCHECK, options.iShowEvent > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_UDETAILS), BM_SETCHECK, (options.iShowUDetails > 0 ? BST_CHECKED : BST_UNCHECKED), 0);
SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_MSGWINDOW), BM_SETCHECK, (options.iShowMessageWindow > 0 ? BST_CHECKED : BST_UNCHECKED), 0);
@@ -177,7 +177,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_NOMSGS), BM_SETCHECK, options.hideInactive ? BST_CHECKED : BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_MISSYOU), BM_SETCHECK, options.enableMissYou ? BST_CHECKED : BST_UNCHECKED, 0);
- SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP2), BM_SETCHECK, options.iShowPopUp2 > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
+ SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP2), BM_SETCHECK, options.iShowPopup2 > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_FLASHICON2), BM_SETCHECK, options.iShowEvent2 > 0 ? BST_CHECKED : BST_UNCHECKED, 0);
SendMessage(GetDlgItem(hwndDlg, IDC_COMBO_ACTIONS), CB_RESETCONTENT, 0, 0);
@@ -230,7 +230,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, default: options.iSilencePeriod = num; break;
}
- options.iShowPopUp = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
+ options.iShowPopup = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
options.iShowEvent = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_FLASHICON), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
options.iShowUDetails = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_UDETAILS), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
options.iShowMessageWindow = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_MSGWINDOW), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
@@ -238,7 +238,7 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, options.hideInactive = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_NOMSGS), BM_GETCHECK, 0, 0) == BST_CHECKED ? true : false;
options.enableMissYou = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_MISSYOU), BM_GETCHECK, 0, 0) == BST_CHECKED ? true : false;
- options.iShowPopUp2 = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP2), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
+ options.iShowPopup2 = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_POPUP2), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
options.iShowEvent2 = SendMessage(GetDlgItem(hwndDlg, IDC_CHECK_FLASHICON2), BM_GETCHECK, 0, 0) == BST_CHECKED ? 1:0;
options.action2 = (GoneContactAction)SendMessage(GetDlgItem(hwndDlg, IDC_COMBO_ACTIONS), CB_GETCURSEL, 0, 0);
@@ -264,9 +264,9 @@ static INT_PTR CALLBACK OptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, }
/**
- * PopUp Options panel function
+ * Popup Options panel function
*/
-static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK PopupOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
static int ChangeLock = 0;
switch (uMsg) {
@@ -274,11 +274,11 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP ChangeLock++;
TranslateDialogDefault(hwndDlg);
- //iPopUpColorBack
- SendDlgItemMessage(hwndDlg, IDC_COLOR_BGR, CPM_SETCOLOUR, 0, options.iPopUpColorBack);
+ //iPopupColorBack
+ SendDlgItemMessage(hwndDlg, IDC_COLOR_BGR, CPM_SETCOLOUR, 0, options.iPopupColorBack);
- //iPopUpColorFore
- SendDlgItemMessage(hwndDlg, IDC_COLOR_FRG, CPM_SETCOLOUR, 0, options.iPopUpColorFore);
+ //iPopupColorFore
+ SendDlgItemMessage(hwndDlg, IDC_COLOR_FRG, CPM_SETCOLOUR, 0, options.iPopupColorFore);
if (options.iUsePopupColors) {
CheckDlgButton(hwndDlg, IDC_COLORS_POPUP, BST_CHECKED);
@@ -294,19 +294,19 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP EnableWindow(GetDlgItem(hwndDlg, IDC_COLORS_POPUP), false);
}
- //iPopUpDelay
+ //iPopupDelay
SetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, 5, FALSE);
- if (options.iPopUpDelay < 0) {
+ if (options.iPopupDelay < 0) {
SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_PERM), BM_SETCHECK, BST_CHECKED, 0);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_POPUPDELAY), false);
}
- else if(options.iPopUpDelay == 0) {
+ else if(options.iPopupDelay == 0) {
SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_DEF), BM_SETCHECK, BST_CHECKED, 0);
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_POPUPDELAY), false);
}
else {
SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_CUST), BM_SETCHECK, BST_CHECKED, 0);
- SetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, options.iPopUpDelay, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, options.iPopupDelay, FALSE);
}
ChangeLock--;
@@ -317,12 +317,12 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP POPUPDATAT ppd;
ZeroMemory(&ppd, sizeof(ppd));
- //iPopUpDelay
- options.iPopUpDelay = GetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, 0, FALSE);
+ //iPopupDelay
+ options.iPopupDelay = GetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, 0, FALSE);
if (SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_PERM), BM_GETCHECK, 0, 0) == BST_CHECKED)
- options.iPopUpDelay = -1;
+ options.iPopupDelay = -1;
else if (SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_DEF), BM_GETCHECK, 0, 0) == BST_CHECKED)
- options.iPopUpDelay = 0;
+ options.iPopupDelay = 0;
ppd.lchContact = NULL;
ppd.lchIcon = hIcon;
@@ -343,7 +343,7 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP ppd.colorText = SendDlgItemMessage(hwndDlg, IDC_COLOR_FRG, CPM_GETCOLOUR, 0, 0);
}
ppd.PluginData = NULL;
- ppd.iSeconds = options.iPopUpDelay;
+ ppd.iSeconds = options.iPopupDelay;
CallService(MS_POPUP_ADDPOPUPT, (WPARAM) &ppd, APF_NO_HISTORY);
@@ -400,21 +400,21 @@ static INT_PTR CALLBACK PopUpOptionsFrameProc(HWND hwndDlg, UINT uMsg, WPARAM wP else if (IsDlgButtonChecked(hwndDlg, IDC_COLORS_WIN)) {
options.iUseWinColors = 1;
options.iUsePopupColors = 0;
- options.iPopUpColorBack = GetSysColor(COLOR_BTNFACE);
- options.iPopUpColorFore = GetSysColor(COLOR_WINDOWTEXT);
+ options.iPopupColorBack = GetSysColor(COLOR_BTNFACE);
+ options.iPopupColorFore = GetSysColor(COLOR_WINDOWTEXT);
}
else {
options.iUseWinColors = options.iUsePopupColors = 0;
- options.iPopUpColorBack = SendDlgItemMessage(hwndDlg, IDC_COLOR_BGR, CPM_GETCOLOUR, 0, 0);
- options.iPopUpColorFore = SendDlgItemMessage(hwndDlg, IDC_COLOR_FRG, CPM_GETCOLOUR, 0, 0);
+ options.iPopupColorBack = SendDlgItemMessage(hwndDlg, IDC_COLOR_BGR, CPM_GETCOLOUR, 0, 0);
+ options.iPopupColorFore = SendDlgItemMessage(hwndDlg, IDC_COLOR_FRG, CPM_GETCOLOUR, 0, 0);
}
- //iPopUpDelay
- options.iPopUpDelay = GetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, 0, FALSE);
+ //iPopupDelay
+ options.iPopupDelay = GetDlgItemInt(hwndDlg, IDC_EDIT_POPUPDELAY, 0, FALSE);
if (SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_PERM), BM_GETCHECK, 0, 0) == BST_CHECKED)
- options.iPopUpDelay = -1;
+ options.iPopupDelay = -1;
else if (SendMessage(GetDlgItem(hwndDlg, IDC_DELAY_DEF), BM_GETCHECK, 0, 0) == BST_CHECKED)
- options.iPopUpDelay = 0;
+ options.iPopupDelay = 0;
// save value to the DB
SavePopupOptions();
@@ -442,9 +442,9 @@ static int OptionsInit(WPARAM wParam, LPARAM lParam) Options_AddPage(wParam, &odp);
if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPPANEL);
- odp.pfnDlgProc = PopUpOptionsFrameProc;
+ odp.pfnDlgProc = PopupOptionsFrameProc;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/BuddyExpectator/src/options.h b/plugins/BuddyExpectator/src/options.h index 87e1f5e931..8534badb8e 100644 --- a/plugins/BuddyExpectator/src/options.h +++ b/plugins/BuddyExpectator/src/options.h @@ -31,7 +31,7 @@ typedef enum GoneContactAction { GCA_NOACTION, GCA_DELETE, GCA_UDETAILS, GCA_MES typedef struct {
int iAbsencePeriod; // notify period for returning contacts
- int iShowPopUp;
+ int iShowPopup;
int iShowEvent;
int iShowUDetails;
int iShowMessageWindow;
@@ -42,15 +42,15 @@ typedef struct { byte MissYouIcon;
int iAbsencePeriod2; // notify period for contacts that have remained away
- int iShowPopUp2;
+ int iShowPopup2;
int iShowEvent2;
GoneContactAction action2;
int iSilencePeriod; // notify period for contacts that didn't send messages
- int iPopUpColorBack;
- int iPopUpColorFore;
- int iPopUpDelay;
+ int iPopupColorBack;
+ int iPopupColorFore;
+ int iPopupDelay;
int iUsePopupColors;
int iUseWinColors;
diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 61da136140..0c350a8062 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -178,7 +178,7 @@ int OnOptionsInitialise(WPARAM wParam, LPARAM lParam) if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP_OPTION_FORM);
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.pfnDlgProc = DlgPopupsProcOptions;
Options_AddPage(wParam, &odp);
}
@@ -230,12 +230,12 @@ int CALLBACK CKLPopupDlgProc(HWND hWnd, UINT uiMessage, WPARAM wParam, LPARAM lP if (HIWORD(wParam) == STN_CLICKED) {
if (!IsBadStringPtr(ptszPopupText, MaxTextSize))
CopyTextToClipboard(ptszPopupText);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
break;
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_POPUPACTION:
diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp index 9809c4d3a4..387eef44de 100644 --- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp +++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp @@ -126,7 +126,7 @@ void Popup_DoAction(HWND hWnd, BYTE Action, PLUGIN_DATA *pdata) break;
}
case PCA_CLOSEPOPUP: // close popup
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case PCA_DONOTHING: // do nothing
@@ -196,7 +196,7 @@ void ShowPopup(SHOWPOPUP_DATA *sd) pdata->PopupRClickAction = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_RCLICK_ACTION);
ppd.iSeconds = sd->PopupOptPage->GetValue(IDC_POPUPOPTDLG_POPUPDELAY);
ppd.PluginData = pdata;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
int ContactSettingChanged(WPARAM wParam, LPARAM lParam)
@@ -345,7 +345,7 @@ static int PrebuildMainMenu(WPARAM wParam, LPARAM lParam) mi.ptszName = LPGENT("Enable c&lient change notification");
mi.hIcon = Skin_GetIcon("popup_disabled");
}
- mi.ptszPopupName = LPGENT("PopUps");
+ mi.ptszPopupName = LPGENT("Popups");
Menu_ModifyItem(g_hTogglePopupsMenuItem, &mi);
}
return 0;
@@ -406,7 +406,7 @@ int MirandaLoaded(WPARAM wParam, LPARAM lParam) mi.ptszName = LPGENT("Enable c&lient change notification");
mi.pszService = MS_CCN_TOGGLEPOPUPS;
- mi.ptszPopupName = LPGENT("PopUps");
+ mi.ptszPopupName = LPGENT("Popups");
g_hTogglePopupsMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/ClientChangeNotify/src/Misc.h b/plugins/ClientChangeNotify/src/Misc.h index 6853fcc442..e64855bb5b 100644 --- a/plugins/ClientChangeNotify/src/Misc.h +++ b/plugins/ClientChangeNotify/src/Misc.h @@ -31,7 +31,7 @@ __inline void ShowMsg(TCHAR *FirstLine, TCHAR *SecondLine = _T(""), bool IsError ppd.colorBack = IsErrorMsg ? 0x0202E3 : 0xE8F1FD;
ppd.colorText = IsErrorMsg ? 0xE8F1FD : 0x000000;
ppd.iSeconds = Timeout;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
} else
{
MessageBox(NULL, SecondLine, FirstLine, MB_OK | (IsErrorMsg ? MB_ICONEXCLAMATION : MB_ICONINFORMATION));
diff --git a/plugins/ClientChangeNotify/src/OptDlg.cpp b/plugins/ClientChangeNotify/src/OptDlg.cpp index 7edc46a53c..9de39b0705 100644 --- a/plugins/ClientChangeNotify/src/OptDlg.cpp +++ b/plugins/ClientChangeNotify/src/OptDlg.cpp @@ -180,7 +180,7 @@ int OptionsDlgInit(WPARAM wParam, LPARAM lParam) optDi.pfnDlgProc = PopupOptDlg;
optDi.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPOPTDLG);
optDi.hInstance = g_hInstance;
- optDi.ptszGroup = LPGENT("PopUps");
+ optDi.ptszGroup = LPGENT("Popups");
optDi.flags = ODPF_BOLDGROUPS | ODPF_TCHAR;
Options_AddPage(wParam, &optDi);
}
diff --git a/plugins/Clist_modern/src/modern_popup.cpp b/plugins/Clist_modern/src/modern_popup.cpp index 0064089438..8e2f0e0645 100644 --- a/plugins/Clist_modern/src/modern_popup.cpp +++ b/plugins/Clist_modern/src/modern_popup.cpp @@ -71,7 +71,7 @@ void ShowPopup(const char *title, const char *description, int type) }
ppd.PluginWindowProc = DumbPopupDlgProc;
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
// Handle to popup events
@@ -79,11 +79,11 @@ static LRESULT CALLBACK DumbPopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, {
switch(message) {
case WM_COMMAND:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
case UM_FREEPLUGINDATA:
diff --git a/plugins/CrashDumper/src/ui.cpp b/plugins/CrashDumper/src/ui.cpp index d7366d24b9..e9563cd127 100644 --- a/plugins/CrashDumper/src/ui.cpp +++ b/plugins/CrashDumper/src/ui.cpp @@ -272,7 +272,7 @@ LRESULT CALLBACK DlgProcPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) {
switch (msg) {
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case WM_COMMAND:
@@ -292,7 +292,7 @@ LRESULT CALLBACK DlgProcPopup(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam) break;
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
@@ -321,7 +321,7 @@ void ShowMessage(int type, const TCHAR* format, ...) pi.PluginWindowProc = DlgProcPopup;
pi.PluginData = (void*)type;
- PUAddPopUpT(&pi);
+ PUAddPopupT(&pi);
}
else
MessageBox(NULL, pi.lptzText, TEXT(PluginName), MB_OK | MB_ICONINFORMATION);
diff --git a/plugins/DbEditorPP/src/headers.h b/plugins/DbEditorPP/src/headers.h index 6bbc0b84cc..e8bf749c18 100644 --- a/plugins/DbEditorPP/src/headers.h +++ b/plugins/DbEditorPP/src/headers.h @@ -168,7 +168,7 @@ extern int Mode; extern int Hex;
extern int Order;
-extern BOOL usePopUps;
+extern BOOL usePopups;
#define NAMEORDERCOUNT 8
diff --git a/plugins/DbEditorPP/src/main.cpp b/plugins/DbEditorPP/src/main.cpp index 9dbef4d387..11641cc3bb 100644 --- a/plugins/DbEditorPP/src/main.cpp +++ b/plugins/DbEditorPP/src/main.cpp @@ -4,7 +4,7 @@ HINSTANCE hInst = NULL; HANDLE hTTBButt = NULL;
BOOL bServiceMode = FALSE;
-BOOL usePopUps;
+BOOL usePopups;
HWND hwnd2watchedVarsWindow;
int hLangpack;
BYTE nameOrder[NAMEORDERCOUNT];
@@ -85,7 +85,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam) }
}
// watch list
- if (!hwnd2watchedVarsWindow && !usePopUps) return 0;
+ if (!hwnd2watchedVarsWindow && !usePopups) return 0;
for (i=0; i<WatchListArray.count; i++)
{
@@ -95,7 +95,7 @@ int DBSettingChanged(WPARAM wParam,LPARAM lParam) {
if (!WatchListArray.item[i].setting || !mir_strcmp(cws->szSetting, WatchListArray.item[i].setting))
{
- if (usePopUps)
+ if (usePopups)
popupWatchedVar(hContact, cws->szModule, cws->szSetting);
if (hwnd2watchedVarsWindow)
PopulateWatchedWindow(GetDlgItem(hwnd2watchedVarsWindow, IDC_VARS));
@@ -221,7 +221,7 @@ int ModulesLoaded(WPARAM wParam,LPARAM lParam) db_free(&dbv);
UnhookEvent(hModulesLoadedHook);
- usePopUps = db_get_b(NULL,modname,"UsePopUps",0);
+ usePopups = db_get_b(NULL,modname,"UsePopups",0);
// Load the name order
for(i=0; i < NAMEORDERCOUNT; i++)
diff --git a/plugins/DbEditorPP/src/options.cpp b/plugins/DbEditorPP/src/options.cpp index 17d69981d6..e877ae6411 100644 --- a/plugins/DbEditorPP/src/options.cpp +++ b/plugins/DbEditorPP/src/options.cpp @@ -14,7 +14,7 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) CheckDlgButton(hwnd,IDC_USEKNOWNMODS,db_get_b(NULL,modname,"UseKnownModList",0));
CheckDlgButton(hwnd,IDC_WARNONDEL,db_get_b(NULL,modname,"WarnOnDelete",1));
CheckDlgButton(hwnd,IDC_MENU,db_get_b(NULL,modname,"UserMenuItem",0));
- CheckDlgButton(hwnd,IDC_POPUPS,usePopUps);
+ CheckDlgButton(hwnd,IDC_POPUPS,usePopups);
if (!db_get(NULL,modname,"CoreModules",&dbv) && dbv.type == DBVT_ASCIIZ)
SetDlgItemText(hwnd,IDC_MODULES,dbv.pszVal);
db_free(&dbv);
@@ -57,8 +57,8 @@ INT_PTR CALLBACK DlgProcOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) db_set_b(NULL,modname,"WarnOnDelete",(BYTE)IsDlgButtonChecked(hwnd,IDC_WARNONDEL));
db_set_b(NULL,modname,"UserMenuItem",(BYTE)IsDlgButtonChecked(hwnd,IDC_MENU));
db_set_b(NULL,modname,"UseKnownModList",(BYTE)IsDlgButtonChecked(hwnd,IDC_USEKNOWNMODS));
- usePopUps = IsDlgButtonChecked(hwnd,IDC_POPUPS);
- db_set_b(NULL,modname,"UsePopUps",(BYTE)usePopUps);
+ usePopups = IsDlgButtonChecked(hwnd,IDC_POPUPS);
+ db_set_b(NULL,modname,"UsePopups",(BYTE)usePopups);
if (GetDlgItemText(hwnd,IDC_MODULES,mods,4096))
db_set_s(NULL,modname,"CoreModules",mods);
db_set_w(NULL,modname,"PopupDelay",(WORD)GetDlgItemInt(hwnd,IDC_POPUPTIMEOUT,NULL,0));
diff --git a/plugins/DbEditorPP/src/watchedvars.cpp b/plugins/DbEditorPP/src/watchedvars.cpp index 865029c358..fd11054e49 100644 --- a/plugins/DbEditorPP/src/watchedvars.cpp +++ b/plugins/DbEditorPP/src/watchedvars.cpp @@ -336,5 +336,5 @@ void popupWatchedVar(HANDLE hContact,const char* module,const char* setting) ppd.colorBack = colorBack;
ppd.colorText = colorText;
ppd.iSeconds = timeout ? timeout : -1;
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp index 207a5036c0..5566dc0b51 100644 --- a/plugins/Db_autobackups/src/main.cpp +++ b/plugins/Db_autobackups/src/main.cpp @@ -130,7 +130,7 @@ void ShowPopup(TCHAR* text, TCHAR* header) lstrcpy(ppd.lptzContactName, header);
ppd.lchIcon = Skin_GetIcon("backup");
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
int CreateDirectoryTree(TCHAR *szDir)
diff --git a/plugins/ExternalAPI/m_account.h b/plugins/ExternalAPI/m_account.h index ec28f02438..d8441578eb 100644 --- a/plugins/ExternalAPI/m_account.h +++ b/plugins/ExternalAPI/m_account.h @@ -44,7 +44,7 @@ enum typedef struct CNotification
{
//#define YAMN_NOTIFICATIONVERSION is not implemented, use YAMN_ACCOUNTVERSION instead
- CNotification(): PopUpB(0), PopUpT(0), PopUpTime(0), App(NULL), AppParam(NULL), Sound(NULL), TrayIcon1(NULL), TrayIcon2(NULL) {}
+ CNotification(): PopupB(0), PopupT(0), PopupTime(0), App(NULL), AppParam(NULL), Sound(NULL), TrayIcon1(NULL), TrayIcon2(NULL) {}
#define YAMN_ACC_SND 0x00000001 //Plays sound (1)
#define YAMN_ACC_MSG 0x00000002 //Shows dialog
@@ -61,9 +61,9 @@ typedef struct CNotification //(1) - usable only in newmail notification
DWORD Flags;
- COLORREF PopUpB;
- COLORREF PopUpT;
- DWORD PopUpTime;
+ COLORREF PopupB;
+ COLORREF PopupT;
+ DWORD PopupTime;
WCHAR *App;
WCHAR *AppParam;
diff --git a/plugins/ExternalAPI/m_popup2.h b/plugins/ExternalAPI/m_popup2.h index ceb9925a3c..3ddd798454 100644 --- a/plugins/ExternalAPI/m_popup2.h +++ b/plugins/ExternalAPI/m_popup2.h @@ -1,12 +1,12 @@ /*
===============================================================================
- PopUp plugin
-Plugin Name: PopUp
+ Popup plugin
+Plugin Name: Popup
Plugin authors: Luca Santarelli aka hrk (hrk@users.sourceforge.net)
Victor Pavlychko (nullbie@gmail.com)
===============================================================================
The purpose of this plugin is to give developers a common "platform/interface"
-to show PopUps. It is born from the source code of NewStatusNotify, another
+to show Popups. It is born from the source code of NewStatusNotify, another
plugin I've made.
Remember that users *must* have this plugin enabled, or they won't get any
@@ -154,14 +154,14 @@ typedef struct typedef LPPOPUPDATAW_V2 LPPOPUPDATAT_V2;
#endif
-/* PopUp/AddPopup
+/* Popup/AddPopup
Creates, adds and shows a popup, given a (valid) POPUPDATA structure pointer.
-wParam = (WPARAM)(*POPUPDATA)PopUpDataAddress
+wParam = (WPARAM)(*POPUPDATA)PopupDataAddress
lParam = 0
-Returns: > 0 on success, 0 if creation went bad, -1 if the PopUpData contained unacceptable values.
-NOTE: it returns -1 if the PopUpData was not valid, if there were already too many popups, if the module was disabled.
+Returns: > 0 on success, 0 if creation went bad, -1 if the PopupData contained unacceptable values.
+NOTE: it returns -1 if the PopupData was not valid, if there were already too many popups, if the module was disabled.
Otherwise, it can return anything else...
Popup Plus 2.0.4.0+
@@ -175,13 +175,13 @@ additional APF_ flags */ #define APF_NO_POPUP 0x08 //do not show popup. this is useful if you want popup yo be stored in history only
#define APF_NEWDATA 0x10 //deprecatet!! only for use with old POPUPDATAEX_V2/POPUPDATAW_V2 structs
-static INT_PTR __inline PUAddPopUpW(POPUPDATAW_V2* ppdp) {
+static INT_PTR __inline PUAddPopupW(POPUPDATAW_V2* ppdp) {
return CallService(MS_POPUP_ADDPOPUPW, (WPARAM)ppdp,0);
}
-#define MS_POPUP_CHANGEW "PopUp/ChangeW"
-static int __inline PUChangeW(HWND hWndPopUp, POPUPDATAW_V2 *newData) {
- return (int)CallService(MS_POPUP_CHANGEW, (WPARAM)hWndPopUp, (LPARAM)newData);
+#define MS_POPUP_CHANGEW "Popup/ChangeW"
+static int __inline PUChangeW(HWND hWndPopup, POPUPDATAW_V2 *newData) {
+ return (int)CallService(MS_POPUP_CHANGEW, (WPARAM)hWndPopup, (LPARAM)newData);
}
/* UM_CHANGEPOPUP
@@ -225,9 +225,9 @@ typedef struct } POPUPACTIONID, *LPPOPUPACTIONID;
#define UM_POPUPMODIFYACTIONICON (WM_USER + 0x0205)
-static int __inline PUModifyActionIcon(HWND hWndPopUp, WPARAM wParam, LPARAM lParam, HICON hIcon) {
+static int __inline PUModifyActionIcon(HWND hWndPopup, WPARAM wParam, LPARAM lParam, HICON hIcon) {
POPUPACTIONID actionId = { wParam, lParam };
- return (int)SendMessage(hWndPopUp, UM_POPUPMODIFYACTIONICON, (WPARAM)&actionId, (LPARAM)hIcon);
+ return (int)SendMessage(hWndPopup, UM_POPUPMODIFYACTIONICON, (WPARAM)&actionId, (LPARAM)hIcon);
}
/* UM_POPUPSHOW
@@ -238,7 +238,7 @@ lParam = y */
#define UM_POPUPSHOW (WM_USER + 0x0206)
-/* PopUp/RegisterActions
+/* Popup/RegisterActions
Registers your action in popup action list
wParam = (WPARAM)(LPPOPUPACTION)actions
@@ -246,13 +246,13 @@ lParam = (LPARAM)actionCount Returns: 0 if the popup was shown, -1 in case of failure.
*/
-#define MS_POPUP_REGISTERACTIONS "PopUp/RegisterActions"
+#define MS_POPUP_REGISTERACTIONS "Popup/RegisterActions"
static int __inline PURegisterActions(LPPOPUPACTION actions, int count) {
return (int)CallService(MS_POPUP_REGISTERACTIONS, (WPARAM)actions,(LPARAM)count);
}
-/* PopUp/RegisterNotification
+/* Popup/RegisterNotification
Registers your action in popup action list
wParam = (WPARAM)(LPPOPUPNOTIFICATION)info
@@ -260,7 +260,7 @@ lParam = 0 Returns: handle of registered notification or sero on failure
*/
-#define MS_POPUP_REGISTERNOTIFICATION "PopUp/RegisterNotification"
+#define MS_POPUP_REGISTERNOTIFICATION "Popup/RegisterNotification"
#define PNAF_CALLBACK 0x01
@@ -314,7 +314,7 @@ static HANDLE __inline PURegisterNotification(LPPOPUPNOTIFICATION notification) return (HANDLE)CallService(MS_POPUP_REGISTERNOTIFICATION, (WPARAM)notification, 0);
}
-/* PopUp/UnhookEventAsync
+/* Popup/UnhookEventAsync
Using of "UnhookEvent" inside PluginWindowProc in conjunction with HookEventMessage
may cause deadlocks. Use this service instead. It will queue event unhook into main
thread and notify you when everything has finished.
@@ -335,7 +335,7 @@ lParam = (LPARAM)(HANDLE)hEvent Returns: 0 if everything gone ok. -1 if service was not found (and unsafe unhook was performed)
*/
-#define MS_POPUP_UNHOOKEVENTASYNC "PopUp/UnhookEventAsync"
+#define MS_POPUP_UNHOOKEVENTASYNC "Popup/UnhookEventAsync"
/* UM_POPUPUNHOOKCOMPLETE
Modify Popup Action Icon
@@ -355,30 +355,30 @@ static int __inline PUUnhookEventAsync(HWND hwndPopup, HANDLE hEvent) { return 0;
}
-/* PopUp/GetStatus
+/* Popup/GetStatus
Returns 1 when popups are showen and 0 when not
wParam = 0
lParam = 0
*/
-#define MS_POPUP_GETSTATUS "PopUp/GetStatus"
+#define MS_POPUP_GETSTATUS "Popup/GetStatus"
#ifdef __cplusplus
-/* PopUp/RegisterVfx
+/* Popup/RegisterVfx
Register new animation (fade in/out) effect
wParam = 0
lParam = (LPARAM)(char *)vfx_name
*/
-#define MS_POPUP_REGISTERVFX "PopUp/RegisterVfx"
+#define MS_POPUP_REGISTERVFX "Popup/RegisterVfx"
-/* PopUp/Vfx/<vfx_name>
+/* Popup/Vfx/<vfx_name>
Define this service to create vfx instance
wParam = 0
lParam = 0
return = (int)(IPopupPlusEffect *)vfx
*/
-#define MS_POPUP_CREATEVFX "PopUp/Vfx/"
+#define MS_POPUP_CREATEVFX "Popup/Vfx/"
class IPopupPlusEffect
{
@@ -393,9 +393,9 @@ public: #endif // __cplusplus
-/* PopUp/ShowMessage
+/* Popup/ShowMessage
This is mainly for developers.
-Shows a warning message in a PopUp. It's useful if you need a "MessageBox" like function, but you don't want a modal
+Shows a warning message in a Popup. It's useful if you need a "MessageBox" like function, but you don't want a modal
window (which will interfere with a DialogProcedure. MessageBox steals focus and control, this one not.
wParam = (char *)lpzMessage
@@ -409,8 +409,8 @@ Returns: 0 if the popup was shown, -1 in case of failure. additional SM_ flags */
#define SM_ERROR 0x03 //Cross icon.
#ifndef MS_POPUP_SHOWMESSAGE
-#define MS_POPUP_SHOWMESSAGE "PopUp/ShowMessage"
-#define MS_POPUP_SHOWMESSAGEW "PopUp/ShowMessageW"
+#define MS_POPUP_SHOWMESSAGE "Popup/ShowMessage"
+#define MS_POPUP_SHOWMESSAGEW "Popup/ShowMessageW"
#endif
#endif // __m_popup2_h__
diff --git a/plugins/ExternalAPI/m_weather.h b/plugins/ExternalAPI/m_weather.h index 492fbf4521..f76ab88db1 100644 --- a/plugins/ExternalAPI/m_weather.h +++ b/plugins/ExternalAPI/m_weather.h @@ -143,7 +143,7 @@ Condition_Changed is true; otherwise is false. #define ME_WEATHER_UPDATED "Miranda/Weather/Updated"
/*
-Shows a warning message for Weather PopUp.
+Shows a warning message for Weather Popup.
wParam = (char*) lpzMessage
lParam = Type
Type can either be SM_WARNING, SM_NOTIFY, or SM_WEATHERALERT
diff --git a/plugins/FileAsMessage/src/dialog.cpp b/plugins/FileAsMessage/src/dialog.cpp index 466525ce88..8add3a7720 100644 --- a/plugins/FileAsMessage/src/dialog.cpp +++ b/plugins/FileAsMessage/src/dialog.cpp @@ -192,7 +192,7 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM switch(message) {
case WM_COMMAND:
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, 0);
if(IsWindow(hDlg))
@@ -205,7 +205,7 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM break;
}
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
return TRUE; //TRUE or FALSE is the same, it gets ignored.
@@ -235,7 +235,7 @@ void MakePopupMsg(HWND hDlg, HANDLE hContact, char *msg) ppd.PluginWindowProc = (WNDPROC)PopupDlgProc;
ppd.PluginData = (void*)hDlg;
ppd.iSeconds = -1;
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
//
// Get ID of string message
diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp index abc8cc508e..54ac718701 100644 --- a/plugins/FloatingContacts/src/main.cpp +++ b/plugins/FloatingContacts/src/main.cpp @@ -468,7 +468,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, // Popup message dialog
//if (pThumb) pThumb->ThumbDeselect( TRUE );
if (!fcOpt.bUseSingleClick && pThumb)
- pThumb->PopUpMessageDialog();
+ pThumb->PopupMessageDialog();
break;
case WM_RBUTTONDOWN:
@@ -491,7 +491,7 @@ static LRESULT __stdcall CommWndProc( HWND hwnd, {
ThumbInfo *pThumb = thumbList.FindThumb( ( HWND )wParam );
- if (pThumb) pThumb->PopUpMessageDialog();
+ if (pThumb) pThumb->PopupMessageDialog();
}
default:
diff --git a/plugins/FloatingContacts/src/thumbs.cpp b/plugins/FloatingContacts/src/thumbs.cpp index c56bff0840..c75ff5c756 100644 --- a/plugins/FloatingContacts/src/thumbs.cpp +++ b/plugins/FloatingContacts/src/thumbs.cpp @@ -441,7 +441,7 @@ void ThumbInfo::OnLButtonUp() RECT rcOverlap;
if (!bMouseMoved && fcOpt.bUseSingleClick && bMouseIn){
- PopUpMessageDialog();
+ PopupMessageDialog();
}
//ThumbDeselect( TRUE );
@@ -828,7 +828,7 @@ void ThumbInfo::UpdateContent() }
}
-void ThumbInfo::PopUpMessageDialog( )
+void ThumbInfo::PopupMessageDialog( )
{
CallService( MS_CLIST_CONTACTDOUBLECLICKED, (WPARAM)hContact, 0 );
}
diff --git a/plugins/FloatingContacts/src/thumbs.h b/plugins/FloatingContacts/src/thumbs.h index 6ea6823273..a6187e1315 100644 --- a/plugins/FloatingContacts/src/thumbs.h +++ b/plugins/FloatingContacts/src/thumbs.h @@ -48,7 +48,7 @@ public: void SetThumbOpacity (BYTE btAlpha);
void KillTip ();
void UpdateContent ();
- void PopUpMessageDialog ();
+ void PopupMessageDialog ();
void OnTimer (BYTE idTimer);
};
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 19193efdd4..9af17158e9 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -1379,7 +1379,7 @@ void CALLBACK MainThreadCallback(ULONG_PTR dwParam) { if (db_get_b(NULL, MODULE, "WriteLogFile", 0) != 0) {
LogEvent(pclData->lpzContactName, pclData->lpzText);
}
- PUAddPopUpT(pclData);
+ PUAddPopupT(pclData);
delete pclData;
}
@@ -1417,11 +1417,11 @@ LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM //QueueUserAPC(OpenStatisticViewFromPopupProc, hMainThread, 0);
QueueUserAPC(OpenStatisticViewFromPopupProc, hMainThread, 0);
- PUDeletePopUp( hWnd );
+ PUDeletePopup( hWnd );
return 0;
case WM_CONTEXTMENU: {
- PUDeletePopUp( hWnd );
+ PUDeletePopup( hWnd );
return 0;
}
}
diff --git a/plugins/MenuItemEx/src/main.cpp b/plugins/MenuItemEx/src/main.cpp index b3e5ae126e..ce77c69938 100644 --- a/plugins/MenuItemEx/src/main.cpp +++ b/plugins/MenuItemEx/src/main.cpp @@ -21,7 +21,7 @@ HGENMENU hmenuVis,hmenuOff,hmenuHide,hmenuIgnore,hmenuProto,hmenuAdded,hmenuAuth HGENMENU hmenuCopyID,hmenuRecvFiles,hmenuStatusMsg,hmenuCopyIP,hmenuCopyMirVer;
static HGENMENU hIgnoreItem[9], hProtoItem[MAX_PROTOS];
HICON hIcon[5];
-BOOL bMetaContacts = FALSE, bPopUpService = FALSE;
+BOOL bMetaContacts = FALSE, bPopupService = FALSE;
PROTOACCOUNT **accs;
OPENOPTIONSDIALOG ood;
int protoCount;
@@ -229,7 +229,7 @@ void ShowPopup(char* szText, TCHAR* tszText, HANDLE hContact) _tcsncpy(ppd.lptzText, text, MAX_SECONDLINE - 1);
ppd.iSeconds = -1;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
mir_free(text);
}
@@ -649,7 +649,7 @@ INT_PTR onCopyID(WPARAM wparam,LPARAM lparam) else strcpy(buffer, szID);
CopyToClipboard((HWND)lparam, buffer, 0);
- if (CTRL_IS_PRESSED && bPopUpService)
+ if (CTRL_IS_PRESSED && bPopupService)
ShowPopup(buffer, 0, hContact);
return 0;
@@ -689,7 +689,7 @@ INT_PTR onCopyStatusMsg(WPARAM wparam,LPARAM lparam) }
CopyToClipboard((HWND)lparam, 0, buffer);
- if (CTRL_IS_PRESSED && bPopUpService)
+ if (CTRL_IS_PRESSED && bPopupService)
ShowPopup(0, buffer, (HANDLE)wparam);
return 0;
@@ -703,7 +703,7 @@ INT_PTR onCopyIP(WPARAM wparam,LPARAM lparam) getIP((HANDLE)wparam,szProto,(LPSTR)&szIP);
CopyToClipboard((HWND)lparam, szIP, 0);
- if (CTRL_IS_PRESSED && bPopUpService)
+ if (CTRL_IS_PRESSED && bPopupService)
ShowPopup(szIP, 0, (HANDLE)wparam);
return 0;
@@ -714,7 +714,7 @@ INT_PTR onCopyMirVer(WPARAM wparam,LPARAM lparam) LPSTR msg = getMirVer((HANDLE)wparam);
if (msg) {
CopyToClipboard((HWND)lparam, msg, 0);
- if (CTRL_IS_PRESSED && bPopUpService)
+ if (CTRL_IS_PRESSED && bPopupService)
ShowPopup(msg, 0, (HANDLE)wparam);
mir_free(msg);
@@ -1056,7 +1056,7 @@ static int ContactSettingChanged( WPARAM wParam, LPARAM lParam ) static int ModuleLoad(WPARAM wParam, LPARAM lParam)
{
- bPopUpService = ServiceExists(MS_POPUP_ADDPOPUP);
+ bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);
bMetaContacts = ServiceExists(MS_MC_GETMETACONTACT);
return 0;
}
diff --git a/plugins/MenuItemEx/src/options.cpp b/plugins/MenuItemEx/src/options.cpp index 2622d13692..e1695ee706 100644 --- a/plugins/MenuItemEx/src/options.cpp +++ b/plugins/MenuItemEx/src/options.cpp @@ -1,7 +1,7 @@ #include "menuex.h"
extern HINSTANCE hinstance;
-extern BOOL bPopUpService;
+extern BOOL bPopupService;
struct {
int idc;
@@ -45,7 +45,7 @@ INT_PTR CALLBACK OptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam) CheckDlgButton(hdlg, checkboxes[i].idc, (flags & checkboxes[i].flag) ? BST_CHECKED : BST_UNCHECKED);
}
- if (bPopUpService)
+ if (bPopupService)
{
for (i = 0; i < 4; i++)
{
diff --git a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp index 0b94d69c66..6ed476f1cf 100644 --- a/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp +++ b/plugins/MirOTR/MirOTR/src/mirotrmenu.cpp @@ -193,9 +193,9 @@ void InitMirOTRMenu(void) WNDCLASS wc = {0};
wc.hInstance = hInst;
wc.lpfnWndProc = PopupMenuWndProc;
- wc.lpszClassName = _T("MirOTRPopUpMenuProcessor");
+ wc.lpszClassName = _T("MirOTRPopupMenuProcessor");
RegisterClass(&wc);
- hDummyPaintWin = CreateWindowEx(0, _T("MirOTRPopUpMenuProcessor"), NULL, 0, 0, 0, 1, 1, 0, 0, hInst, 0);
+ hDummyPaintWin = CreateWindowEx(0, _T("MirOTRPopupMenuProcessor"), NULL, 0, 0, 0, 1, 1, 0, 0, hInst, 0);
CreateServiceFunction("MirOTRMenuExecService",MirOTRMenuExecService);
CreateServiceFunction("MirOTRMenuCheckService",MirOTRMenuCheckService);
@@ -277,7 +277,7 @@ void UninitMirOTRMenu(void) {
DestroyWindow(hDummyPaintWin);
hDummyPaintWin = 0;
- UnregisterClass(_T("MirOTRPopUpMenuProcessor"), hInst);
+ UnregisterClass(_T("MirOTRPopupMenuProcessor"), hInst);
if ( hMirOTRMenuObject ) CallService( MO_REMOVEMENUOBJECT, (WPARAM)hMirOTRMenuObject, 0 );
hMirOTRMenuObject = 0;
}
diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp index 859d3b7be5..1f9a035942 100644 --- a/plugins/MirOTR/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/MirOTR/src/utils.cpp @@ -192,7 +192,7 @@ void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const HANDLE ppd.PluginWindowProc = NULL;
ppd.PluginData = NULL;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
diff --git a/plugins/MsgPopup/src/main.cpp b/plugins/MsgPopup/src/main.cpp index 1319bd5c85..ac11833dc9 100644 --- a/plugins/MsgPopup/src/main.cpp +++ b/plugins/MsgPopup/src/main.cpp @@ -89,7 +89,7 @@ void popupMessage(LPCTSTR lpText, LPCTSTR lpCaption, UINT uType) ppd.lchIcon = (HICON)LoadImage(NULL, MAKEINTRESOURCE(iIcon), IMAGE_ICON, SM_CXSMICON, SM_CYSMICON, LR_SHARED);
lstrcpy(ppd.lptzContactName, lpCaption);
lstrcpy(ppd.lptzText, lpText);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
if(options.Sound)
MessageBeep(uType);
}
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++;
diff --git a/plugins/NewXstatusNotify/src/main.cpp b/plugins/NewXstatusNotify/src/main.cpp index 9d135f31ee..765bc23f4f 100644 --- a/plugins/NewXstatusNotify/src/main.cpp +++ b/plugins/NewXstatusNotify/src/main.cpp @@ -534,7 +534,7 @@ int ProcessStatus(DBCONTACTWRITESETTING *cws, HANDLE hContact) ppd.PluginWindowProc = PopupDlgProc;
ppd.PluginData = NULL;
ppd.iSeconds = opt.PopupTimeout;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
mir_free(str);
}
mir_free(smi.newstatusmsg);
@@ -687,7 +687,7 @@ void ShowStatusChangePopup(HANDLE hContact, char *szProto, WORD oldStatus, WORD pdp->hAwayMsgProcess = NULL;
ppd.PluginData = pdp;
ppd.iSeconds = opt.PopupTimeout;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
void BlinkIcon(HANDLE hContact, char* szProto, WORD status)
@@ -1060,7 +1060,7 @@ void InitMainMenuItem() {
CLISTMENUITEM mi = { sizeof(mi) };
mi.flags = CMIF_TCHAR;
- mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("PopUps") : NULL;
+ mi.ptszPopupName = ServiceExists(MS_POPUP_ADDPOPUP) ? _T("Popups") : NULL;
mi.pszService = MS_STATUSCHANGE_MENUCOMMAND;
hEnableDisableMenu = Menu_AddMainMenuItem(&mi);
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index c522654ebd..8399ce547b 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -287,7 +287,7 @@ void EnablePopupTextControls(HWND hwndDlg, BOOL bEnable) //EnableWindow(GetDlgItem(hwndDlg, IDC_READAWAYMSG), bEnable);
}
-INT_PTR CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
switch (msg)
{
@@ -418,7 +418,7 @@ INT_PTR CALLBACK DlgProcPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM break;
}
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
return FALSE;
@@ -1049,10 +1049,10 @@ int OptionsInitialize(WPARAM wParam, LPARAM lParam) if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.pszTitle = LPGEN("Status Notify");
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.pszTab = LPGEN("General");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
- odp.pfnDlgProc = DlgProcPopUpOpts;
+ odp.pfnDlgProc = DlgProcPopupOpts;
Options_AddPage(wParam, &odp);
odp.pszTab = LPGEN("Extra status");
diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp index e082e59595..8a0e5b19f2 100644 --- a/plugins/NewXstatusNotify/src/popup.cpp +++ b/plugins/NewXstatusNotify/src/popup.cpp @@ -106,7 +106,7 @@ void PopupAction(HWND hWnd, BYTE action) return;
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
}
diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index 3394286462..ea0acee828 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -207,7 +207,7 @@ void ShowPopup(XSTATUSCHANGE *xsc) ppd.PluginWindowProc = (WNDPROC)PopupDlgProc;
ppd.iSeconds = opt.PopupTimeout;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
void PlayXStatusSound(int action)
diff --git a/plugins/NotifyAnything/src/main.cpp b/plugins/NotifyAnything/src/main.cpp index 0c4f466ead..3d4a684add 100644 --- a/plugins/NotifyAnything/src/main.cpp +++ b/plugins/NotifyAnything/src/main.cpp @@ -470,12 +470,12 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM LeaveCS(&g_popups_cs);
if (left.empty())
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
else {
bool closeflag = false;
processAction(left, closeflag);
if (closeflag)
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
}
return TRUE;
@@ -489,12 +489,12 @@ static int CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM LeaveCS(&g_popups_cs);
if (right.empty())
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
else {
bool closeflag = false;
processAction(right, closeflag);
if (closeflag)
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
}
return TRUE;
@@ -548,7 +548,7 @@ int showMessage(const popup_t &msg) LeaveCS(&g_popups_cs);
- return PUAddPopUp(&ppd);
+ return PUAddPopup(&ppd);
}
void replaceMessage(const popup_t &msg)
@@ -865,7 +865,7 @@ void initWinsock() EnterCS(&g_wsocklock);
if (g_firstrun) {
// probably not needed, but just in case...
- // give PopUp a second to sort itself out
+ // give Popup a second to sort itself out
Sleep(1000);
g_firstrun = false;
diff --git a/plugins/Nudge/src/main.cpp b/plugins/Nudge/src/main.cpp index a10054abf1..c2e7f034d4 100644 --- a/plugins/Nudge/src/main.cpp +++ b/plugins/Nudge/src/main.cpp @@ -348,19 +348,19 @@ extern "C" int __declspec(dllexport) Unload(void) return 0;
}
-LRESULT CALLBACK NudgePopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT CALLBACK NudgePopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{
switch(msg) {
case WM_COMMAND:
{
HANDLE hContact = PUGetContact(hWnd);
CallService(MS_MSG_SENDMESSAGET, (WPARAM)hContact, 0);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
}
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
//Here we'd free our own data, if we had it.
@@ -385,7 +385,7 @@ void LoadPopupClass() ppc.colorBack = NULL;
ppc.colorText = NULL;
ppc.iSeconds = 0;
- ppc.PluginWindowProc = NudgePopUpProc;
+ ppc.PluginWindowProc = NudgePopupProc;
if (hPopupClass = Popup_RegisterClass(&ppc))
HookEvent(ME_SYSTEM_SHUTDOWN, OnShutdown);
}
@@ -440,31 +440,31 @@ void Nudge_ShowPopup(CNudgeElement n, HANDLE hContact, TCHAR * Message) if(ServiceExists(MS_POPUP_ADDPOPUPCLASS))
{
- POPUPDATACLASS NudgePopUp = {0};
- NudgePopUp.cbSize = sizeof(NudgePopUp);
- NudgePopUp.hContact = hContact;
- NudgePopUp.ptszText = Message;
- NudgePopUp.ptszTitle = lpzContactName;
- NudgePopUp.pszClassName = "nudge";
- CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&NudgePopUp);
+ POPUPDATACLASS NudgePopup = {0};
+ NudgePopup.cbSize = sizeof(NudgePopup);
+ NudgePopup.hContact = hContact;
+ NudgePopup.ptszText = Message;
+ NudgePopup.ptszTitle = lpzContactName;
+ NudgePopup.pszClassName = "nudge";
+ CallService(MS_POPUP_ADDPOPUPCLASS, 0, (LPARAM)&NudgePopup);
}
else if(ServiceExists(MS_POPUP_ADDPOPUPT))
{
- POPUPDATAT NudgePopUp = {0};
- NudgePopUp.lchContact = hContact;
- NudgePopUp.lchIcon = Skin_GetIconByHandle(n.hIcoLibItem);
- NudgePopUp.colorBack = 0;
- NudgePopUp.colorText = 0;
- NudgePopUp.iSeconds = 0;
- NudgePopUp.PluginWindowProc = NudgePopUpProc;
- NudgePopUp.PluginData = (void *)1;
+ POPUPDATAT NudgePopup = {0};
+ NudgePopup.lchContact = hContact;
+ NudgePopup.lchIcon = Skin_GetIconByHandle(n.hIcoLibItem);
+ NudgePopup.colorBack = 0;
+ NudgePopup.colorText = 0;
+ NudgePopup.iSeconds = 0;
+ NudgePopup.PluginWindowProc = NudgePopupProc;
+ NudgePopup.PluginData = (void *)1;
- //lstrcpy(NudgePopUp.lpzText, Translate(Message));
- lstrcpy(NudgePopUp.lptzText, Message);
+ //lstrcpy(NudgePopup.lpzText, Translate(Message));
+ lstrcpy(NudgePopup.lptzText, Message);
- lstrcpy(NudgePopUp.lptzContactName, lpzContactName);
+ lstrcpy(NudgePopup.lptzContactName, lpzContactName);
- CallService(MS_POPUP_ADDPOPUPT,(WPARAM)&NudgePopUp,0);
+ CallService(MS_POPUP_ADDPOPUPT,(WPARAM)&NudgePopup,0);
}
else
{
diff --git a/plugins/PackUpdater/Src/Notifications.cpp b/plugins/PackUpdater/Src/Notifications.cpp index facaec4b49..d1a79467a7 100644 --- a/plugins/PackUpdater/Src/Notifications.cpp +++ b/plugins/PackUpdater/Src/Notifications.cpp @@ -30,7 +30,7 @@ void PopupAction(HWND hWnd, BYTE action) case PCA_DONOTHING:
return;
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
static INT_PTR CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -44,13 +44,13 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM case IDYES:
if (IsWindow(pmpd->hDialog))
EndDialog(pmpd->hDialog, LOWORD(wParam));
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
break;
case IDNO:
if (IsWindow(pmpd->hDialog))
EndDialog(pmpd->hDialog, LOWORD(wParam));
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
break;
}
}
@@ -176,7 +176,7 @@ INT_PTR CALLBACK DlgDownloadPop(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lPar static void __stdcall CreateDownloadDialog(void*)
{
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups3", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups3", DEFAULT_POPUP_ENABLED))
hDlgDld = CreateDialog(hInst, MAKEINTRESOURCE(IDD_POPUPDUMMI), NULL, DlgDownloadPop);
else if (db_get_b(NULL,MODNAME, "Popups3M", DEFAULT_MESSAGE_ENABLED)) {
lstrcpyn(tszDialogMsg, Text, SIZEOF(tszDialogMsg));
@@ -195,7 +195,7 @@ void DlgDownloadProc() if (!DownloadFile(pFileUrl->tszDownloadURL, pFileUrl->tszDiskPath)) {
Title = TranslateT("Pack Updater");
Text = TranslateT("An error occured while downloading the update.");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED)) {
Number = 1;
show_popup(0, Title, Text, Number, 0);
}
@@ -421,7 +421,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam INT rc = -1;
Title = TranslateT("Pack Updater");
Text = tszBuff;
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && ServiceExists(MS_POPUP_REGISTERACTIONS) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups0", DEFAULT_POPUP_ENABLED) && (db_get_dw(NULL, "PopUp", "Actions", 0) & 1))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && ServiceExists(MS_POPUP_REGISTERACTIONS) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL,MODNAME, "Popups0", DEFAULT_POPUP_ENABLED) && (db_get_dw(NULL, "Popup", "Actions", 0) & 1))
rc = DialogBox(hInst, MAKEINTRESOURCE(IDD_POPUPDUMMI), NULL, DlgMsgPop);
else
rc = MessageBox(NULL, tszBuff, Title, MB_YESNO | MB_ICONQUESTION);
@@ -503,7 +503,7 @@ INT_PTR CALLBACK DlgUpdate(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam mir_sntprintf(tszBuff, SIZEOF(tszBuff), TranslateT("You have chosen not to install the pack update immediately.\nYou can install it manually from this location:\n\n%s"), arFilePath[0].c_str());
Title = TranslateT("Pack Updater");
Text = tszBuff;
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
{
Number = 2;
show_popup(0, Title, Text, Number, 0);
diff --git a/plugins/PackUpdater/Src/Options.cpp b/plugins/PackUpdater/Src/Options.cpp index 3b16bb0565..f2762c6140 100644 --- a/plugins/PackUpdater/Src/Options.cpp +++ b/plugins/PackUpdater/Src/Options.cpp @@ -159,7 +159,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA return FALSE;
}
-INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
WORD i = 0;
char str[20] = {0}, str2[20] = {0};
@@ -219,7 +219,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) else if (i > 0)
EnableWindow(GetDlgItem(hdlg, (i+1024)), TRUE);
}
- if (!(db_get_dw(NULL, "PopUp", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS))
+ if (!(db_get_dw(NULL, "Popup", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS))
EnableWindow(GetDlgItem(hdlg, (40071)), FALSE);
else
EnableWindow(GetDlgItem(hdlg, (40071)), TRUE);
@@ -227,7 +227,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) return TRUE;
}
case WM_SHOWWINDOW:
- if (!(db_get_dw(NULL, "PopUp", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS))
+ if (!(db_get_dw(NULL, "Popup", "Actions", 0) & 1) || !ServiceExists(MS_POPUP_REGISTERACTIONS))
EnableWindow(GetDlgItem(hdlg, (40071)), FALSE);
else
EnableWindow(GetDlgItem(hdlg, (40071)), TRUE);
@@ -433,9 +433,9 @@ int OptInit(WPARAM wParam, LPARAM lParam) if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTitle = LPGENT("Pack Updater");
- odp.pfnDlgProc = DlgPopUpOpts;
+ odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index a0b74e1718..27d9cac3c1 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -202,7 +202,7 @@ static void CheckUpdates(void *) {
Title=TranslateT("Pack Updater");
Text = TranslateT("URL for checking updates not found.");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED))
{
Number = 1;
show_popup(0, Title, Text, Number, 0);
@@ -268,7 +268,7 @@ static void CheckUpdates(void *) {
Title = TranslateT("Pack Updater");
Text = TranslateT("Name of Update's file is not supported.");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups1", DEFAULT_POPUP_ENABLED))
{
Number = 1;
show_popup(0, Title, Text, Number, 0);
@@ -372,7 +372,7 @@ static void CheckUpdates(void *) {
Title = TranslateT("Pack Updater");
Text = TranslateT("No updates found.");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
{
Number = 2;
show_popup(0, Title, Text, Number, 0);
@@ -384,7 +384,7 @@ static void CheckUpdates(void *) {
Title = TranslateT("Pack Updater");
Text = TranslateT("No files for update.");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
{
Number = 2;
show_popup(0, Title, Text, Number, 0);
@@ -401,7 +401,7 @@ void DoCheck(int iFlag) {
Title = TranslateT("Pack Updater");
Text = TranslateT("Update checking already started!");
- if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
+ if ( ServiceExists(MS_POPUP_ADDPOPUP) && db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) && db_get_b(NULL, MODNAME, "Popups2", DEFAULT_POPUP_ENABLED))
{
Number = 2;
show_popup(0, Title, Text, Number, 0);
diff --git a/plugins/Ping/src/utils.cpp b/plugins/Ping/src/utils.cpp index 9372f22eb0..57ef772773 100644 --- a/plugins/Ping/src/utils.cpp +++ b/plugins/Ping/src/utils.cpp @@ -4,12 +4,12 @@ LRESULT CALLBACK NullWindowProc( HWND hWnd, UINT message, WPARAM wParam, LPARAM {
switch( message ) {
case WM_COMMAND: {
- PUDeletePopUp( hWnd );
+ PUDeletePopup( hWnd );
break;
}
case WM_CONTEXTMENU:
- PUDeletePopUp( hWnd );
+ PUDeletePopup( hWnd );
break;
}
@@ -21,7 +21,7 @@ void CALLBACK sttMainThreadCallback( ULONG_PTR dwParam ) POPUPDATA* ppd = ( POPUPDATA* )dwParam;
if ( ServiceExists(MS_POPUP_ADDPOPUP))
- PUAddPopUp(ppd);
+ PUAddPopup(ppd);
free( ppd );
}
diff --git a/plugins/PluginUpdater/src/Notifications.cpp b/plugins/PluginUpdater/src/Notifications.cpp index 0816172bf8..94a93d5e43 100644 --- a/plugins/PluginUpdater/src/Notifications.cpp +++ b/plugins/PluginUpdater/src/Notifications.cpp @@ -31,7 +31,7 @@ void PopupAction(HWND hWnd, BYTE action) case PCA_DONOTHING:
return;
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
}
static LRESULT CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -45,13 +45,13 @@ static LRESULT CALLBACK PopupDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM case IDYES:
if (IsWindow(pmpd->hDialog))
EndDialog(pmpd->hDialog, LOWORD(wParam));
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
break;
case IDNO:
if (IsWindow(pmpd->hDialog))
EndDialog(pmpd->hDialog, LOWORD(wParam));
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
break;
}
}
@@ -116,7 +116,7 @@ static void MakePopupAction(POPUPACTION &pa, int id) void ShowPopup(HWND hDlg, LPCTSTR ptszTitle, LPCTSTR ptszText, int Number, int ActType)
{
- if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1) ) {
+ if ( !ServiceExists(MS_POPUP_ADDPOPUP) || !db_get_b(NULL, "Popup", "ModuleIsEnabled", 1) ) {
char setting[100];
mir_snprintf(setting, SIZEOF(setting), "Popups%dM", Number);
if (db_get_b(NULL, MODNAME, setting, DEFAULT_MESSAGE_ENABLED)) {
diff --git a/plugins/PluginUpdater/src/Options.cpp b/plugins/PluginUpdater/src/Options.cpp index 35970f383c..9f4d228139 100644 --- a/plugins/PluginUpdater/src/Options.cpp +++ b/plugins/PluginUpdater/src/Options.cpp @@ -171,7 +171,7 @@ INT_PTR CALLBACK UpdateNotifyOptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPA return FALSE;
}
-INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
int i;
char str[20] = {0}, str2[20] = {0};
@@ -404,9 +404,9 @@ int OptInit(WPARAM wParam, LPARAM lParam) if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTitle = LPGENT("Plugin Updater");
- odp.pfnDlgProc = DlgPopUpOpts;
+ odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
return 0;
diff --git a/plugins/Popup/PopUp_10.vcxproj b/plugins/Popup/PopUp_10.vcxproj index b740f6d421..9768994269 100644 --- a/plugins/Popup/PopUp_10.vcxproj +++ b/plugins/Popup/PopUp_10.vcxproj @@ -19,7 +19,7 @@ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>PopUp</ProjectName>
+ <ProjectName>Popup</ProjectName>
<ProjectGuid>{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/plugins/Popup/PopUp_11.vcxproj b/plugins/Popup/PopUp_11.vcxproj index e71b845fa7..53c641062a 100644 --- a/plugins/Popup/PopUp_11.vcxproj +++ b/plugins/Popup/PopUp_11.vcxproj @@ -19,7 +19,7 @@ </ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
- <ProjectName>PopUp</ProjectName>
+ <ProjectName>Popup</ProjectName>
<ProjectGuid>{726460C7-E1F1-4C37-B64F-DA8A8DD26D70}</ProjectGuid>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp index 3582d69b31..5145153985 100644 --- a/plugins/Popup/src/actions.cpp +++ b/plugins/Popup/src/actions.cpp @@ -74,7 +74,7 @@ void RegisterAction(POPUPACTION *action) else {
POPUPACTION *actionCopy = new POPUPACTION;
*actionCopy = *action;
- actionCopy->flags = db_get_b(NULL, "PopUpActions", actionCopy->lpzTitle, actionCopy->flags & PAF_ENABLED) ? PAF_ENABLED : 0;
+ actionCopy->flags = db_get_b(NULL, "PopupActions", actionCopy->lpzTitle, actionCopy->flags & PAF_ENABLED) ? PAF_ENABLED : 0;
gActions.insert(actionCopy);
}
}
@@ -148,13 +148,13 @@ DWORD MouseOverride(HWND hCombo, int number) void LoadOption_Actions() {
- PopUpOptions.actions = db_get_dw(NULL, MODULNAME, "Actions",
+ PopupOptions.actions = db_get_dw(NULL, MODULNAME, "Actions",
ACT_ENABLE|ACT_RIGHTICONS|ACT_DEF_KEEPWND|ACT_DEF_IMONLY|
ACT_DEF_NOGLOBAL|ACT_DEF_MESSAGE|ACT_DEF_DETAILS|ACT_DEF_MENU|
ACT_DEF_ADD|ACT_DEF_DISMISS|ACT_DEF_PIN);
- PopUpOptions.overrideLeft = db_get_dw(NULL,MODULNAME, "OverrideLeft", 0);
- PopUpOptions.overrideMiddle = db_get_dw(NULL,MODULNAME, "OverrideMiddle", 0);
- PopUpOptions.overrideRight = db_get_dw(NULL,MODULNAME, "OverrideRight", 0);
+ PopupOptions.overrideLeft = db_get_dw(NULL,MODULNAME, "OverrideLeft", 0);
+ PopupOptions.overrideMiddle = db_get_dw(NULL,MODULNAME, "OverrideMiddle", 0);
+ PopupOptions.overrideRight = db_get_dw(NULL,MODULNAME, "OverrideRight", 0);
}
static UINT controls[] =
@@ -194,29 +194,29 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM SendMessage(GetDlgItem(hwnd, IDC_ICO_INFO), STM_SETICON, (WPARAM)IcoLib_GetIcon(ICO_MISC_NOTIFY,0), 0);
- CheckDlgButton(hwnd, IDC_CHK_ENABLEACTIONS, PopUpOptions.actions&ACT_ENABLE ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_CHK_IMCONTACTSONLY, PopUpOptions.actions&ACT_DEF_IMONLY ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_CHK_CONTACTSONLY, PopUpOptions.actions&ACT_DEF_NOGLOBAL ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_CHK_DONTCLOSE, PopUpOptions.actions&ACT_DEF_KEEPWND ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_CHK_LARGEICONS, PopUpOptions.actions&ACT_LARGE ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_RD_TEXT, PopUpOptions.actions&ACT_TEXT ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_RD_LEFTICONS, PopUpOptions.actions&ACT_LEFTICONS ? TRUE : FALSE);
- CheckDlgButton(hwnd, IDC_RD_RIGHTICONS, PopUpOptions.actions&ACT_RIGHTICONS ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_CHK_ENABLEACTIONS, PopupOptions.actions&ACT_ENABLE ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_CHK_IMCONTACTSONLY, PopupOptions.actions&ACT_DEF_IMONLY ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_CHK_CONTACTSONLY, PopupOptions.actions&ACT_DEF_NOGLOBAL ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_CHK_DONTCLOSE, PopupOptions.actions&ACT_DEF_KEEPWND ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_CHK_LARGEICONS, PopupOptions.actions&ACT_LARGE ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_RD_TEXT, PopupOptions.actions&ACT_TEXT ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_RD_LEFTICONS, PopupOptions.actions&ACT_LEFTICONS ? TRUE : FALSE);
+ CheckDlgButton(hwnd, IDC_RD_RIGHTICONS, PopupOptions.actions&ACT_RIGHTICONS ? TRUE : FALSE);
{
DWORD dwActiveItem = 0;
HWND hCombo = GetDlgItem(hwnd, IDC_CB_LEFT);
- dwActiveItem = MouseOverride(hCombo, PopUpOptions.overrideLeft);
+ dwActiveItem = MouseOverride(hCombo, PopupOptions.overrideLeft);
SendDlgItemMessage(hwnd, IDC_CB_LEFT, CB_SETCURSEL, dwActiveItem, 0);
dwActiveItem = 0;
hCombo = GetDlgItem(hwnd, IDC_CB_MIDDLE);
- dwActiveItem = MouseOverride(hCombo, PopUpOptions.overrideMiddle);
+ dwActiveItem = MouseOverride(hCombo, PopupOptions.overrideMiddle);
SendDlgItemMessage(hwnd, IDC_CB_MIDDLE, CB_SETCURSEL, dwActiveItem, 0);
dwActiveItem = 0;
hCombo = GetDlgItem(hwnd, IDC_CB_RIGHT);
- dwActiveItem = MouseOverride(hCombo, PopUpOptions.overrideRight);
+ dwActiveItem = MouseOverride(hCombo, PopupOptions.overrideRight);
SendDlgItemMessage(hwnd, IDC_CB_RIGHT, CB_SETCURSEL, dwActiveItem, 0);
HWND hwndList = GetDlgItem(hwnd, IDC_ACTIONS);
@@ -277,7 +277,7 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM groups.destroy();
- BOOL enabled = (PopUpOptions.actions&ACT_ENABLE) ? TRUE : FALSE;
+ BOOL enabled = (PopupOptions.actions&ACT_ENABLE) ? TRUE : FALSE;
for (i = 0; i < SIZEOF(controls); ++i)
EnableWindow(GetDlgItem(hwnd, controls[i]), enabled);
}
@@ -287,62 +287,62 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_COMMAND:
switch (LOWORD(wParam)) {
case IDC_CHK_ENABLEACTIONS:
- PopUpOptions.actions &= ~ACT_ENABLE;
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_ENABLEACTIONS) ? ACT_ENABLE : 0;
+ PopupOptions.actions &= ~ACT_ENABLE;
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_ENABLEACTIONS) ? ACT_ENABLE : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
{
- BOOL enabled = (PopUpOptions.actions & ACT_ENABLE) ? TRUE : FALSE;
+ BOOL enabled = (PopupOptions.actions & ACT_ENABLE) ? TRUE : FALSE;
for (i=0; i < SIZEOF(controls); ++i)
EnableWindow(GetDlgItem(hwnd, controls[i]), enabled);
}
break;
case IDC_CHK_IMCONTACTSONLY:
- PopUpOptions.actions &= ~ACT_DEF_IMONLY;
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_IMCONTACTSONLY) ? ACT_DEF_IMONLY : 0;
+ PopupOptions.actions &= ~ACT_DEF_IMONLY;
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_IMCONTACTSONLY) ? ACT_DEF_IMONLY : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_CHK_CONTACTSONLY:
- PopUpOptions.actions &= ~ACT_DEF_NOGLOBAL;
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_CONTACTSONLY) ? ACT_DEF_NOGLOBAL : 0;
+ PopupOptions.actions &= ~ACT_DEF_NOGLOBAL;
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_CONTACTSONLY) ? ACT_DEF_NOGLOBAL : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_CHK_DONTCLOSE:
- PopUpOptions.actions &= ~ACT_DEF_KEEPWND;
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_DONTCLOSE) ? ACT_DEF_KEEPWND : 0;
+ PopupOptions.actions &= ~ACT_DEF_KEEPWND;
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_DONTCLOSE) ? ACT_DEF_KEEPWND : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_CHK_LARGEICONS:
- PopUpOptions.actions &= ~ACT_LARGE;
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_LARGEICONS) ? ACT_LARGE : 0;
+ PopupOptions.actions &= ~ACT_LARGE;
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_LARGEICONS) ? ACT_LARGE : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_RD_TEXT:
- PopUpOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_ENABLEACTIONS) ? ACT_TEXT : 0;
+ PopupOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_CHK_ENABLEACTIONS) ? ACT_TEXT : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_RD_LEFTICONS:
- PopUpOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_RD_LEFTICONS) ? ACT_LEFTICONS : 0;
+ PopupOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_RD_LEFTICONS) ? ACT_LEFTICONS : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_RD_RIGHTICONS:
- PopUpOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
- PopUpOptions.actions |= IsDlgButtonChecked(hwnd, IDC_RD_RIGHTICONS) ? ACT_RIGHTICONS : 0;
+ PopupOptions.actions &= ~(ACT_TEXT|ACT_LEFTICONS|ACT_RIGHTICONS);
+ PopupOptions.actions |= IsDlgButtonChecked(hwnd, IDC_RD_RIGHTICONS) ? ACT_RIGHTICONS : 0;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_PREVIEW:
- PopUpPreview();
+ PopupPreview();
break;
case IDC_CB_LEFT:
case IDC_CB_MIDDLE:
case IDC_CB_RIGHT:
- PopUpOptions.overrideLeft = SendDlgItemMessage(hwnd, IDC_CB_LEFT, CB_GETITEMDATA,
+ PopupOptions.overrideLeft = SendDlgItemMessage(hwnd, IDC_CB_LEFT, CB_GETITEMDATA,
SendDlgItemMessage(hwnd, IDC_CB_LEFT, CB_GETCURSEL,0,0),0);
- PopUpOptions.overrideMiddle = SendDlgItemMessage(hwnd, IDC_CB_MIDDLE, CB_GETITEMDATA,
+ PopupOptions.overrideMiddle = SendDlgItemMessage(hwnd, IDC_CB_MIDDLE, CB_GETITEMDATA,
SendDlgItemMessage(hwnd, IDC_CB_MIDDLE, CB_GETCURSEL,0,0),0);
- PopUpOptions.overrideRight = SendDlgItemMessage(hwnd, IDC_CB_RIGHT, CB_GETITEMDATA,
+ PopupOptions.overrideRight = SendDlgItemMessage(hwnd, IDC_CB_RIGHT, CB_GETITEMDATA,
SendDlgItemMessage(hwnd, IDC_CB_RIGHT, CB_GETCURSEL,0,0),0);
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
}
@@ -357,18 +357,18 @@ INT_PTR CALLBACK DlgProcPopupActions(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break;
case PSN_APPLY:
- db_set_dw(NULL, MODULNAME, "Actions", PopUpOptions.actions);
+ db_set_dw(NULL, MODULNAME, "Actions", PopupOptions.actions);
HWND hwndList = GetDlgItem(hwnd, IDC_ACTIONS);
for (i=0; i < gActions.getCount(); ++i) {
gActions[i]->flags = (ListView_GetItemState(hwndList, i, LVIS_STATEIMAGEMASK) == 0x2000) ? PAF_ENABLED : 0;
- db_set_b(NULL, "PopUpActions", gActions[i]->lpzTitle, (gActions[i]->flags&PAF_ENABLED) ? 1 : 0);
+ db_set_b(NULL, "PopupActions", gActions[i]->lpzTitle, (gActions[i]->flags&PAF_ENABLED) ? 1 : 0);
}
//overrideActions
- db_set_dw(NULL, MODULNAME, "OverrideLeft", PopUpOptions.overrideLeft);
- db_set_dw(NULL, MODULNAME, "OverrideMiddle", PopUpOptions.overrideMiddle);
- db_set_dw(NULL, MODULNAME, "OverrideRight", PopUpOptions.overrideRight);
+ db_set_dw(NULL, MODULNAME, "OverrideLeft", PopupOptions.overrideLeft);
+ db_set_dw(NULL, MODULNAME, "OverrideMiddle", PopupOptions.overrideMiddle);
+ db_set_dw(NULL, MODULNAME, "OverrideRight", PopupOptions.overrideRight);
}
}
break;
diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h index 6ad87ea594..8b587b6559 100644 --- a/plugins/Popup/src/common.h +++ b/plugins/Popup/src/common.h @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef COMMON_H
#define COMMON_H
-void PopUpPreview();
+void PopupPreview();
#define MAX_POPUPS 48
@@ -41,7 +41,7 @@ inline void GetBmpSize(HBITMAP hbm, SIZE *sz) }
inline void DebugMsg(LPTSTR msg){
- if (PopUpOptions.debug){
+ if (PopupOptions.debug){
MessageBox(NULL, msg, _T("debug"), MB_OK);
}
}
diff --git a/plugins/Popup/src/config.cpp b/plugins/Popup/src/config.cpp index c8cca233be..66fba97b46 100644 --- a/plugins/Popup/src/config.cpp +++ b/plugins/Popup/src/config.cpp @@ -40,7 +40,7 @@ LPCSTR gszMetaProto = ""; HBITMAP hbmNoAvatar;
//===== Options =====
-POPUPOPTIONS PopUpOptions;
+POPUPOPTIONS PopupOptions;
//SKINELEMENT *skin;
//SKINELEMENT *w_skin;
//SKINELEMENT *n_skin;
@@ -70,24 +70,24 @@ HRESULT (WINAPI *MyDwmEnableBlurBehindWindow)(HWND hWnd, DWM_BLURBEHIND *pBlurB // common funcs
void LoadOptions() {
- ZeroMemory(&PopUpOptions, sizeof(PopUpOptions));
+ ZeroMemory(&PopupOptions, sizeof(PopupOptions));
#if defined(_DEBUG)
- PopUpOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
+ PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
#endif
- //Load PopUp Options
+ //Load Popup Options
if (!OptionLoaded){
LoadOption_General();
LoadOption_Skins();
LoadOption_Actions();
LoadOption_AdvOpts();
}
- Check_ReorderPopUps();
+ Check_ReorderPopups();
OptionLoaded = true;
return;
}
-void PopUpPreview()
+void PopupPreview()
{
TCHAR *lptzTitle1Eng = TranslateT("The Jabberwocky");
TCHAR *lptzText1Eng = TranslateT("`Twas brillig, and the slithy toves\r\nDid gyre and gimble in the wabe:\r\nAll mimsy were the borogoves,\r\nAnd the mome raths outgrabe.\r\n\t[b][i]Lewis Carroll, 1855[/i][/b]");
@@ -107,7 +107,7 @@ void PopUpPreview() ppd.lptzText = lptzText1Eng;
ppd.lchIcon = LoadSkinnedIcon(SKINICON_EVENT_MESSAGE);
CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY);
- if (PopUpOptions.UseAnimations || PopUpOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
+ if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
ZeroMemory(&ppd, sizeof(ppd));
ppd.cbSize = sizeof(ppd);
@@ -118,13 +118,13 @@ void PopUpPreview() ppd.hbmAvatar = hbmNoAvatar;
CallService(MS_POPUP_ADDPOPUP2, (WPARAM)&ppd, APF_NO_HISTORY);
- if (PopUpOptions.UseAnimations || PopUpOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
+ if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
PUShowMessageT(TranslateT("This is a notification message"), (DWORD)SM_NOTIFY|0x80000000);
- if (PopUpOptions.UseAnimations || PopUpOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
+ if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
PUShowMessageT(TranslateT("This is a warning message"), (DWORD)SM_WARNING|0x80000000);
- if (PopUpOptions.UseAnimations || PopUpOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
+ if (PopupOptions.UseAnimations || PopupOptions.UseEffect) Sleep((ANIM_TIME*2)/3); //Pause
PUShowMessageT(TranslateT("This is an error message"), (DWORD)SM_ERROR|0x80000000);
}
\ No newline at end of file diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h index e13c4c35e0..673b1e086e 100644 --- a/plugins/Popup/src/config.h +++ b/plugins/Popup/src/config.h @@ -45,8 +45,8 @@ typedef struct tagPOPUPOPTIONS { int gapRight;
int spacing;
//Miscellaneous
- BYTE ReorderPopUps;
- BYTE ReorderPopUpsWarning;
+ BYTE ReorderPopups;
+ BYTE ReorderPopupsWarning;
//Disable when
BOOL ModuleIsEnabled;
BYTE DisableWhenFullscreen;
@@ -145,7 +145,7 @@ extern LPCSTR gszMetaProto; extern HBITMAP hbmNoAvatar;
//===== Options =====
-extern POPUPOPTIONS PopUpOptions;
+extern POPUPOPTIONS PopupOptions;
extern bool OptionLoaded;
//extern SKINELEMENT *skin;
//extern SKINELEMENT *w_skin;
diff --git a/plugins/Popup/src/def_settings.h b/plugins/Popup/src/def_settings.h index 9fa02ff13c..9d09e9f9ee 100644 --- a/plugins/Popup/src/def_settings.h +++ b/plugins/Popup/src/def_settings.h @@ -57,7 +57,7 @@ enum STYLE_SZ_BORDER_FLAT = 2
};
-//===== PopUp Positioning =====
+//===== Popup Positioning =====
enum
{
POS_UPPERLEFT,
@@ -81,7 +81,7 @@ enum SPREADING_MAXVALUE = SPREADING_VERTICAL
};
-//===== PopUp Options flags
+//===== Popup Options flags
enum
{
SPK_NONE,
diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h index d10e2cd9ca..e24116d5b2 100644 --- a/plugins/Popup/src/headers.h +++ b/plugins/Popup/src/headers.h @@ -23,9 +23,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. /*
===============================================================================
- PopUp plugin
+ Popup plugin
-This plugin notifies you when a contact changes his/hers status with a PopUp.
+This plugin notifies you when a contact changes his/hers status with a Popup.
You can customize its look (style of popup, font, text...) and behaviour (the
position in the screen, the time to live, the action on a mouse click).
@@ -127,10 +127,10 @@ http://miranda-ng.org/distr/ #include "avatars_gif.h"
#include "popup_gdiplus.h"
-#define PU_MODULCLASS "PopUpCLASS" //temp DB modul for this plugin
-#define MODULNAME "PopUp"
-#define MODULNAME_LONG "Popup Plus" //dont use "PopUp Plus" coz notify register use "Popup Plus"
-#define MODULNAME_PLU "PopUps"
+#define PU_MODULCLASS "PopupCLASS" //temp DB modul for this plugin
+#define MODULNAME "Popup"
+#define MODULNAME_LONG "Popup Plus"
+#define MODULNAME_PLU "Popups"
INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM);
diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index a44af22401..b43fe1c7a8 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -45,7 +45,7 @@ static void FreeHistoryItem(POPUPDATA2 *ppd) void PopupHistoryResize()
{
- popupHistoryBuffer = PopUpOptions.HistorySize;
+ popupHistoryBuffer = PopupOptions.HistorySize;
mir_cslock lck(csPopupHistory);
while (arPopupHistory.getCount() > popupHistoryBuffer) {
@@ -71,7 +71,7 @@ void PopupHistoryUnload() void PopupHistoryAdd(POPUPDATA2 *ppdNew)
{
- if (!PopUpOptions.EnableHistory)
+ if (!PopupOptions.EnableHistory)
return;
POPUPDATA2 *ppd = (POPUPDATA2*)mir_alloc( sizeof(POPUPDATA2));
@@ -100,7 +100,7 @@ void PopupHistoryAdd(POPUPDATA2 *ppdNew) void PopupHistoryShow()
{
- if (!PopUpOptions.EnableHistory) {
+ if (!PopupOptions.EnableHistory) {
MessageBox(NULL, TranslateT("Popup History is disabled"), TranslateT("Popup History message"), MB_OK);
return;
}
@@ -135,7 +135,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)IcoLib_GetIcon(ICO_HISTORY,0));
SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)IcoLib_GetIcon(ICO_HISTORY,1));
- if (gbHppInstalled && PopUpOptions.UseHppHistoryLog) {
+ if (gbHppInstalled && PopupOptions.UseHppHistoryLog) {
logType = LOG_HPP;
ShowWindow(GetDlgItem(hwnd, IDC_POPUP_LIST), SW_HIDE);
@@ -246,7 +246,7 @@ static INT_PTR CALLBACK HistoryDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA if (rc.right - rc.left <= 30)
return FALSE;
- POPUPOPTIONS customOptions = PopUpOptions;
+ POPUPOPTIONS customOptions = PopupOptions;
customOptions.DynamicResize = FALSE;
customOptions.MinimumWidth = customOptions.MaximumWidth = rc.right-rc.left-30;
diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp index 8ec040ab6c..c74ca3551e 100644 --- a/plugins/Popup/src/main.cpp +++ b/plugins/Popup/src/main.cpp @@ -24,8 +24,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. WORD SETTING_MAXIMUMWIDTH_MAX = GetSystemMetrics(SM_CXSCREEN);
-#define MENUCOMMAND_HISTORY "PopUp/ShowHistory"
-#define MENUCOMMAND_SVC "PopUp/EnableDisableMenuCommand"
+#define MENUCOMMAND_HISTORY "Popup/ShowHistory"
+#define MENUCOMMAND_SVC "Popup/EnableDisableMenuCommand"
//===== MessageBoxes =====
@@ -76,7 +76,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) odp.pszTitle = MODULNAME_PLU;
odp.pszTab = LPGEN("General");
- odp.pfnDlgProc = DlgProcPopUpGeneral;
+ odp.pfnDlgProc = DlgProcPopupGeneral;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_GENERAL);
Options_AddPage(wParam, &odp);
@@ -96,7 +96,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM) Options_AddPage(wParam, &odp);
odp.pszTab = LPGEN("Advanced");
- odp.pfnDlgProc = DlgProcPopUpAdvOpts;
+ odp.pfnDlgProc = DlgProcPopupAdvOpts;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP_ADVANCED);
Options_AddPage(wParam, &odp);
@@ -119,7 +119,7 @@ static int IconsChanged(WPARAM, LPARAM) LoadActions();
CLISTMENUITEM mi = { sizeof(mi) };
- if (PopUpOptions.ModuleIsEnabled == TRUE) { //The module is enabled.
+ if (PopupOptions.ModuleIsEnabled == TRUE) { //The module is enabled.
//The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item.
mi.hIcon = IcoLib_GetIcon(ICO_POPUP_ON, 0);
}
@@ -143,13 +143,13 @@ static int TTBLoaded(WPARAM, LPARAM) ttb.pszService = MENUCOMMAND_SVC;
ttb.lParamUp = 1;
ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON;
- if (PopUpOptions.ModuleIsEnabled)
+ if (PopupOptions.ModuleIsEnabled)
ttb.dwFlags |= TTBBF_PUSHED;
ttb.name = LPGEN("Toggle Popups");
ttb.hIconHandleUp = Skin_GetIconHandle(ICO_TB_POPUP_OFF);
ttb.hIconHandleDn = Skin_GetIconHandle(ICO_TB_POPUP_ON);
- ttb.pszTooltipUp = LPGEN("Enable popups");
- ttb.pszTooltipDn = LPGEN("Disable popups");
+ ttb.pszTooltipUp = LPGEN("Enable Popups");
+ ttb.pszTooltipDn = LPGEN("Disable Popups");
hTTButton = TopToolbar_AddButton(&ttb);
return 0;
}
@@ -158,20 +158,20 @@ static int TTBLoaded(WPARAM, LPARAM) INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM)
{
CLISTMENUITEM mi = { sizeof(mi) };
- if (PopUpOptions.ModuleIsEnabled) {
+ if (PopupOptions.ModuleIsEnabled) {
//The module is enabled.
//The action to do is "disable popups" (show disabled) and we must write "enable popup" in the new item.
- PopUpOptions.ModuleIsEnabled = FALSE;
+ PopupOptions.ModuleIsEnabled = FALSE;
db_set_b(NULL, MODULNAME, "ModuleIsEnabled", FALSE);
- mi.ptszName = LPGENT("Enable &popup module");
+ mi.ptszName = LPGENT("Enable Popups");
mi.hIcon = IcoLib_GetIcon(ICO_POPUP_OFF,0);
}
else {
//The module is disabled.
//The action to do is enable popups (show enabled), then write "disable popup" in the new item.
- PopUpOptions.ModuleIsEnabled = TRUE;
+ PopupOptions.ModuleIsEnabled = TRUE;
db_set_b(NULL, MODULNAME, "ModuleIsEnabled", TRUE);
- mi.ptszName = LPGENT("Disable &popup module");
+ mi.ptszName = LPGENT("Disable Popups");
mi.hIcon = IcoLib_GetIcon(ICO_POPUP_ON,0);
}
mi.flags = CMIM_NAME | CMIM_ICON | CMIF_TCHAR;
@@ -180,7 +180,7 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM) Menu_ModifyItem(hMenuRoot, &mi);
if (hTTButton)
- CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTButton, (PopUpOptions.ModuleIsEnabled) ? TTBST_PUSHED : TTBST_RELEASED);
+ CallService(MS_TTB_SETBUTTONSTATE, (WPARAM)hTTButton, (PopupOptions.ModuleIsEnabled) ? TTBST_PUSHED : TTBST_RELEASED);
return 0;
}
@@ -201,14 +201,14 @@ void InitMenuItems(void) // Build main menu
mi.position = -1000000000 /*1000001*/;
mi.ptszName = LPGENT(MODULNAME_PLU);
- mi.hIcon = IcoLib_GetIcon(PopUpOptions.ModuleIsEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF ,0);
+ mi.hIcon = IcoLib_GetIcon(PopupOptions.ModuleIsEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF ,0);
hMenuRoot = Menu_AddMainMenuItem(&mi);
// Add item to main menu
mi.hParentMenu = (HGENMENU)hMenuRoot;
CreateServiceFunction(MENUCOMMAND_SVC, svcEnableDisableMenuCommand);
- mi.ptszName = PopUpOptions.ModuleIsEnabled ? LPGENT("Disable &popup module") : LPGENT("Enable &popup module");
+ mi.ptszName = PopupOptions.ModuleIsEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups");
mi.pszService = MENUCOMMAND_SVC;
hMenuItem = Menu_AddMainMenuItem(&mi);
@@ -226,7 +226,7 @@ void InitMenuItems(void) //===== GetStatus =====
INT_PTR GetStatus(WPARAM, LPARAM)
{
- return PopUpOptions.ModuleIsEnabled;
+ return PopupOptions.ModuleIsEnabled;
}
@@ -257,8 +257,8 @@ static int ModulesLoaded(WPARAM,LPARAM) (CallService(MS_HPP_GETVERSION, 0, 0) >= PLUGIN_MAKE_VERSION(1,5,0,112));
//check if MText plugin is installed
if (MText.Register) {
- htuText = MText.Register("PopUp Plus/Text", MTEXT_FANCY_DEFAULT);
- htuTitle = MText.Register("PopUp Plus/Title",MTEXT_FANCY_DEFAULT);
+ htuText = MText.Register("Popup Plus/Text", MTEXT_FANCY_DEFAULT);
+ htuTitle = MText.Register("Popup Plus/Title",MTEXT_FANCY_DEFAULT);
}
else htuTitle = htuText = NULL;
@@ -285,13 +285,13 @@ static int ModulesLoaded(WPARAM,LPARAM) //hook TopToolBar
HookEvent(ME_TTB_MODULELOADED, TTBLoaded);
//Folder plugin support
- folderId = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Popup Plus"), MIRANDA_PATHT _T("\\Skins\\PopUp"));
+ folderId = FoldersRegisterCustomPathT(LPGEN("Skins"), LPGEN("Popup Plus"), MIRANDA_PATHT _T("\\Skins\\Popup"));
//load skin
skins.load(_T("dir"));
const PopupSkin *skin;
- if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
- mir_free(PopUpOptions.SkinPack);
- PopUpOptions.SkinPack = mir_tstrdup(skin->getName());
+ if (skin = skins.getSkin(PopupOptions.SkinPack)) {
+ mir_free(PopupOptions.SkinPack);
+ PopupOptions.SkinPack = mir_tstrdup(skin->getName());
skin->loadOpts();
}
//init PopupEfects
@@ -344,9 +344,9 @@ MIRAPI int Load(void) CreateServiceFunction(MS_POPUP_GETSTATUS, GetStatus);
#if defined(_DEBUG)
- PopUpOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
+ PopupOptions.debug = db_get_b(NULL, MODULNAME, "debug", FALSE);
#else
- PopUpOptions.debug = false;
+ PopupOptions.debug = false;
#endif
LoadGDIPlus();
@@ -359,7 +359,7 @@ MIRAPI int Load(void) PopupHistoryLoad();
LoadPopupThread();
if (!LoadPopupWnd2()) {
- MessageBox(0, TranslateT("Error: I could not register the PopUp Window class.\r\nThe plugin will not operate."), _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK);
+ MessageBox(0, TranslateT("Error: I could not register the Popup Window class.\r\nThe plugin will not operate."), _T(MODULNAME_LONG), MB_ICONSTOP | MB_OK);
return 0; //We couldn't register our Window Class, don't hook any event: the plugin will act as if it was disabled.
}
RegisterOptPrevBox();
@@ -377,33 +377,33 @@ MIRAPI int Load(void) LoadOptions();
//Service Functions
- CreateServiceFunction(MS_POPUP_ADDPOPUP, PopUp_AddPopUp);
- CreateServiceFunction(MS_POPUP_ADDPOPUPW, PopUp_AddPopUpW);
- CreateServiceFunction(MS_POPUP_ADDPOPUP2, PopUp_AddPopUp2);
+ CreateServiceFunction(MS_POPUP_ADDPOPUP, Popup_AddPopup);
+ CreateServiceFunction(MS_POPUP_ADDPOPUPW, Popup_AddPopupW);
+ CreateServiceFunction(MS_POPUP_ADDPOPUP2, Popup_AddPopup2);
- CreateServiceFunction(MS_POPUP_CHANGETEXTW, PopUp_ChangeTextW);
+ CreateServiceFunction(MS_POPUP_CHANGETEXTW, Popup_ChangeTextW);
- CreateServiceFunction(MS_POPUP_CHANGEW, PopUp_ChangeW);
- CreateServiceFunction(MS_POPUP_CHANGEPOPUP2, PopUp_Change2);
+ CreateServiceFunction(MS_POPUP_CHANGEW, Popup_ChangeW);
+ CreateServiceFunction(MS_POPUP_CHANGEPOPUP2, Popup_Change2);
- CreateServiceFunction(MS_POPUP_GETCONTACT, PopUp_GetContact);
- CreateServiceFunction(MS_POPUP_GETPLUGINDATA, PopUp_GetPluginData);
- CreateServiceFunction(MS_POPUP_ISSECONDLINESHOWN, PopUp_IsSecondLineShown);
+ CreateServiceFunction(MS_POPUP_GETCONTACT, Popup_GetContact);
+ CreateServiceFunction(MS_POPUP_GETPLUGINDATA, Popup_GetPluginData);
+ CreateServiceFunction(MS_POPUP_ISSECONDLINESHOWN, Popup_IsSecondLineShown);
- CreateServiceFunction(MS_POPUP_SHOWMESSAGE, PopUp_ShowMessage);
- CreateServiceFunction(MS_POPUP_SHOWMESSAGEW, PopUp_ShowMessageW);
- CreateServiceFunction(MS_POPUP_QUERY, PopUp_Query);
+ CreateServiceFunction(MS_POPUP_SHOWMESSAGE, Popup_ShowMessage);
+ CreateServiceFunction(MS_POPUP_SHOWMESSAGEW, Popup_ShowMessageW);
+ CreateServiceFunction(MS_POPUP_QUERY, Popup_Query);
- CreateServiceFunction(MS_POPUP_REGISTERACTIONS, PopUp_RegisterActions);
- CreateServiceFunction(MS_POPUP_REGISTERNOTIFICATION, PopUp_RegisterNotification);
+ CreateServiceFunction(MS_POPUP_REGISTERACTIONS, Popup_RegisterActions);
+ CreateServiceFunction(MS_POPUP_REGISTERNOTIFICATION, Popup_RegisterNotification);
- CreateServiceFunction(MS_POPUP_UNHOOKEVENTASYNC, PopUp_UnhookEventAsync);
+ CreateServiceFunction(MS_POPUP_UNHOOKEVENTASYNC, Popup_UnhookEventAsync);
- CreateServiceFunction(MS_POPUP_REGISTERVFX, PopUp_RegisterVfx);
+ CreateServiceFunction(MS_POPUP_REGISTERVFX, Popup_RegisterVfx);
- CreateServiceFunction(MS_POPUP_REGISTERCLASS, PopUp_RegisterPopupClass);
- CreateServiceFunction(MS_POPUP_UNREGISTERCLASS, PopUp_UnregisterPopupClass);
- CreateServiceFunction(MS_POPUP_ADDPOPUPCLASS, PopUp_CreateClassPopup);
+ CreateServiceFunction(MS_POPUP_REGISTERCLASS, Popup_RegisterPopupClass);
+ CreateServiceFunction(MS_POPUP_UNREGISTERCLASS, Popup_UnregisterPopupClass);
+ CreateServiceFunction(MS_POPUP_ADDPOPUPCLASS, Popup_CreateClassPopup);
//load icons / create hook
InitIcons();
@@ -433,8 +433,8 @@ MIRAPI int Unload(void) FreeLibrary(hMsimgDll);
FreeLibrary(hGdiDll);
- if (PopUpOptions.SkinPack) mir_free(PopUpOptions.SkinPack);
- mir_free(PopUpOptions.Effect);
+ if (PopupOptions.SkinPack) mir_free(PopupOptions.SkinPack);
+ mir_free(PopupOptions.Effect);
OptAdv_UnregisterVfx();
UnloadPopupThread();
diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index e9c70d8c79..92a2e28652 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -191,15 +191,15 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification) ptd->notification = *notification;
if (!ptd->notification.lpzLAction) ptd->notification.lpzLAction = POPUP_ACTION_NOTHING;
if (!ptd->notification.lpzRAction) ptd->notification.lpzRAction = POPUP_ACTION_DISMISS;
- LoadNotificationSettings(ptd, "PopUpNotifications");
+ LoadNotificationSettings(ptd, "PopupNotifications");
// ugly hack to make reset always possible
- SaveNotificationSettings(ptd,"PopUpNotifications");
+ SaveNotificationSettings(ptd,"PopupNotifications");
FontID fontid = {0};
fontid.cbSize = sizeof(fontid);
mir_snprintf(fontid.group, sizeof(fontid.group), "%s/%s", PU_FNT_AND_COLOR, notification->lpzGroup);
- lstrcpyA(fontid.dbSettingsGroup, "PopUpNotifications");
+ lstrcpyA(fontid.dbSettingsGroup, "PopupNotifications");
fontid.flags = FIDF_DEFAULTVALID;
fontid.deffontsettings.charset = DEFAULT_CHARSET;
fontid.deffontsettings.colour = ptd->notification.colorText;
@@ -214,14 +214,14 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification) ColourID colourid = {0};
colourid.cbSize = sizeof(colourid);
mir_snprintf(colourid.group, sizeof(colourid.group), "%s/%s", PU_FNT_AND_COLOR, notification->lpzGroup);
- lstrcpyA(colourid.dbSettingsGroup, "PopUpNotifications");
+ lstrcpyA(colourid.dbSettingsGroup, "PopupNotifications");
mir_snprintf(colourid.name, SIZEOF(colourid.name), "%s (colors only)", notification->lpzName);
mir_snprintf(colourid.setting, SIZEOF(colourid.setting), "{%s/%s}backColor", notification->lpzGroup, notification->lpzName);
colourid.defcolour = ptd->notification.colorBack;
ColourRegister(&colourid);
char section[MAXMODULELABELLENGTH], setting[MAXMODULELABELLENGTH];
- mir_snprintf(section, sizeof(section), "PopUps/%s", notification->lpzGroup);
+ mir_snprintf(section, sizeof(section), "Popups/%s", notification->lpzGroup);
mir_snprintf(setting, sizeof(setting), "%s_%s_%s", MODULNAME, notification->lpzGroup, notification->lpzName);
SKINICONDESC sid = { sizeof(sid) };
@@ -325,7 +325,7 @@ bool PerformAction(HANDLE hNotification, HWND hwnd, UINT message, WPARAM wparam, if (!lstrcmpA(lpzAction, POPUP_ACTION_DISMISS))
{
- PUDeletePopUp(hwnd);
+ PUDeletePopup(hwnd);
return true;
}
diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index c4c5513244..33e323618a 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -46,38 +46,38 @@ void OptAdv_UnregisterVfx() void LoadOption_AdvOpts()
{
//History
- PopUpOptions.EnableHistory = db_get_b(NULL, MODULNAME, "EnableHistory", TRUE);
- PopUpOptions.HistorySize = db_get_w(NULL, MODULNAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
- PopUpOptions.UseHppHistoryLog = db_get_b(NULL, MODULNAME, "UseHppHistoryLog", TRUE);
+ PopupOptions.EnableHistory = db_get_b(NULL, MODULNAME, "EnableHistory", TRUE);
+ PopupOptions.HistorySize = db_get_w(NULL, MODULNAME, "HistorySize", SETTING_HISTORYSIZE_DEFAULT);
+ PopupOptions.UseHppHistoryLog = db_get_b(NULL, MODULNAME, "UseHppHistoryLog", TRUE);
//Avatars
- PopUpOptions.avatarBorders = db_get_b(NULL, MODULNAME, "AvatarBorders", TRUE);
- PopUpOptions.avatarPNGBorders = db_get_b(NULL, MODULNAME, "AvatarPNGBorders", FALSE);
- PopUpOptions.avatarRadius = db_get_b(NULL, MODULNAME, "AvatarRadius", 2);
- PopUpOptions.avatarSize = db_get_w(NULL, MODULNAME, "AvatarSize", SETTING_AVTSIZE_DEFAULT);
- PopUpOptions.EnableAvatarUpdates = db_get_b(NULL, MODULNAME, "EnableAvatarUpdates", FALSE);
+ PopupOptions.avatarBorders = db_get_b(NULL, MODULNAME, "AvatarBorders", TRUE);
+ PopupOptions.avatarPNGBorders = db_get_b(NULL, MODULNAME, "AvatarPNGBorders", FALSE);
+ PopupOptions.avatarRadius = db_get_b(NULL, MODULNAME, "AvatarRadius", 2);
+ PopupOptions.avatarSize = db_get_w(NULL, MODULNAME, "AvatarSize", SETTING_AVTSIZE_DEFAULT);
+ PopupOptions.EnableAvatarUpdates = db_get_b(NULL, MODULNAME, "EnableAvatarUpdates", FALSE);
//Monitor
- PopUpOptions.Monitor = db_get_b(NULL, MODULNAME, "Monitor", SETTING_MONITOR_DEFAULT);
+ PopupOptions.Monitor = db_get_b(NULL, MODULNAME, "Monitor", SETTING_MONITOR_DEFAULT);
//Transparency
- PopUpOptions.Enable9xTransparency = db_get_b(NULL, MODULNAME, "EnableRegionTransparency", TRUE);
- PopUpOptions.UseTransparency = db_get_b(NULL, MODULNAME, "UseTransparency", TRUE);
- PopUpOptions.Alpha = db_get_b(NULL, MODULNAME, "Alpha", SETTING_ALPHA_DEFAULT);
- PopUpOptions.OpaqueOnHover = db_get_b(NULL, MODULNAME, "OpaqueOnHover", TRUE);
+ PopupOptions.Enable9xTransparency = db_get_b(NULL, MODULNAME, "EnableRegionTransparency", TRUE);
+ PopupOptions.UseTransparency = db_get_b(NULL, MODULNAME, "UseTransparency", TRUE);
+ PopupOptions.Alpha = db_get_b(NULL, MODULNAME, "Alpha", SETTING_ALPHA_DEFAULT);
+ PopupOptions.OpaqueOnHover = db_get_b(NULL, MODULNAME, "OpaqueOnHover", TRUE);
//Effects
- PopUpOptions.UseAnimations = db_get_b(NULL, MODULNAME, "UseAnimations", TRUE);
- PopUpOptions.UseEffect = db_get_b(NULL, MODULNAME, "Fade", TRUE);
- PopUpOptions.Effect = (LPTSTR)DBGetContactSettingStringX(NULL, MODULNAME, "Effect", "", DBVT_TCHAR);
- PopUpOptions.FadeIn = db_get_dw(NULL, MODULNAME, "FadeInTime", SETTING_FADEINTIME_DEFAULT);
- PopUpOptions.FadeOut = db_get_dw(NULL, MODULNAME, "FadeOutTime", SETTING_FADEOUTTIME_DEFAULT);
+ PopupOptions.UseAnimations = db_get_b(NULL, MODULNAME, "UseAnimations", TRUE);
+ PopupOptions.UseEffect = db_get_b(NULL, MODULNAME, "Fade", TRUE);
+ PopupOptions.Effect = (LPTSTR)DBGetContactSettingStringX(NULL, MODULNAME, "Effect", "", DBVT_TCHAR);
+ PopupOptions.FadeIn = db_get_dw(NULL, MODULNAME, "FadeInTime", SETTING_FADEINTIME_DEFAULT);
+ PopupOptions.FadeOut = db_get_dw(NULL, MODULNAME, "FadeOutTime", SETTING_FADEOUTTIME_DEFAULT);
//other old stuff
- PopUpOptions.MaxPopups = db_get_w(NULL, MODULNAME, "MaxPopups", 20);
+ PopupOptions.MaxPopups = db_get_w(NULL, MODULNAME, "MaxPopups", 20);
}
-INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
TCHAR tstr[64];
static bool bDlgInit = false; //some controls send WM_COMMAND before or during WM_INITDIALOG
@@ -104,40 +104,40 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
//Group: History
{
- CheckDlgButton(hwnd, IDC_ENABLE_HISTORY, PopUpOptions.EnableHistory);
- SetDlgItemInt (hwnd, IDC_HISTORYSIZE, PopUpOptions.HistorySize, FALSE);
- CheckDlgButton(hwnd, IDC_HPPLOG, PopUpOptions.UseHppHistoryLog);
+ CheckDlgButton(hwnd, IDC_ENABLE_HISTORY, PopupOptions.EnableHistory);
+ SetDlgItemInt (hwnd, IDC_HISTORYSIZE, PopupOptions.HistorySize, FALSE);
+ CheckDlgButton(hwnd, IDC_HPPLOG, PopupOptions.UseHppHistoryLog);
HWND hCtrl = GetDlgItem(hwnd, IDC_SHOWHISTORY);
SendMessage(hCtrl, BUTTONSETASFLATBTN, TRUE, 0);
SendMessage(hCtrl, BUTTONADDTOOLTIP, (WPARAM)Translate("Popup History"), 0);
SendMessage(hCtrl, BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_HISTORY,0));
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORYSIZE), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC2), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_SHOWHISTORY), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HPPLOG), PopUpOptions.EnableHistory && gbHppInstalled);
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORYSIZE), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC2), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_SHOWHISTORY), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HPPLOG), PopupOptions.EnableHistory && gbHppInstalled);
}
//Group: Avatars
{
//Borders
- CheckDlgButton(hwnd, IDC_AVT_BORDER, PopUpOptions.avatarBorders);
- CheckDlgButton(hwnd, IDC_AVT_PNGBORDER, PopUpOptions.avatarPNGBorders);
- EnableWindow(GetDlgItem(hwnd, IDC_AVT_PNGBORDER), PopUpOptions.avatarBorders);
+ CheckDlgButton(hwnd, IDC_AVT_BORDER, PopupOptions.avatarBorders);
+ CheckDlgButton(hwnd, IDC_AVT_PNGBORDER, PopupOptions.avatarPNGBorders);
+ EnableWindow(GetDlgItem(hwnd, IDC_AVT_PNGBORDER), PopupOptions.avatarBorders);
//Radius
- SetDlgItemInt(hwnd, IDC_AVT_RADIUS, PopUpOptions.avatarRadius, FALSE);
- SendDlgItemMessage(hwnd, IDC_AVT_RADIUS_SPIN,UDM_SETRANGE, 0, (LPARAM)MAKELONG((PopUpOptions.avatarSize / 2),0));
+ SetDlgItemInt(hwnd, IDC_AVT_RADIUS, PopupOptions.avatarRadius, FALSE);
+ SendDlgItemMessage(hwnd, IDC_AVT_RADIUS_SPIN,UDM_SETRANGE, 0, (LPARAM)MAKELONG((PopupOptions.avatarSize / 2),0));
//Size
mir_subclassWindow(GetDlgItem(hwnd, IDC_AVT_SIZE_SLIDE), AvatarTrackBarWndProc);
SendDlgItemMessage(hwnd, IDC_AVT_SIZE_SLIDE, TBM_SETRANGE,FALSE,
MAKELONG(SETTING_AVTSIZE_MIN, SETTING_AVTSIZE_MAX));
SendDlgItemMessage(hwnd, IDC_AVT_SIZE_SLIDE, TBM_SETPOS, TRUE,
- max(PopUpOptions.avatarSize, SETTING_AVTSIZE_MIN));
- SetDlgItemInt(hwnd, IDC_AVT_SIZE, PopUpOptions.avatarSize, FALSE);
+ max(PopupOptions.avatarSize, SETTING_AVTSIZE_MIN));
+ SetDlgItemInt(hwnd, IDC_AVT_SIZE, PopupOptions.avatarSize, FALSE);
//Request avatars
- CheckDlgButton(hwnd, IDC_AVT_REQUEST, PopUpOptions.EnableAvatarUpdates);
+ CheckDlgButton(hwnd, IDC_AVT_REQUEST, PopupOptions.EnableAvatarUpdates);
}
//Group: Monitor
{
@@ -145,8 +145,8 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM bMonitor = GetSystemMetrics(SM_CMONITORS)>1;
- CheckDlgButton(hwnd, IDC_MIRANDAWND, bMonitor ? (PopUpOptions.Monitor == MN_MIRANDA) : TRUE);
- CheckDlgButton(hwnd, IDC_ACTIVEWND, bMonitor ? (PopUpOptions.Monitor == MN_ACTIVE) : FALSE);
+ CheckDlgButton(hwnd, IDC_MIRANDAWND, bMonitor ? (PopupOptions.Monitor == MN_MIRANDA) : TRUE);
+ CheckDlgButton(hwnd, IDC_ACTIVEWND, bMonitor ? (PopupOptions.Monitor == MN_ACTIVE) : FALSE);
EnableWindow(GetDlgItem(hwnd, IDC_GRP_MULTIMONITOR), bMonitor);
EnableWindow(GetDlgItem(hwnd, IDC_MULTIMONITOR_DESC), bMonitor);
EnableWindow(GetDlgItem(hwnd, IDC_MIRANDAWND), bMonitor);
@@ -155,42 +155,42 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM //Group: Transparency
{
//9x/ME
- CheckDlgButton(hwnd, IDC_TRANS_9X, PopUpOptions.Enable9xTransparency);
+ CheckDlgButton(hwnd, IDC_TRANS_9X, PopupOptions.Enable9xTransparency);
//EnableWindow(GetDlgItem(hwnd, IDC_TRANS_9X), !IsWinVer2000Plus());
ShowWindow(GetDlgItem(hwnd, IDC_TRANS_9X), IsWinVer2000Plus() ? SW_HIDE : SW_SHOW);
//win2k+
- CheckDlgButton(hwnd, IDC_TRANS, PopUpOptions.UseTransparency);
+ CheckDlgButton(hwnd, IDC_TRANS, PopupOptions.UseTransparency);
SendDlgItemMessage(hwnd, IDC_TRANS_SLIDER, TBM_SETRANGE, FALSE, MAKELONG(1,255));
- SendDlgItemMessage(hwnd, IDC_TRANS_SLIDER, TBM_SETPOS, TRUE, PopUpOptions.Alpha);
+ SendDlgItemMessage(hwnd, IDC_TRANS_SLIDER, TBM_SETPOS, TRUE, PopupOptions.Alpha);
mir_subclassWindow(GetDlgItem(hwnd, IDC_TRANS_SLIDER), AlphaTrackBarWndProc);
- wsprintf(tstr, _T("%d%%"), Byte2Percentile(PopUpOptions.Alpha));
+ wsprintf(tstr, _T("%d%%"), Byte2Percentile(PopupOptions.Alpha));
SetDlgItemText(hwnd, IDC_TRANS_PERCENT, tstr);
- CheckDlgButton(hwnd, IDC_TRANS_OPAQUEONHOVER, PopUpOptions.OpaqueOnHover);
+ CheckDlgButton(hwnd, IDC_TRANS_OPAQUEONHOVER, PopupOptions.OpaqueOnHover);
{
BOOL how = TRUE;
EnableWindow(GetDlgItem(hwnd, IDC_TRANS), how);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_TXT1), how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_SLIDER), how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_PERCENT), how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_OPAQUEONHOVER), how && PopUpOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_TXT1), how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_SLIDER), how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_PERCENT), how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_OPAQUEONHOVER), how && PopupOptions.UseTransparency);
}
ShowWindow(GetDlgItem(hwnd, IDC_TRANS), IsWinVer2000Plus() ? SW_SHOW : SW_HIDE);
}
//Group: Effects
{
//Use Animations
- CheckDlgButton(hwnd, IDC_USEANIMATIONS, PopUpOptions.UseAnimations);
+ CheckDlgButton(hwnd, IDC_USEANIMATIONS, PopupOptions.UseAnimations);
//Fade
- SetDlgItemInt (hwnd, IDC_FADEIN, PopUpOptions.FadeIn, FALSE);
- SetDlgItemInt (hwnd, IDC_FADEOUT,PopUpOptions.FadeOut,FALSE);
+ SetDlgItemInt (hwnd, IDC_FADEIN, PopupOptions.FadeIn, FALSE);
+ SetDlgItemInt (hwnd, IDC_FADEOUT,PopupOptions.FadeOut,FALSE);
UDACCEL aAccels[] = {{0,50},{1,100},{3,500}};
SendDlgItemMessage(hwnd, IDC_FADEIN_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(SETTING_FADEINTIME_MAX, SETTING_FADEINTIME_MIN));
SendDlgItemMessage(hwnd, IDC_FADEIN_SPIN, UDM_SETACCEL, (WPARAM)SIZEOF(aAccels), (LPARAM)&aAccels);
SendDlgItemMessage(hwnd, IDC_FADEOUT_SPIN,UDM_SETRANGE, 0, (LPARAM)MAKELONG(SETTING_FADEOUTTIME_MAX,SETTING_FADEOUTTIME_MIN));
SendDlgItemMessage(hwnd, IDC_FADEOUT_SPIN,UDM_SETACCEL, (WPARAM)SIZEOF(aAccels), (LPARAM)&aAccels);
- BOOL how = PopUpOptions.UseAnimations || PopUpOptions.UseEffect;
+ BOOL how = PopupOptions.UseAnimations || PopupOptions.UseEffect;
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_TXT1), how);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN), how);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_SPIN), how);
@@ -211,11 +211,11 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM HWND hCtrl = GetDlgItem(hwnd, IDC_EFFECT);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("No effect")) ,-2);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("Fade in/out")) ,-1);
- dwActiveItem = (DWORD)PopUpOptions.UseEffect;
+ dwActiveItem = (DWORD)PopupOptions.UseEffect;
for (int i=0; i < g_lstPopupVfx.getCount(); ++i) {
dwItem = ComboBox_AddString(hCtrl, TranslateTS(g_lstPopupVfx[i]));
ComboBox_SetItemData(hCtrl, dwItem, i);
- if (PopUpOptions.UseEffect && !lstrcmp(g_lstPopupVfx[i], PopUpOptions.Effect))
+ if (PopupOptions.UseEffect && !lstrcmp(g_lstPopupVfx[i], PopupOptions.Effect))
dwActiveItem = dwItem;
}
SendDlgItemMessage(hwnd, IDC_EFFECT, CB_SETCURSEL, dwActiveItem, 0);
@@ -223,7 +223,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM }
//later check stuff
- SetDlgItemInt(hwnd, IDC_MAXPOPUPS, PopUpOptions.MaxPopups, FALSE);
+ SetDlgItemInt(hwnd, IDC_MAXPOPUPS, PopupOptions.MaxPopups, FALSE);
TranslateDialogDefault(hwnd); //do it on end of WM_INITDIALOG
bDlgInit = true;
return TRUE;
@@ -231,15 +231,15 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case WM_HSCROLL:
switch (idCtrl = GetDlgCtrlID((HWND)lParam)) {
case IDC_AVT_SIZE_SLIDE:
- PopUpOptions.avatarSize = SendDlgItemMessage(hwnd,IDC_AVT_SIZE_SLIDE, TBM_GETPOS,0,0);
- SetDlgItemInt(hwnd, IDC_AVT_SIZE ,PopUpOptions.avatarSize,FALSE);
- SendDlgItemMessage(hwnd, IDC_AVT_RADIUS_SPIN,UDM_SETRANGE, 0, (LPARAM)MAKELONG((PopUpOptions.avatarSize / 2),0));
+ PopupOptions.avatarSize = SendDlgItemMessage(hwnd,IDC_AVT_SIZE_SLIDE, TBM_GETPOS,0,0);
+ SetDlgItemInt(hwnd, IDC_AVT_SIZE ,PopupOptions.avatarSize,FALSE);
+ SendDlgItemMessage(hwnd, IDC_AVT_RADIUS_SPIN,UDM_SETRANGE, 0, (LPARAM)MAKELONG((PopupOptions.avatarSize / 2),0));
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_TRANS_SLIDER:
- PopUpOptions.Alpha = (BYTE)SendDlgItemMessage(hwnd,IDC_TRANS_SLIDER, TBM_GETPOS, 0,0);
- wsprintf(tstr, TranslateT("%d%%"), Byte2Percentile(PopUpOptions.Alpha));
+ PopupOptions.Alpha = (BYTE)SendDlgItemMessage(hwnd,IDC_TRANS_SLIDER, TBM_GETPOS, 0,0);
+ wsprintf(tstr, TranslateT("%d%%"), Byte2Percentile(PopupOptions.Alpha));
SetDlgItemText(hwnd, IDC_TRANS_PERCENT, tstr);
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
@@ -252,12 +252,12 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case BN_CLICKED: //Button controls
switch(idCtrl) {
case IDC_ENABLE_HISTORY:
- PopUpOptions.EnableHistory = !PopUpOptions.EnableHistory;
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORYSIZE), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC2), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_SHOWHISTORY), PopUpOptions.EnableHistory);
- EnableWindow(GetDlgItem(hwnd, IDC_HPPLOG), PopUpOptions.EnableHistory && gbHppInstalled);
+ PopupOptions.EnableHistory = !PopupOptions.EnableHistory;
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC1), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORYSIZE), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HISTORY_STATIC2), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_SHOWHISTORY), PopupOptions.EnableHistory);
+ EnableWindow(GetDlgItem(hwnd, IDC_HPPLOG), PopupOptions.EnableHistory && gbHppInstalled);
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
@@ -266,62 +266,62 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break;
case IDC_HPPLOG:
- PopUpOptions.UseHppHistoryLog = !PopUpOptions.UseHppHistoryLog;
+ PopupOptions.UseHppHistoryLog = !PopupOptions.UseHppHistoryLog;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_AVT_BORDER:
- PopUpOptions.avatarBorders = !PopUpOptions.avatarBorders;
- EnableWindow(GetDlgItem(hwnd, IDC_AVT_PNGBORDER), PopUpOptions.avatarBorders);
+ PopupOptions.avatarBorders = !PopupOptions.avatarBorders;
+ EnableWindow(GetDlgItem(hwnd, IDC_AVT_PNGBORDER), PopupOptions.avatarBorders);
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_AVT_PNGBORDER:
- PopUpOptions.avatarPNGBorders = !PopUpOptions.avatarPNGBorders;
+ PopupOptions.avatarPNGBorders = !PopupOptions.avatarPNGBorders;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_AVT_REQUEST:
- PopUpOptions.EnableAvatarUpdates = !PopUpOptions.EnableAvatarUpdates;
+ PopupOptions.EnableAvatarUpdates = !PopupOptions.EnableAvatarUpdates;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_MIRANDAWND:
- PopUpOptions.Monitor = MN_MIRANDA;
+ PopupOptions.Monitor = MN_MIRANDA;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_ACTIVEWND:
- PopUpOptions.Monitor = MN_ACTIVE;
+ PopupOptions.Monitor = MN_ACTIVE;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_TRANS_9X:
- PopUpOptions.Enable9xTransparency = !PopUpOptions.Enable9xTransparency;
+ PopupOptions.Enable9xTransparency = !PopupOptions.Enable9xTransparency;
SendMessage(GetParent(hwnd), PSM_CHANGED,0,0);
break;
case IDC_TRANS:
- PopUpOptions.UseTransparency = !PopUpOptions.UseTransparency;
+ PopupOptions.UseTransparency = !PopupOptions.UseTransparency;
{
BOOL how = TRUE;
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_TXT1) ,how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_SLIDER) ,how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_PERCENT) ,how && PopUpOptions.UseTransparency);
- EnableWindow(GetDlgItem(hwnd, IDC_TRANS_OPAQUEONHOVER) ,how && PopUpOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_TXT1) ,how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_SLIDER) ,how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_PERCENT) ,how && PopupOptions.UseTransparency);
+ EnableWindow(GetDlgItem(hwnd, IDC_TRANS_OPAQUEONHOVER) ,how && PopupOptions.UseTransparency);
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
break;
case IDC_TRANS_OPAQUEONHOVER:
- PopUpOptions.OpaqueOnHover = !PopUpOptions.OpaqueOnHover;
+ PopupOptions.OpaqueOnHover = !PopupOptions.OpaqueOnHover;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_USEANIMATIONS:
- PopUpOptions.UseAnimations = !PopUpOptions.UseAnimations;
+ PopupOptions.UseAnimations = !PopupOptions.UseAnimations;
{
- BOOL enable = PopUpOptions.UseAnimations || PopUpOptions.UseEffect;
+ BOOL enable = PopupOptions.UseAnimations || PopupOptions.UseEffect;
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_TXT1), enable);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN), enable);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_SPIN), enable);
@@ -335,7 +335,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break;
case IDC_PREVIEW:
- PopUpPreview();
+ PopupPreview();
break;
}
break;
@@ -346,11 +346,11 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case IDC_EFFECT:
{
int iEffect = ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
- PopUpOptions.UseEffect = (iEffect != -2) ? TRUE : FALSE;
- mir_free(PopUpOptions.Effect);
- PopUpOptions.Effect = mir_tstrdup((iEffect >= 0) ? g_lstPopupVfx[iEffect] : _T(""));
+ PopupOptions.UseEffect = (iEffect != -2) ? TRUE : FALSE;
+ mir_free(PopupOptions.Effect);
+ PopupOptions.Effect = mir_tstrdup((iEffect >= 0) ? g_lstPopupVfx[iEffect] : _T(""));
- BOOL enable = PopUpOptions.UseAnimations || PopUpOptions.UseEffect;
+ BOOL enable = PopupOptions.UseAnimations || PopupOptions.UseEffect;
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_TXT1), enable);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN), enable);
EnableWindow(GetDlgItem(hwnd, IDC_FADEIN_SPIN), enable);
@@ -373,7 +373,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int maxPop = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (maxPop > 0){
- PopUpOptions.MaxPopups = maxPop;
+ PopupOptions.MaxPopups = maxPop;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -383,7 +383,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int histSize = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if ( histSize > 0 &&
histSize <= SETTING_HISTORYSIZE_MAX){
- PopUpOptions.HistorySize = histSize;
+ PopupOptions.HistorySize = histSize;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -392,7 +392,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int avtRadius = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if ( avtRadius <= SETTING_AVTSIZE_MAX / 2 ) {
- PopUpOptions.avatarRadius = avtRadius;
+ PopupOptions.avatarRadius = avtRadius;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -402,7 +402,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int fadeIn = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if ( fadeIn >= SETTING_FADEINTIME_MIN &&
fadeIn <= SETTING_FADEINTIME_MAX ) {
- PopUpOptions.FadeIn = fadeIn;
+ PopupOptions.FadeIn = fadeIn;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -412,7 +412,7 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int fadeOut = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if ( fadeOut >= SETTING_FADEOUTTIME_MIN &&
fadeOut <= SETTING_FADEOUTTIME_MAX){
- PopUpOptions.FadeOut = fadeOut;
+ PopupOptions.FadeOut = fadeOut;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -427,9 +427,9 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int maxPop = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (maxPop <= 0)
- PopUpOptions.MaxPopups = 20;
- if (maxPop != PopUpOptions.MaxPopups) {
- SetDlgItemInt(hwnd, idCtrl, PopUpOptions.MaxPopups, FALSE);
+ PopupOptions.MaxPopups = 20;
+ if (maxPop != PopupOptions.MaxPopups) {
+ SetDlgItemInt(hwnd, idCtrl, PopupOptions.MaxPopups, FALSE);
//ErrorMSG(1);
SetFocus((HWND)lParam);
}
@@ -439,11 +439,11 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int histSize = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (histSize <= 0)
- PopUpOptions.HistorySize = SETTING_HISTORYSIZE_DEFAULT;
+ PopupOptions.HistorySize = SETTING_HISTORYSIZE_DEFAULT;
else if (histSize > SETTING_HISTORYSIZE_MAX)
- PopUpOptions.HistorySize = SETTING_HISTORYSIZE_MAX;
- if (histSize != PopUpOptions.HistorySize) {
- SetDlgItemInt(hwnd, idCtrl, PopUpOptions.HistorySize, FALSE);
+ PopupOptions.HistorySize = SETTING_HISTORYSIZE_MAX;
+ if (histSize != PopupOptions.HistorySize) {
+ SetDlgItemInt(hwnd, idCtrl, PopupOptions.HistorySize, FALSE);
ErrorMSG(1, SETTING_HISTORYSIZE_MAX);
SetFocus((HWND)lParam);
}
@@ -453,9 +453,9 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int avtRadius = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (avtRadius > SETTING_AVTSIZE_MAX / 2)
- PopUpOptions.avatarRadius = SETTING_AVTSIZE_MAX / 2;
- if (avtRadius != PopUpOptions.avatarRadius) {
- SetDlgItemInt(hwnd, idCtrl, PopUpOptions.avatarRadius, FALSE);
+ PopupOptions.avatarRadius = SETTING_AVTSIZE_MAX / 2;
+ if (avtRadius != PopupOptions.avatarRadius) {
+ SetDlgItemInt(hwnd, idCtrl, PopupOptions.avatarRadius, FALSE);
ErrorMSG(0, SETTING_AVTSIZE_MAX / 2);
SetFocus((HWND)lParam);
}
@@ -465,11 +465,11 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int fade = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (fade < SETTING_FADEINTIME_MIN)
- PopUpOptions.FadeIn = SETTING_FADEINTIME_MIN;
+ PopupOptions.FadeIn = SETTING_FADEINTIME_MIN;
else if (fade > SETTING_FADEINTIME_MAX)
- PopUpOptions.FadeIn = SETTING_FADEINTIME_MAX;
- if (fade != PopUpOptions.FadeIn) {
- SetDlgItemInt(hwnd, idCtrl, PopUpOptions.FadeIn, FALSE);
+ PopupOptions.FadeIn = SETTING_FADEINTIME_MAX;
+ if (fade != PopupOptions.FadeIn) {
+ SetDlgItemInt(hwnd, idCtrl, PopupOptions.FadeIn, FALSE);
ErrorMSG(SETTING_FADEINTIME_MIN, SETTING_FADEINTIME_MAX);
SetFocus((HWND)lParam);
}
@@ -479,11 +479,11 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int fade = GetDlgItemInt(hwnd, idCtrl, NULL, FALSE);
if (fade < SETTING_FADEOUTTIME_MIN)
- PopUpOptions.FadeOut = SETTING_FADEOUTTIME_MIN;
+ PopupOptions.FadeOut = SETTING_FADEOUTTIME_MIN;
else if (fade > SETTING_FADEOUTTIME_MAX)
- PopUpOptions.FadeOut = SETTING_FADEOUTTIME_MAX;
- if (fade != PopUpOptions.FadeOut) {
- SetDlgItemInt(hwnd, idCtrl, PopUpOptions.FadeOut, FALSE);
+ PopupOptions.FadeOut = SETTING_FADEOUTTIME_MAX;
+ if (fade != PopupOptions.FadeOut) {
+ SetDlgItemInt(hwnd, idCtrl, PopupOptions.FadeOut, FALSE);
ErrorMSG(SETTING_FADEOUTTIME_MIN, SETTING_FADEOUTTIME_MAX);
SetFocus((HWND)lParam);
}
@@ -502,32 +502,32 @@ INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case PSN_APPLY:
//History
- db_set_b(NULL, MODULNAME, "EnableHistory", (BYTE)PopUpOptions.EnableHistory);
- db_set_w(NULL, MODULNAME, "HistorySize", PopUpOptions.HistorySize);
+ db_set_b(NULL, MODULNAME, "EnableHistory", (BYTE)PopupOptions.EnableHistory);
+ db_set_w(NULL, MODULNAME, "HistorySize", PopupOptions.HistorySize);
PopupHistoryResize();
- db_set_b(NULL, MODULNAME, "UseHppHistoryLog", PopUpOptions.UseHppHistoryLog);
+ db_set_b(NULL, MODULNAME, "UseHppHistoryLog", PopupOptions.UseHppHistoryLog);
//Avatars
- db_set_b(NULL, MODULNAME, "AvatarBorders", PopUpOptions.avatarBorders);
- db_set_b(NULL, MODULNAME, "AvatarPNGBorders", PopUpOptions.avatarPNGBorders);
- db_set_b(NULL, MODULNAME, "AvatarRadius", PopUpOptions.avatarRadius);
- db_set_w(NULL, MODULNAME, "AvatarSize", PopUpOptions.avatarSize);
- db_set_b(NULL, MODULNAME, "EnableAvatarUpdates", PopUpOptions.EnableAvatarUpdates);
+ db_set_b(NULL, MODULNAME, "AvatarBorders", PopupOptions.avatarBorders);
+ db_set_b(NULL, MODULNAME, "AvatarPNGBorders", PopupOptions.avatarPNGBorders);
+ db_set_b(NULL, MODULNAME, "AvatarRadius", PopupOptions.avatarRadius);
+ db_set_w(NULL, MODULNAME, "AvatarSize", PopupOptions.avatarSize);
+ db_set_b(NULL, MODULNAME, "EnableAvatarUpdates", PopupOptions.EnableAvatarUpdates);
//Monitor
- db_set_b(NULL, MODULNAME, "Monitor", PopUpOptions.Monitor);
+ db_set_b(NULL, MODULNAME, "Monitor", PopupOptions.Monitor);
//Transparency
- db_set_b(NULL, MODULNAME, "EnableRegionTransparency", PopUpOptions.Enable9xTransparency);
- db_set_b(NULL, MODULNAME, "UseTransparency", PopUpOptions.UseTransparency);
- db_set_b(NULL, MODULNAME, "Alpha", PopUpOptions.Alpha);
- db_set_b(NULL, MODULNAME, "OpaqueOnHover", PopUpOptions.OpaqueOnHover);
+ db_set_b(NULL, MODULNAME, "EnableRegionTransparency", PopupOptions.Enable9xTransparency);
+ db_set_b(NULL, MODULNAME, "UseTransparency", PopupOptions.UseTransparency);
+ db_set_b(NULL, MODULNAME, "Alpha", PopupOptions.Alpha);
+ db_set_b(NULL, MODULNAME, "OpaqueOnHover", PopupOptions.OpaqueOnHover);
//Effects
- db_set_b(NULL, MODULNAME, "UseAnimations", PopUpOptions.UseAnimations);
- db_set_b(NULL, MODULNAME, "Fade", PopUpOptions.UseEffect);
- db_set_ts(NULL, MODULNAME, "Effect", PopUpOptions.Effect);
- db_set_dw(NULL, MODULNAME, "FadeInTime", PopUpOptions.FadeIn);
- db_set_dw(NULL, MODULNAME, "FadeOutTime", PopUpOptions.FadeOut);
+ db_set_b(NULL, MODULNAME, "UseAnimations", PopupOptions.UseAnimations);
+ db_set_b(NULL, MODULNAME, "Fade", PopupOptions.UseEffect);
+ db_set_ts(NULL, MODULNAME, "Effect", PopupOptions.Effect);
+ db_set_dw(NULL, MODULNAME, "FadeInTime", PopupOptions.FadeIn);
+ db_set_dw(NULL, MODULNAME, "FadeOutTime", PopupOptions.FadeOut);
//other old stuff
- db_set_w(NULL, MODULNAME, "MaxPopups", (BYTE)PopUpOptions.MaxPopups);
+ db_set_w(NULL, MODULNAME, "MaxPopups", (BYTE)PopupOptions.MaxPopups);
}
return TRUE;
}
@@ -572,7 +572,7 @@ LRESULT CALLBACK AvatarTrackBarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA (rc.left+rc.right-newVal)/2, rc.bottom+2, newVal, newVal,
SWP_NOACTIVATE|SWP_DEFERERASE|SWP_NOSENDCHANGING|SWP_SHOWWINDOW);
- HRGN rgn = CreateRoundRectRgn(0, 0, newVal, newVal, 2 * PopUpOptions.avatarRadius, 2 * PopUpOptions.avatarRadius);
+ HRGN rgn = CreateRoundRectRgn(0, 0, newVal, newVal, 2 * PopupOptions.avatarRadius, 2 * PopupOptions.avatarRadius);
SetWindowRgn(hwndBox, rgn, TRUE);
InvalidateRect(hwndBox, NULL, FALSE);
oldVal = newVal;
diff --git a/plugins/Popup/src/opt_adv.h b/plugins/Popup/src/opt_adv.h index 8b2774c4bf..cadf0c4648 100644 --- a/plugins/Popup/src/opt_adv.h +++ b/plugins/Popup/src/opt_adv.h @@ -30,7 +30,7 @@ void OptAdv_RegisterVfx(char *name); void OptAdv_UnregisterVfx();
void LoadOption_AdvOpts();
-INT_PTR CALLBACK DlgProcPopUpAdvOpts(HWND, UINT, WPARAM, LPARAM);
+INT_PTR CALLBACK DlgProcPopupAdvOpts(HWND, UINT, WPARAM, LPARAM);
#endif // __opt_adv_h__
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index d39877f8b8..5e87499881 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -453,7 +453,7 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l for(i=0; i < gTreeData.getCount(); ++i) {
switch (gTreeData[i]->typ) {
case 1:
- LoadNotificationSettings(gTreeData[i], "PopUpNotifications");
+ LoadNotificationSettings(gTreeData[i], "PopupNotifications");
break;
case 2: //not finish
LoadClassSettings(gTreeData[i], PU_MODULCLASS);
@@ -468,11 +468,11 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l switch (gTreeData[i]->typ) {
case 1:
gTreeData[i]->notification.iSeconds = gTreeData[i]->timeoutValue;
- SaveNotificationSettings(gTreeData[i],"PopUpNotifications");
+ SaveNotificationSettings(gTreeData[i],"PopupNotifications");
break;
case 2: //not finish
gTreeData[i]->pupClass.iSeconds = gTreeData[i]->timeoutValue;
- SaveClassSettings(gTreeData[i],"PopUpCLASS");
+ SaveClassSettings(gTreeData[i],"PopupCLASS");
break;
}
}
@@ -509,7 +509,7 @@ void LoadClassSettings(POPUPTREEDATA *ptd, char* szModul) mir_snprintf(setting, sizeof(setting), "%s/TimeoutVal", ptd->pupClass.pszName);
ptd->timeoutValue =
(signed char)db_get_w(NULL, szModul, setting,
- ptd->pupClass.iSeconds ? ptd->pupClass.iSeconds : PopUpOptions.Seconds);
+ ptd->pupClass.iSeconds ? ptd->pupClass.iSeconds : PopupOptions.Seconds);
mir_snprintf(setting, sizeof(setting), "%s/leftAction", ptd->pupClass.pszName);
szTmp = db_get_s(NULL, szModul, setting, POPUP_ACTION_NOTHING); //standart ??
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 648df83f46..23cbb98aaf 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -88,43 +88,43 @@ int AddStatusModes(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flags) void LoadOption_General()
{
//Seconds
- PopUpOptions.InfiniteDelay = db_get_b(NULL, MODULNAME, "InfiniteDelay", FALSE);
- PopUpOptions.Seconds =
+ PopupOptions.InfiniteDelay = db_get_b(NULL, MODULNAME, "InfiniteDelay", FALSE);
+ PopupOptions.Seconds =
DBGetContactSettingRangedWord(NULL, MODULNAME, "Seconds", SETTING_LIFETIME_DEFAULT, SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);
- PopUpOptions.LeaveHovered = db_get_b(NULL, MODULNAME, "LeaveHovered", TRUE);
+ PopupOptions.LeaveHovered = db_get_b(NULL, MODULNAME, "LeaveHovered", TRUE);
//Dynamic Resize
- PopUpOptions.DynamicResize = db_get_b(NULL, MODULNAME, "DynamicResize", FALSE);
- PopUpOptions.UseMinimumWidth = db_get_b(NULL, MODULNAME, "UseMinimumWidth", TRUE);
- PopUpOptions.MinimumWidth = db_get_w(NULL, MODULNAME, "MinimumWidth", 160);
- PopUpOptions.UseMaximumWidth = db_get_b(NULL, MODULNAME, "UseMaximumWidth", TRUE);
- PopUpOptions.MaximumWidth = db_get_w(NULL, MODULNAME, "MaximumWidth", 300);
+ PopupOptions.DynamicResize = db_get_b(NULL, MODULNAME, "DynamicResize", FALSE);
+ PopupOptions.UseMinimumWidth = db_get_b(NULL, MODULNAME, "UseMinimumWidth", TRUE);
+ PopupOptions.MinimumWidth = db_get_w(NULL, MODULNAME, "MinimumWidth", 160);
+ PopupOptions.UseMaximumWidth = db_get_b(NULL, MODULNAME, "UseMaximumWidth", TRUE);
+ PopupOptions.MaximumWidth = db_get_w(NULL, MODULNAME, "MaximumWidth", 300);
//Position
- PopUpOptions.Position
+ PopupOptions.Position
= DBGetContactSettingRangedByte(NULL, MODULNAME, "Position", POS_LOWERRIGHT, POS_MINVALUE, POS_MAXVALUE);
//Configure popup area
- PopUpOptions.gapTop = db_get_w(NULL, MODULNAME, "gapTop", 5);
- PopUpOptions.gapBottom = db_get_w(NULL, MODULNAME, "gapBottom", 5);
- PopUpOptions.gapLeft = db_get_w(NULL, MODULNAME, "gapLeft", 5);
- PopUpOptions.gapRight = db_get_w(NULL, MODULNAME, "gapRight", 5);
- PopUpOptions.spacing = db_get_w(NULL, MODULNAME, "spacing", 5);
+ PopupOptions.gapTop = db_get_w(NULL, MODULNAME, "gapTop", 5);
+ PopupOptions.gapBottom = db_get_w(NULL, MODULNAME, "gapBottom", 5);
+ PopupOptions.gapLeft = db_get_w(NULL, MODULNAME, "gapLeft", 5);
+ PopupOptions.gapRight = db_get_w(NULL, MODULNAME, "gapRight", 5);
+ PopupOptions.spacing = db_get_w(NULL, MODULNAME, "spacing", 5);
//Spreading
- PopUpOptions.Spreading
+ PopupOptions.Spreading
= DBGetContactSettingRangedByte(NULL, MODULNAME, "Spreading", SPREADING_VERTICAL, SPREADING_MINVALUE, SPREADING_MAXVALUE);
//miscellaneous
- PopUpOptions.ReorderPopUps = db_get_b(NULL, MODULNAME, "ReorderPopUps", TRUE);
- PopUpOptions.ReorderPopUpsWarning = db_get_b(NULL, MODULNAME, "ReorderPopUpsWarning", TRUE);
+ PopupOptions.ReorderPopups = db_get_b(NULL, MODULNAME, "ReorderPopups", TRUE);
+ PopupOptions.ReorderPopupsWarning = db_get_b(NULL, MODULNAME, "ReorderPopupsWarning", TRUE);
//disable When
- PopUpOptions.ModuleIsEnabled = db_get_b(NULL, MODULNAME, "ModuleIsEnabled", TRUE);
- PopUpOptions.DisableWhenFullscreen = db_get_b(NULL, MODULNAME, "DisableWhenFullscreen", TRUE);
+ PopupOptions.ModuleIsEnabled = db_get_b(NULL, MODULNAME, "ModuleIsEnabled", TRUE);
+ PopupOptions.DisableWhenFullscreen = db_get_b(NULL, MODULNAME, "DisableWhenFullscreen", TRUE);
}
-INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopupGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
static bool bDlgInit = false; //some controls send WM_COMMAND before or during WM_INITDIALOG
@@ -139,37 +139,37 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM switch (msg) {
case WM_INITDIALOG:
//Seconds of delay
- CheckDlgButton(hwnd, IDC_INFINITEDELAY, PopUpOptions.InfiniteDelay);
- CheckDlgButton(hwnd, IDC_LEAVEHOVERED, PopUpOptions.LeaveHovered);
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS), !PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC1), !PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC2), !PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_LEAVEHOVERED), !PopUpOptions.InfiniteDelay);
- SetDlgItemInt(hwnd, IDC_SECONDS, PopUpOptions.Seconds, FALSE);
+ CheckDlgButton(hwnd, IDC_INFINITEDELAY, PopupOptions.InfiniteDelay);
+ CheckDlgButton(hwnd, IDC_LEAVEHOVERED, PopupOptions.LeaveHovered);
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS), !PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC1), !PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC2), !PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_LEAVEHOVERED), !PopupOptions.InfiniteDelay);
+ SetDlgItemInt(hwnd, IDC_SECONDS, PopupOptions.Seconds, FALSE);
SendDlgItemMessage(hwnd, IDC_SECONDS_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(SETTING_LIFETIME_MAX, SETTING_LIFETIME_MIN));
//Dynamic Resize
- CheckDlgButton(hwnd, IDC_DYNAMICRESIZE, PopUpOptions.DynamicResize);
- SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? LPGENT("Maximum width"): LPGENT("Width"));
+ CheckDlgButton(hwnd, IDC_DYNAMICRESIZE, PopupOptions.DynamicResize);
+ SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopupOptions.DynamicResize ? LPGENT("Maximum width"): LPGENT("Width"));
//Minimum Width
- CheckDlgButton(hwnd, IDC_USEMINIMUMWIDTH, PopUpOptions.UseMinimumWidth);
+ CheckDlgButton(hwnd, IDC_USEMINIMUMWIDTH, PopupOptions.UseMinimumWidth);
SendDlgItemMessage(hwnd, IDC_MINIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(
SETTING_MAXIMUMWIDTH_MAX,
SETTING_MINIMUMWIDTH_MIN));
- SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopUpOptions.MinimumWidth, FALSE);
+ SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopupOptions.MinimumWidth, FALSE);
//Maximum Width
- PopUpOptions.UseMaximumWidth = PopUpOptions.DynamicResize ? PopUpOptions.UseMaximumWidth : TRUE;
- CheckDlgButton(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.UseMaximumWidth);
+ PopupOptions.UseMaximumWidth = PopupOptions.DynamicResize ? PopupOptions.UseMaximumWidth : TRUE;
+ CheckDlgButton(hwnd, IDC_USEMAXIMUMWIDTH, PopupOptions.UseMaximumWidth);
SendDlgItemMessage(hwnd, IDC_MAXIMUMWIDTH_SPIN, UDM_SETRANGE, 0, (LPARAM)MAKELONG(
SETTING_MAXIMUMWIDTH_MAX,
SETTING_MINIMUMWIDTH_MIN));
- SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopUpOptions.MaximumWidth, FALSE);
+ SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopupOptions.MaximumWidth, FALSE);
//And finally let's enable/disable them.
- EnableWindow(GetDlgItem(hwnd, IDC_USEMINIMUMWIDTH), PopUpOptions.DynamicResize);
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopUpOptions.DynamicResize && PopUpOptions.UseMinimumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopUpOptions.DynamicResize && PopUpOptions.UseMinimumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH), PopUpOptions.UseMaximumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH_SPIN), PopUpOptions.UseMaximumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_USEMINIMUMWIDTH), PopupOptions.DynamicResize);
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopupOptions.DynamicResize && PopupOptions.UseMinimumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopupOptions.DynamicResize && PopupOptions.UseMinimumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH), PopupOptions.UseMaximumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH_SPIN), PopupOptions.UseMaximumWidth);
//Position combobox.
{
@@ -178,7 +178,7 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("lower left corner")) ,POS_LOWERLEFT);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("lower right corner")) ,POS_LOWERRIGHT);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("upper right corner")) ,POS_UPPERRIGHT);
- SendDlgItemMessage(hwnd, IDC_WHERE, CB_SETCURSEL, (PopUpOptions.Position) , 0);
+ SendDlgItemMessage(hwnd, IDC_WHERE, CB_SETCURSEL, (PopupOptions.Position) , 0);
}
//Configure popup area
{
@@ -192,16 +192,16 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM HWND hCtrl = GetDlgItem(hwnd, IDC_LAYOUT);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("horizontal")) ,SPREADING_HORIZONTAL);
ComboBox_SetItemData(hCtrl, ComboBox_AddString(hCtrl, TranslateT("vertical")) ,SPREADING_VERTICAL);
- SendDlgItemMessage(hwnd, IDC_LAYOUT, CB_SETCURSEL, (PopUpOptions.Spreading), 0);
+ SendDlgItemMessage(hwnd, IDC_LAYOUT, CB_SETCURSEL, (PopupOptions.Spreading), 0);
}
//miscellaneous
- CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopUpOptions.ReorderPopUps);
+ CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopupOptions.ReorderPopups);
//Popup enabled
- CheckDlgButton(hwnd, IDC_POPUPENABLED, PopUpOptions.ModuleIsEnabled?BST_UNCHECKED:BST_CHECKED);
- CheckDlgButton(hwnd, IDC_DISABLEINFS, PopUpOptions.DisableWhenFullscreen);
- EnableWindow(GetDlgItem(hwnd, IDC_DISABLEINFS), PopUpOptions.ModuleIsEnabled);
- EnableWindow(GetDlgItem(hwnd, IDC_STATUSES), PopUpOptions.ModuleIsEnabled);
+ CheckDlgButton(hwnd, IDC_POPUPENABLED, PopupOptions.ModuleIsEnabled?BST_UNCHECKED:BST_CHECKED);
+ CheckDlgButton(hwnd, IDC_DISABLEINFS, PopupOptions.DisableWhenFullscreen);
+ EnableWindow(GetDlgItem(hwnd, IDC_DISABLEINFS), PopupOptions.ModuleIsEnabled);
+ EnableWindow(GetDlgItem(hwnd, IDC_STATUSES), PopupOptions.ModuleIsEnabled);
//new status options
{
@@ -256,27 +256,27 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case BN_CLICKED: //Button controls
switch( LOWORD(wParam)) {
case IDC_INFINITEDELAY:
- PopUpOptions.InfiniteDelay = !PopUpOptions.InfiniteDelay;
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS),!PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC1), !PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC2), !PopUpOptions.InfiniteDelay);
- EnableWindow(GetDlgItem(hwnd, IDC_LEAVEHOVERED), !PopUpOptions.InfiniteDelay);
+ PopupOptions.InfiniteDelay = !PopupOptions.InfiniteDelay;
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS),!PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC1), !PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_SECONDS_STATIC2), !PopupOptions.InfiniteDelay);
+ EnableWindow(GetDlgItem(hwnd, IDC_LEAVEHOVERED), !PopupOptions.InfiniteDelay);
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_LEAVEHOVERED:
- PopUpOptions.LeaveHovered = !PopUpOptions.LeaveHovered;
+ PopupOptions.LeaveHovered = !PopupOptions.LeaveHovered;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_DYNAMICRESIZE:
- PopUpOptions.DynamicResize=!PopUpOptions.DynamicResize;
- EnableWindow(GetDlgItem(hwnd, IDC_USEMINIMUMWIDTH), PopUpOptions.DynamicResize);
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopUpOptions.DynamicResize && PopUpOptions.UseMinimumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopUpOptions.DynamicResize && PopUpOptions.UseMinimumWidth);
- SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopUpOptions.DynamicResize ? TranslateT("Maximum width"): TranslateT("Width"));
- if (!PopUpOptions.DynamicResize) {
- PopUpOptions.UseMaximumWidth = TRUE;
+ PopupOptions.DynamicResize=!PopupOptions.DynamicResize;
+ EnableWindow(GetDlgItem(hwnd, IDC_USEMINIMUMWIDTH), PopupOptions.DynamicResize);
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopupOptions.DynamicResize && PopupOptions.UseMinimumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopupOptions.DynamicResize && PopupOptions.UseMinimumWidth);
+ SetDlgItemText(hwnd, IDC_USEMAXIMUMWIDTH, PopupOptions.DynamicResize ? TranslateT("Maximum width"): TranslateT("Width"));
+ if (!PopupOptions.DynamicResize) {
+ PopupOptions.UseMaximumWidth = TRUE;
CheckDlgButton(hwnd, IDC_USEMAXIMUMWIDTH, BST_CHECKED);
EnableWindow(GetDlgItem(hwnd, IDC_USEMAXIMUMWIDTH), TRUE);
EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH), TRUE);
@@ -286,20 +286,20 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM break;
case IDC_USEMINIMUMWIDTH:
- PopUpOptions.UseMinimumWidth= !PopUpOptions.UseMinimumWidth;
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopUpOptions.UseMinimumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopUpOptions.UseMinimumWidth);
+ PopupOptions.UseMinimumWidth= !PopupOptions.UseMinimumWidth;
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH), PopupOptions.UseMinimumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MINIMUMWIDTH_SPIN), PopupOptions.UseMinimumWidth);
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_USEMAXIMUMWIDTH:
- PopUpOptions.UseMaximumWidth= Button_GetCheck((HWND)lParam);
- if (!PopUpOptions.DynamicResize) { //ugly - set always on if DynamicResize = off
+ PopupOptions.UseMaximumWidth= Button_GetCheck((HWND)lParam);
+ if (!PopupOptions.DynamicResize) { //ugly - set always on if DynamicResize = off
CheckDlgButton(hwnd, LOWORD(wParam), BST_CHECKED);
- PopUpOptions.UseMaximumWidth = TRUE;
+ PopupOptions.UseMaximumWidth = TRUE;
}
- EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH), PopUpOptions.UseMaximumWidth);
- EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH_SPIN), PopUpOptions.UseMaximumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH), PopupOptions.UseMaximumWidth);
+ EnableWindow(GetDlgItem(hwnd, IDC_MAXIMUMWIDTH_SPIN), PopupOptions.UseMaximumWidth);
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
@@ -333,9 +333,9 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case IDC_REORDERPOPUPS:
{
- PopUpOptions.ReorderPopUps = !PopUpOptions.ReorderPopUps;
- PopUpOptions.ReorderPopUpsWarning = PopUpOptions.ReorderPopUps ?
- db_get_b(NULL, MODULNAME, "ReorderPopUpsWarning", TRUE) : TRUE;
+ PopupOptions.ReorderPopups = !PopupOptions.ReorderPopups;
+ PopupOptions.ReorderPopupsWarning = PopupOptions.ReorderPopups ?
+ db_get_b(NULL, MODULNAME, "ReorderPopupsWarning", TRUE) : TRUE;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
break;
@@ -343,20 +343,20 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case IDC_POPUPENABLED:
{
int chk = IsDlgButtonChecked(hwnd, IDC_POPUPENABLED);
- if (PopUpOptions.ModuleIsEnabled&&chk || !PopUpOptions.ModuleIsEnabled&&!chk)
+ if (PopupOptions.ModuleIsEnabled&&chk || !PopupOptions.ModuleIsEnabled&&!chk)
svcEnableDisableMenuCommand(0,0);
- EnableWindow(GetDlgItem(hwnd, IDC_STATUSES), PopUpOptions.ModuleIsEnabled);
- EnableWindow(GetDlgItem(hwnd, IDC_DISABLEINFS), PopUpOptions.ModuleIsEnabled);
+ EnableWindow(GetDlgItem(hwnd, IDC_STATUSES), PopupOptions.ModuleIsEnabled);
+ EnableWindow(GetDlgItem(hwnd, IDC_DISABLEINFS), PopupOptions.ModuleIsEnabled);
}
break;
case IDC_DISABLEINFS:
- PopUpOptions.DisableWhenFullscreen = !PopUpOptions.DisableWhenFullscreen;
+ PopupOptions.DisableWhenFullscreen = !PopupOptions.DisableWhenFullscreen;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_PREVIEW:
- PopUpPreview();
+ PopupPreview();
break;
}
break;
@@ -365,11 +365,11 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM switch( LOWORD(wParam)) {
//lParam = Handle to the control
case IDC_WHERE:
- PopUpOptions.Position = ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
+ PopupOptions.Position = ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
case IDC_LAYOUT:
- PopUpOptions.Spreading = ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
+ PopupOptions.Spreading = ComboBox_GetItemData((HWND)lParam, ComboBox_GetCurSel((HWND)lParam));
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
break;
}
@@ -384,8 +384,8 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int seconds = GetDlgItemInt(hwnd, LOWORD(wParam), NULL, FALSE);
if ( seconds >= SETTING_LIFETIME_MIN &&
seconds <= SETTING_LIFETIME_MAX &&
- seconds != PopUpOptions.Seconds) {
- PopUpOptions.Seconds = seconds;
+ seconds != PopupOptions.Seconds) {
+ PopupOptions.Seconds = seconds;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -395,8 +395,8 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int temp = GetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, NULL, FALSE);
if ( temp >= SETTING_MINIMUMWIDTH_MIN &&
temp <= SETTING_MAXIMUMWIDTH_MAX &&
- temp != PopUpOptions.MinimumWidth) {
- PopUpOptions.MinimumWidth = temp;
+ temp != PopupOptions.MinimumWidth) {
+ PopupOptions.MinimumWidth = temp;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -406,8 +406,8 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM int temp = GetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, NULL, FALSE);
if ( temp >= SETTING_MINIMUMWIDTH_MIN &&
temp <= SETTING_MAXIMUMWIDTH_MAX &&
- temp != PopUpOptions.MaximumWidth) {
- PopUpOptions.MaximumWidth = temp;
+ temp != PopupOptions.MaximumWidth) {
+ PopupOptions.MaximumWidth = temp;
SendMessage(GetParent(hwnd), PSM_CHANGED, 0, 0);
}
}
@@ -422,11 +422,11 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int seconds = GetDlgItemInt(hwnd, LOWORD(wParam), NULL, FALSE);
if (seconds > SETTING_LIFETIME_MAX)
- PopUpOptions.Seconds = SETTING_LIFETIME_MAX;
+ PopupOptions.Seconds = SETTING_LIFETIME_MAX;
else if (seconds < SETTING_LIFETIME_MIN)
- PopUpOptions.Seconds = SETTING_LIFETIME_MIN;
- if (seconds != PopUpOptions.Seconds) {
- SetDlgItemInt(hwnd, LOWORD(wParam), PopUpOptions.Seconds, FALSE);
+ PopupOptions.Seconds = SETTING_LIFETIME_MIN;
+ if (seconds != PopupOptions.Seconds) {
+ SetDlgItemInt(hwnd, LOWORD(wParam), PopupOptions.Seconds, FALSE);
ErrorMSG(SETTING_LIFETIME_MIN, SETTING_LIFETIME_MAX);
SetFocus((HWND)lParam);
}
@@ -436,18 +436,18 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int temp = GetDlgItemInt(hwnd, LOWORD(wParam), NULL, FALSE);
if (temp < SETTING_MINIMUMWIDTH_MIN)
- PopUpOptions.MinimumWidth = SETTING_MINIMUMWIDTH_MIN;
+ PopupOptions.MinimumWidth = SETTING_MINIMUMWIDTH_MIN;
else if (temp > SETTING_MAXIMUMWIDTH_MAX)
- PopUpOptions.MinimumWidth = SETTING_MAXIMUMWIDTH_MAX;
- if (temp != PopUpOptions.MinimumWidth) {
- SetDlgItemInt(hwnd, LOWORD(wParam), PopUpOptions.MinimumWidth, FALSE);
+ PopupOptions.MinimumWidth = SETTING_MAXIMUMWIDTH_MAX;
+ if (temp != PopupOptions.MinimumWidth) {
+ SetDlgItemInt(hwnd, LOWORD(wParam), PopupOptions.MinimumWidth, FALSE);
ErrorMSG(SETTING_MINIMUMWIDTH_MIN, SETTING_MAXIMUMWIDTH_MAX);
SetFocus((HWND)lParam);
break;
}
- if (temp > PopUpOptions.MaximumWidth) {
- PopUpOptions.MaximumWidth = min(temp, SETTING_MAXIMUMWIDTH_MAX);
- SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopUpOptions.MaximumWidth, FALSE);
+ if (temp > PopupOptions.MaximumWidth) {
+ PopupOptions.MaximumWidth = min(temp, SETTING_MAXIMUMWIDTH_MAX);
+ SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopupOptions.MaximumWidth, FALSE);
}
}
break;
@@ -455,18 +455,18 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
int temp = GetDlgItemInt(hwnd, LOWORD(wParam), NULL, FALSE);
if (temp >= SETTING_MAXIMUMWIDTH_MAX)
- PopUpOptions.MaximumWidth = SETTING_MAXIMUMWIDTH_MAX;
+ PopupOptions.MaximumWidth = SETTING_MAXIMUMWIDTH_MAX;
else if (temp < SETTING_MINIMUMWIDTH_MIN)
- PopUpOptions.MaximumWidth = SETTING_MINIMUMWIDTH_MIN;
- if (temp != PopUpOptions.MaximumWidth) {
- SetDlgItemInt(hwnd, LOWORD(wParam), PopUpOptions.MaximumWidth, FALSE);
+ PopupOptions.MaximumWidth = SETTING_MINIMUMWIDTH_MIN;
+ if (temp != PopupOptions.MaximumWidth) {
+ SetDlgItemInt(hwnd, LOWORD(wParam), PopupOptions.MaximumWidth, FALSE);
ErrorMSG(SETTING_MINIMUMWIDTH_MIN, SETTING_MAXIMUMWIDTH_MAX);
SetFocus((HWND)lParam);
break;
}
- if (temp < PopUpOptions.MinimumWidth) {
- PopUpOptions.MinimumWidth = max(temp, SETTING_MINIMUMWIDTH_MIN);
- SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopUpOptions.MinimumWidth, FALSE);
+ if (temp < PopupOptions.MinimumWidth) {
+ PopupOptions.MinimumWidth = max(temp, SETTING_MINIMUMWIDTH_MIN);
+ SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopupOptions.MinimumWidth, FALSE);
}
}
break;
@@ -485,35 +485,35 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM case PSN_APPLY:
//Seconds
- db_set_b(NULL, MODULNAME, "InfiniteDelay", PopUpOptions.InfiniteDelay);
- db_set_w(NULL, MODULNAME, "Seconds", (WORD)PopUpOptions.Seconds);
- db_set_b(NULL, MODULNAME, "LeaveHovered", PopUpOptions.LeaveHovered);
+ db_set_b(NULL, MODULNAME, "InfiniteDelay", PopupOptions.InfiniteDelay);
+ db_set_w(NULL, MODULNAME, "Seconds", (WORD)PopupOptions.Seconds);
+ db_set_b(NULL, MODULNAME, "LeaveHovered", PopupOptions.LeaveHovered);
//Dynamic Resize
- db_set_b(NULL, MODULNAME, "DynamicResize", PopUpOptions.DynamicResize);
- db_set_b(NULL, MODULNAME, "UseMinimumWidth", PopUpOptions.UseMinimumWidth);
- db_set_w(NULL, MODULNAME, "MinimumWidth", PopUpOptions.MinimumWidth);
- db_set_b(NULL, MODULNAME, "UseMaximumWidth", PopUpOptions.UseMaximumWidth);
- db_set_w(NULL, MODULNAME, "MaximumWidth", PopUpOptions.MaximumWidth);
+ db_set_b(NULL, MODULNAME, "DynamicResize", PopupOptions.DynamicResize);
+ db_set_b(NULL, MODULNAME, "UseMinimumWidth", PopupOptions.UseMinimumWidth);
+ db_set_w(NULL, MODULNAME, "MinimumWidth", PopupOptions.MinimumWidth);
+ db_set_b(NULL, MODULNAME, "UseMaximumWidth", PopupOptions.UseMaximumWidth);
+ db_set_w(NULL, MODULNAME, "MaximumWidth", PopupOptions.MaximumWidth);
//Position
- db_set_b(NULL, MODULNAME, "Position", (BYTE)PopUpOptions.Position);
+ db_set_b(NULL, MODULNAME, "Position", (BYTE)PopupOptions.Position);
//Configure popup area
- db_set_w(NULL, MODULNAME, "gapTop", (WORD)PopUpOptions.gapTop);
- db_set_w(NULL, MODULNAME, "gapBottom", (WORD)PopUpOptions.gapBottom);
- db_set_w(NULL, MODULNAME, "gapLeft", (WORD)PopUpOptions.gapLeft);
- db_set_w(NULL, MODULNAME, "gapRight", (WORD)PopUpOptions.gapRight);
- db_set_w(NULL, MODULNAME, "spacing", (WORD)PopUpOptions.spacing);
+ db_set_w(NULL, MODULNAME, "gapTop", (WORD)PopupOptions.gapTop);
+ db_set_w(NULL, MODULNAME, "gapBottom", (WORD)PopupOptions.gapBottom);
+ db_set_w(NULL, MODULNAME, "gapLeft", (WORD)PopupOptions.gapLeft);
+ db_set_w(NULL, MODULNAME, "gapRight", (WORD)PopupOptions.gapRight);
+ db_set_w(NULL, MODULNAME, "spacing", (WORD)PopupOptions.spacing);
//Spreading
- db_set_b(NULL, MODULNAME, "Spreading", (BYTE)PopUpOptions.Spreading);
+ db_set_b(NULL, MODULNAME, "Spreading", (BYTE)PopupOptions.Spreading);
//miscellaneous
- Check_ReorderPopUps(hwnd); //this save also PopUpOptions.ReorderPopUps
+ Check_ReorderPopups(hwnd); //this save also PopupOptions.ReorderPopups
//disable When
- db_set_b(NULL, MODULNAME, "DisableWhenFullscreen", PopUpOptions.DisableWhenFullscreen);
+ db_set_b(NULL, MODULNAME, "DisableWhenFullscreen", PopupOptions.DisableWhenFullscreen);
//new status options
{
@@ -539,9 +539,9 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
LPNMUPDOWN lpnmud = (LPNMUPDOWN) lParam;
int temp = lpnmud->iPos + lpnmud->iDelta;
- if (temp > PopUpOptions.MaximumWidth) {
- PopUpOptions.MaximumWidth = min(temp, SETTING_MAXIMUMWIDTH_MAX);
- SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopUpOptions.MaximumWidth, FALSE);
+ if (temp > PopupOptions.MaximumWidth) {
+ PopupOptions.MaximumWidth = min(temp, SETTING_MAXIMUMWIDTH_MAX);
+ SetDlgItemInt(hwnd, IDC_MAXIMUMWIDTH, PopupOptions.MaximumWidth, FALSE);
}
}
break;
@@ -550,9 +550,9 @@ INT_PTR CALLBACK DlgProcPopUpGeneral(HWND hwnd, UINT msg, WPARAM wParam, LPARAM {
LPNMUPDOWN lpnmud = (LPNMUPDOWN) lParam;
int temp = lpnmud->iPos + lpnmud->iDelta;
- if (temp < PopUpOptions.MinimumWidth) {
- PopUpOptions.MinimumWidth = max(temp, SETTING_MINIMUMWIDTH_MIN);
- SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopUpOptions.MinimumWidth, FALSE);
+ if (temp < PopupOptions.MinimumWidth) {
+ PopupOptions.MinimumWidth = max(temp, SETTING_MINIMUMWIDTH_MIN);
+ SetDlgItemInt(hwnd, IDC_MINIMUMWIDTH, PopupOptions.MinimumWidth, FALSE);
}
}
}
@@ -581,29 +581,29 @@ void ErrorMSG(int minValue, int maxValue) MSGERROR(str);
}
-void Check_ReorderPopUps(HWND hwnd) {
- if (!PopUpOptions.ReorderPopUps && PopUpOptions.ReorderPopUpsWarning) {
+void Check_ReorderPopups(HWND hwnd) {
+ if (!PopupOptions.ReorderPopups && PopupOptions.ReorderPopupsWarning) {
int res = MessageBox(hwnd,
TranslateT("'Reorder Popups' option is currently diabled.\r\nThis may cause misaligned popups when used with\r\navatars and text replacement (mainly NewStatusNotify).\r\n\r\nDo you want to enable popup reordering now?\r\n"),
TranslateT("Popup Plus Warning"), MB_ICONEXCLAMATION | MB_YESNOCANCEL);
switch (res) {
case IDYES:
- PopUpOptions.ReorderPopUps = TRUE;
+ PopupOptions.ReorderPopups = TRUE;
//Reset warning for next option change !!!
- PopUpOptions.ReorderPopUpsWarning = TRUE;
+ PopupOptions.ReorderPopupsWarning = TRUE;
break;
case IDNO:
- PopUpOptions.ReorderPopUps = FALSE;
- PopUpOptions.ReorderPopUpsWarning = FALSE;
+ PopupOptions.ReorderPopups = FALSE;
+ PopupOptions.ReorderPopupsWarning = FALSE;
break;
default:
return;
}
}
- db_set_b(NULL, MODULNAME, "ReorderPopUps", PopUpOptions.ReorderPopUps);
- db_set_b(NULL, MODULNAME, "ReorderPopUpsWarning", PopUpOptions.ReorderPopUpsWarning);
- if (hwnd) CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopUpOptions.ReorderPopUps);
+ db_set_b(NULL, MODULNAME, "ReorderPopups", PopupOptions.ReorderPopups);
+ db_set_b(NULL, MODULNAME, "ReorderPopupsWarning", PopupOptions.ReorderPopupsWarning);
+ if (hwnd) CheckDlgButton(hwnd, IDC_REORDERPOPUPS, PopupOptions.ReorderPopups);
}
void ThemeDialogBackground(HWND hwnd)
@@ -642,22 +642,22 @@ INT_PTR CALLBACK PositionBoxDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage(GetDlgItem(hwndDlg, IDCANCEL), BUTTONADDTOOLTIP, (WPARAM)_T("Cancel"), BATF_TCHAR);
SendMessage(GetDlgItem(hwndDlg, IDCANCEL), BM_SETIMAGE, IMAGE_ICON, (LPARAM)IcoLib_GetIcon(ICO_OPT_CANCEL,0));
- SetDlgItemInt(hwndDlg, IDC_TXT_TOP, PopUpOptions.gapTop, FALSE);
- SetDlgItemInt(hwndDlg, IDC_TXT_BOTTOM, PopUpOptions.gapBottom, FALSE);
- SetDlgItemInt(hwndDlg, IDC_TXT_LEFT, PopUpOptions.gapLeft, FALSE);
- SetDlgItemInt(hwndDlg, IDC_TXT_RIGHT, PopUpOptions.gapRight, FALSE);
- SetDlgItemInt(hwndDlg, IDC_TXT_SPACING, PopUpOptions.spacing, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_TXT_TOP, PopupOptions.gapTop, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_TXT_BOTTOM, PopupOptions.gapBottom, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_TXT_LEFT, PopupOptions.gapLeft, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_TXT_RIGHT, PopupOptions.gapRight, FALSE);
+ SetDlgItemInt(hwndDlg, IDC_TXT_SPACING, PopupOptions.spacing, FALSE);
TranslateDialogDefault(hwndDlg);
break;
case WM_COMMAND:
if ((LOWORD(wParam)) == IDOK) {
- PopUpOptions.gapTop = GetDlgItemInt(hwndDlg, IDC_TXT_TOP, NULL, FALSE);
- PopUpOptions.gapBottom = GetDlgItemInt(hwndDlg, IDC_TXT_BOTTOM, NULL, FALSE);
- PopUpOptions.gapLeft = GetDlgItemInt(hwndDlg, IDC_TXT_LEFT, NULL, FALSE);
- PopUpOptions.gapRight = GetDlgItemInt(hwndDlg, IDC_TXT_RIGHT, NULL, FALSE);
- PopUpOptions.spacing = GetDlgItemInt(hwndDlg, IDC_TXT_SPACING, NULL, FALSE);
+ PopupOptions.gapTop = GetDlgItemInt(hwndDlg, IDC_TXT_TOP, NULL, FALSE);
+ PopupOptions.gapBottom = GetDlgItemInt(hwndDlg, IDC_TXT_BOTTOM, NULL, FALSE);
+ PopupOptions.gapLeft = GetDlgItemInt(hwndDlg, IDC_TXT_LEFT, NULL, FALSE);
+ PopupOptions.gapRight = GetDlgItemInt(hwndDlg, IDC_TXT_RIGHT, NULL, FALSE);
+ PopupOptions.spacing = GetDlgItemInt(hwndDlg, IDC_TXT_SPACING, NULL, FALSE);
PostMessage(hwndDlg, WM_CLOSE, 0, 0);
}
else if ((LOWORD(wParam)) == IDCANCEL)
diff --git a/plugins/Popup/src/opt_gen.h b/plugins/Popup/src/opt_gen.h index 48dfda6f13..6a5c037b38 100644 --- a/plugins/Popup/src/opt_gen.h +++ b/plugins/Popup/src/opt_gen.h @@ -25,8 +25,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __opt_gen_h__
void LoadOption_General();
-void Check_ReorderPopUps(HWND hwnd = 0);
-INT_PTR CALLBACK DlgProcPopUpGeneral(HWND, UINT, WPARAM, LPARAM);
+void Check_ReorderPopups(HWND hwnd = 0);
+INT_PTR CALLBACK DlgProcPopupGeneral(HWND, UINT, WPARAM, LPARAM);
void ErrorMSG(int minValue, int maxValue);
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index 8075bee830..f79259cc24 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -79,7 +79,7 @@ static void updatePreviewImage(HWND hwndBox) ppd.lptzTitle = TranslateT("Skin preview");
ppd.lptzText = TranslateT("Just take a look at this skin... ;)");
- POPUPOPTIONS customOptions = PopUpOptions;
+ POPUPOPTIONS customOptions = PopupOptions;
customOptions.DynamicResize = FALSE;
customOptions.MinimumWidth = customOptions.MaximumWidth = 250;
@@ -177,7 +177,7 @@ LRESULT CALLBACK WndProcPreviewBox(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP int SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos, DWORD *dwGlobalOptions) {
const PopupSkin *skin = 0;
LPTSTR pszName = NULL;
- if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
+ if (skin = skins.getSkin(PopupOptions.SkinPack)) {
for (int i = 1; i <= 10; i++) {
if (!skin->getFlagName(i))
continue;
@@ -214,32 +214,32 @@ int SkinOptionList_AddMain(OPTTREE_OPTION* &options, int *OptionsCount, int pos bCheck = 0;
switch (i) {
case 0:
- *dwGlobalOptions |= PopUpOptions.DisplayTime ? (1 << i) : 0;
- bCheck = PopUpOptions.DisplayTime;
+ *dwGlobalOptions |= PopupOptions.DisplayTime ? (1 << i) : 0;
+ bCheck = PopupOptions.DisplayTime;
break;
case 1:
if (!IsWinVerXPPlus()) continue;
- *dwGlobalOptions |= PopUpOptions.DropShadow ? (1 << i) : 0;
- bCheck = PopUpOptions.DropShadow;
+ *dwGlobalOptions |= PopupOptions.DropShadow ? (1 << i) : 0;
+ bCheck = PopupOptions.DropShadow;
break;
case 2:
if (!IsWinVerXPPlus()) continue;
- *dwGlobalOptions |= PopUpOptions.EnableFreeformShadows ? (1 << i) : 0;
- bCheck = PopUpOptions.EnableFreeformShadows;
+ *dwGlobalOptions |= PopupOptions.EnableFreeformShadows ? (1 << i) : 0;
+ bCheck = PopupOptions.EnableFreeformShadows;
break;
case 3:
if (!MyDwmEnableBlurBehindWindow) continue;
- *dwGlobalOptions |= PopUpOptions.EnableAeroGlass ? (1 << i) : 0;
- bCheck = PopUpOptions.EnableAeroGlass;
+ *dwGlobalOptions |= PopupOptions.EnableAeroGlass ? (1 << i) : 0;
+ bCheck = PopupOptions.EnableAeroGlass;
break;
case 4:
- *dwGlobalOptions |= PopUpOptions.UseWinColors ? (1 << i) : 0;
- bCheck = PopUpOptions.UseWinColors;
+ *dwGlobalOptions |= PopupOptions.UseWinColors ? (1 << i) : 0;
+ bCheck = PopupOptions.UseWinColors;
break;
case 5:
if (!(htuText&&htuTitle)) continue;
- *dwGlobalOptions |= PopUpOptions.UseMText ? (1 << i) : 0;
- bCheck = PopUpOptions.UseMText;
+ *dwGlobalOptions |= PopupOptions.UseMText ? (1 << i) : 0;
+ bCheck = PopupOptions.UseMText;
break;
}
*OptionsCount += 1;
@@ -283,7 +283,7 @@ bool SkinOptionList_Update (OPTTREE_OPTION* &options, int *OptionsCount, HWND hw //check "Skin options" state
char prefix[128];
- mir_snprintf(prefix, sizeof(prefix),"skin.%S", PopUpOptions.SkinPack);
+ mir_snprintf(prefix, sizeof(prefix),"skin.%S", PopupOptions.SkinPack);
OptTree_SetOptions(hwndDlg, IDC_SKIN_LIST_OPT, options, *OptionsCount,
db_get_dw(NULL, MODULNAME, prefix, dwSkinOptions), _T("Skin options"));
@@ -296,14 +296,14 @@ bool SkinOptionList_Update (OPTTREE_OPTION* &options, int *OptionsCount, HWND hw void LoadOption_Skins() {
//skin pack
- PopUpOptions.SkinPack = (LPTSTR)DBGetContactSettingStringX(NULL,MODULNAME, "SkinPack", "* Popup Classic",DBVT_TCHAR);
+ PopupOptions.SkinPack = (LPTSTR)DBGetContactSettingStringX(NULL,MODULNAME, "SkinPack", "* Popup Classic",DBVT_TCHAR);
//more Skin options
- PopUpOptions.DisplayTime = db_get_b(NULL,MODULNAME, "DisplayTime", TRUE);
- PopUpOptions.DropShadow = db_get_b(NULL,MODULNAME, "DropShadow", TRUE);
- PopUpOptions.EnableFreeformShadows = db_get_b(NULL,MODULNAME, "EnableShadowRegion", 1);
- PopUpOptions.EnableAeroGlass = db_get_b(NULL,MODULNAME, "EnableAeroGlass", 1);
- PopUpOptions.UseWinColors = db_get_b(NULL,MODULNAME, "UseWinColors", FALSE);
- PopUpOptions.UseMText = db_get_b(NULL,MODULNAME, "UseMText", TRUE);
+ PopupOptions.DisplayTime = db_get_b(NULL,MODULNAME, "DisplayTime", TRUE);
+ PopupOptions.DropShadow = db_get_b(NULL,MODULNAME, "DropShadow", TRUE);
+ PopupOptions.EnableFreeformShadows = db_get_b(NULL,MODULNAME, "EnableShadowRegion", 1);
+ PopupOptions.EnableAeroGlass = db_get_b(NULL,MODULNAME, "EnableAeroGlass", 1);
+ PopupOptions.UseWinColors = db_get_b(NULL,MODULNAME, "UseWinColors", FALSE);
+ PopupOptions.UseMText = db_get_b(NULL,MODULNAME, "UseMText", TRUE);
}
INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -319,29 +319,29 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR if (index != -1) {
if (lstrcmp(skinOptions[index].pszSettingName, _T("Skin options")) == 0) {
const PopupSkin *skin = 0;
- if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
+ if (skin = skins.getSkin(PopupOptions.SkinPack)) {
skin->setFlag(skinOptions[index].Data, skinOptions[index].bState ? true : false);
}
}
else if (lstrcmp(skinOptions[index].pszSettingName, _T("Global settings")) == 0) {
switch (skinOptions[index].dwFlag) {
case (1 << 0):
- PopUpOptions.DisplayTime = skinOptions[index].bState;
+ PopupOptions.DisplayTime = skinOptions[index].bState;
break;
case (1 << 1):
- PopUpOptions.DropShadow = skinOptions[index].bState;
+ PopupOptions.DropShadow = skinOptions[index].bState;
break;
case (1 << 2):
- PopUpOptions.EnableFreeformShadows = skinOptions[index].bState;
+ PopupOptions.EnableFreeformShadows = skinOptions[index].bState;
break;
case (1 << 3):
- PopUpOptions.EnableAeroGlass = skinOptions[index].bState;
+ PopupOptions.EnableAeroGlass = skinOptions[index].bState;
break;
case (1 << 4):
- PopUpOptions.UseWinColors = skinOptions[index].bState;
+ PopupOptions.UseWinColors = skinOptions[index].bState;
break;
case (1 << 5):
- PopUpOptions.UseMText = skinOptions[index].bState;
+ PopupOptions.UseMText = skinOptions[index].bState;
break;
}
}
@@ -365,7 +365,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dwIndex = ListBox_AddString(hCtrl, sl->name);
ListBox_SetItemData(hCtrl, dwIndex, sl->name);
}
- ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopUpOptions.SkinPack));
+ ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));
//Skin List reload button
SendMessage(GetDlgItem(hwndDlg, IDC_BTN_RELOAD), BUTTONSETASFLATBTN, TRUE, 0);
@@ -403,7 +403,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case BN_CLICKED: //Button controls
switch(idCtrl) {
case IDC_PREVIEW:
- PopUpPreview();
+ PopupPreview();
break;
case IDC_BTN_RELOAD:
@@ -411,7 +411,7 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR LPTSTR Temp = NULL;
DWORD dwIndex = 0;
TCHAR szNewSkin[128];
- LPTSTR pszOldSkin = mir_tstrdup(PopUpOptions.SkinPack);
+ LPTSTR pszOldSkin = mir_tstrdup(PopupOptions.SkinPack);
skins.load(_T(""));
hCtrl = GetDlgItem(hwndDlg, IDC_SKINLIST);
ListBox_ResetContent(hCtrl);
@@ -420,17 +420,17 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR dwIndex = ListBox_AddString(hCtrl, sl->name);
ListBox_SetItemData(hCtrl, dwIndex, sl->name);
}
- ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopUpOptions.SkinPack));
+ ListBox_SetCurSel(hCtrl, ListBox_FindString(hCtrl, 0, PopupOptions.SkinPack));
//make shure we have select skin (ListBox_SetCurSel may be fail)
ListBox_GetText(hCtrl, ListBox_GetCurSel(hCtrl), &szNewSkin);
if (lstrcmp(pszOldSkin, szNewSkin) != 0) {
- mir_free(PopUpOptions.SkinPack);
- PopUpOptions.SkinPack = mir_tstrdup(szNewSkin);
+ mir_free(PopupOptions.SkinPack);
+ PopupOptions.SkinPack = mir_tstrdup(szNewSkin);
}
mir_free(pszOldSkin);
const PopupSkin *skin = 0;
- if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
+ if (skin = skins.getSkin(PopupOptions.SkinPack)) {
//update Skin Option List from reload SkinPack
bDlgInit = false;
bDlgInit = SkinOptionList_Update (skinOptions, &skinOptionsCount, hwndDlg);
@@ -450,17 +450,17 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case IDC_SKINLIST:
{
//Skin list change
- mir_free(PopUpOptions.SkinPack);
- PopUpOptions.SkinPack = mir_tstrdup((TCHAR *)SendDlgItemMessage(
+ mir_free(PopupOptions.SkinPack);
+ PopupOptions.SkinPack = mir_tstrdup((TCHAR *)SendDlgItemMessage(
hwndDlg,
IDC_SKINLIST,
LB_GETITEMDATA,
(WPARAM)SendDlgItemMessage(hwndDlg, IDC_SKINLIST, LB_GETCURSEL,0,0),
0));
const PopupSkin *skin = 0;
- if (skin = skins.getSkin(PopUpOptions.SkinPack)) {
- mir_free(PopUpOptions.SkinPack);
- PopUpOptions.SkinPack = mir_tstrdup(skin->getName());
+ if (skin = skins.getSkin(PopupOptions.SkinPack)) {
+ mir_free(PopupOptions.SkinPack);
+ PopupOptions.SkinPack = mir_tstrdup(skin->getName());
//update Skin Option List
bDlgInit = false;
@@ -489,18 +489,18 @@ INT_PTR CALLBACK DlgProcPopSkinsOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR case PSN_APPLY:
{
//skin pack
- db_set_ts(NULL, MODULNAME, "SkinPack", PopUpOptions.SkinPack);
+ db_set_ts(NULL, MODULNAME, "SkinPack", PopupOptions.SkinPack);
//skin options
const PopupSkin *skin = 0;
- if (skin = skins.getSkin(PopUpOptions.SkinPack))
+ if (skin = skins.getSkin(PopupOptions.SkinPack))
skin->saveOpts();
skins.freeAllButActive();
//more Skin options
- db_set_b(NULL, MODULNAME, "DisplayTime", PopUpOptions.DisplayTime);
- db_set_b(NULL, MODULNAME, "DropShadow", PopUpOptions.DropShadow);
- db_set_b(NULL, MODULNAME, "EnableShadowRegion", PopUpOptions.EnableFreeformShadows);
- db_set_b(NULL, MODULNAME, "EnableAeroGlass", PopUpOptions.EnableAeroGlass);
- db_set_b(NULL, MODULNAME, "UseMText", PopUpOptions.UseMText);
+ db_set_b(NULL, MODULNAME, "DisplayTime", PopupOptions.DisplayTime);
+ db_set_b(NULL, MODULNAME, "DropShadow", PopupOptions.DropShadow);
+ db_set_b(NULL, MODULNAME, "EnableShadowRegion", PopupOptions.EnableFreeformShadows);
+ db_set_b(NULL, MODULNAME, "EnableAeroGlass", PopupOptions.EnableAeroGlass);
+ db_set_b(NULL, MODULNAME, "UseMText", PopupOptions.UseMText);
}//end PSN_APPLY:
return TRUE;
}//switch (((LPNMHDR)lParam)->code)
@@ -544,7 +544,7 @@ static void BoxPreview_OnPaint(HWND hwnd, HDC mydc, int mode) StretchBlt(mydc, 0, 0, rc.right, rc.bottom, hdcAvatar, 0, 0, abs(bmp.bmWidth), abs(bmp.bmHeight), SRCCOPY);
SelectObject(hdcAvatar, hbmSave);
DeleteDC(hdcAvatar);
- HRGN rgn = CreateRoundRectRgn(0, 0, rc.right, rc.bottom, 2 * PopUpOptions.avatarRadius, 2 * PopUpOptions.avatarRadius);
+ HRGN rgn = CreateRoundRectRgn(0, 0, rc.right, rc.bottom, 2 * PopupOptions.avatarRadius, 2 * PopupOptions.avatarRadius);
FrameRgn(mydc, rgn, (HBRUSH)GetStockObject(BLACK_BRUSH), 1, 1);
DeleteObject(rgn);
break;
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp index de7b808a22..6bb9084155 100644 --- a/plugins/Popup/src/popup_thread.cpp +++ b/plugins/Popup/src/popup_thread.cpp @@ -53,9 +53,9 @@ enum bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd)
{
if (!wnd) return false;
- if (!PopUpOptions.ReorderPopUps && wnd->isPositioned()) return false;
+ if (!PopupOptions.ReorderPopups && wnd->isPositioned()) return false;
- int POPUP_SPACING = PopUpOptions.spacing;
+ int POPUP_SPACING = PopupOptions.spacing;
POINT pos;
SIZE prevSize = {0}, curSize = wnd->getSize();
@@ -68,9 +68,9 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd) SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);
else { //Multimonitor stuff (we have more then 1)
HWND hWnd;
- if (PopUpOptions.Monitor == MN_MIRANDA)
+ if (PopupOptions.Monitor == MN_MIRANDA)
hWnd = (HWND)CallService(MS_CLUI_GETHWND,0,0);
- else // PopUpOptions.Monitor == MN_ACTIVE
+ else // PopupOptions.Monitor == MN_ACTIVE
hWnd = GetForegroundWindow();
HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY);
@@ -83,12 +83,12 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd) SystemParametersInfo(SPI_GETWORKAREA,0,&rc,0);
}
- rc.left += PopUpOptions.gapLeft - POPUP_SPACING;
- rc.right -= PopUpOptions.gapRight - POPUP_SPACING;
- rc.top += PopUpOptions.gapTop - POPUP_SPACING;
- rc.bottom -= PopUpOptions.gapBottom - POPUP_SPACING;
- if (PopUpOptions.Spreading == SPREADING_VERTICAL) {
- switch (PopUpOptions.Position) {
+ rc.left += PopupOptions.gapLeft - POPUP_SPACING;
+ rc.right -= PopupOptions.gapRight - POPUP_SPACING;
+ rc.top += PopupOptions.gapTop - POPUP_SPACING;
+ rc.bottom -= PopupOptions.gapBottom - POPUP_SPACING;
+ if (PopupOptions.Spreading == SPREADING_VERTICAL) {
+ switch (PopupOptions.Position) {
case POS_UPPERLEFT:
pos.x = rc.left + POPUP_SPACING;
pos.y = (prev ? (prev->getPosition().y + prev->getSize().cy) : rc.top) + POPUP_SPACING;
@@ -108,7 +108,7 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd) }
}
else {
- switch (PopUpOptions.Position) {
+ switch (PopupOptions.Position) {
case POS_UPPERLEFT:
pos.x = (prev ? (prev->getPosition().x + prev->getSize().cx) : rc.left) + POPUP_SPACING;
pos.y = rc.top + POPUP_SPACING;
@@ -134,7 +134,7 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd) void RepositionPopups()
{
PopupWnd2 *prev = 0;
- if (PopUpOptions.ReorderPopUps) {
+ if (PopupOptions.ReorderPopups) {
for (int i=0; i < popupList.getCount(); ++i) {
UpdatePopupPosition(prev, popupList[i]);
prev = popupList[i];
@@ -154,7 +154,7 @@ static LRESULT CALLBACK PopupThreadManagerWndProc(HWND hwnd, UINT message, WPARA gTerminating = true;
if (db_get_b(NULL, MODULNAME, "FastExit", 0))
for (int i=0; i < popupList.getCount(); ++i)
- PUDeletePopUp(popupList[i]->getHwnd());
+ PUDeletePopup(popupList[i]->getHwnd());
PostQuitMessage(0);
break;
@@ -172,7 +172,7 @@ static LRESULT CALLBACK PopupThreadManagerWndProc(HWND hwnd, UINT message, WPARA break;
case UTM_REQUEST_REMOVE:
- if ((PopUpOptions.LeaveHovered && gLockCount) || (wnd && wnd->isLocked()))
+ if ((PopupOptions.LeaveHovered && gLockCount) || (wnd && wnd->isLocked()))
wnd->updateTimer();
else
PostMessage(wnd->getHwnd(), WM_CLOSE, 0, 0);
@@ -285,7 +285,7 @@ void PopupThreadUnlock() bool PopupThreadIsFull()
{
- return nPopups >= PopUpOptions.MaxPopups;
+ return nPopups >= PopupOptions.MaxPopups;
}
bool PopupThreadAddWindow(PopupWnd2 *wnd)
diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp index 6f2ae05cdd..158736b427 100644 --- a/plugins/Popup/src/popup_wnd2.cpp +++ b/plugins/Popup/src/popup_wnd2.cpp @@ -156,7 +156,7 @@ PopupWnd2::PopupWnd2(POPUPDATA2 *ppd, POPUPOPTIONS *theCustomOptions, bool rende {
m_signature = POPUP_OBJECT_SIGNARURE;
m_textType = TT_NONE;
- m_options = theCustomOptions ? theCustomOptions : &PopUpOptions;
+ m_options = theCustomOptions ? theCustomOptions : &PopupOptions;
m_hfnText = fonts.text;
m_hfnTitle = fonts.title;
updateData(ppd);
@@ -328,11 +328,11 @@ void PopupWnd2::animate() {
m_bReshapeWindow = false;
- if (m_hwnd && m_bmp && m_options->DropShadow && PopUpOptions.EnableFreeformShadows /*DoWeNeedRegionForThisSkin()*/)
+ if (m_hwnd && m_bmp && m_options->DropShadow && PopupOptions.EnableFreeformShadows /*DoWeNeedRegionForThisSkin()*/)
SetWindowRgn(m_hwnd, m_bmp->buildOpaqueRgn(skin->getShadowRegionOpacity()), FALSE);
- if (MyDwmEnableBlurBehindWindow && PopUpOptions.EnableAeroGlass) {
+ if (MyDwmEnableBlurBehindWindow && PopupOptions.EnableAeroGlass) {
DWM_BLURBEHIND bb = {0};
bb.dwFlags = DWM_BB_ENABLE|DWM_BB_BLURREGION;
bb.fEnable = TRUE;
@@ -369,10 +369,10 @@ void PopupWnd2::show() m_btAlpha1 = m_options->UseTransparency ? m_options->Alpha : 255;
updateLayered(m_btAlpha0);
- if (*PopUpOptions.Effect)
+ if (*PopupOptions.Effect)
{
char vfxService[128];
- mir_snprintf(vfxService, sizeof(vfxService), "PopUp/Vfx/%S", PopUpOptions.Effect);
+ mir_snprintf(vfxService, sizeof(vfxService), "Popup/Vfx/%S", PopupOptions.Effect);
if (ServiceExists(vfxService))
if (effect = (IPopupPlusEffect *)CallService(vfxService, 0, 0))
{
@@ -467,10 +467,10 @@ void PopupWnd2::hide() m_btAlpha1 = 0;
updateLayered(m_btAlpha0);
- if (*PopUpOptions.Effect)
+ if (*PopupOptions.Effect)
{
char vfxService[128];
- mir_snprintf(vfxService, sizeof(vfxService), "PopUp/Vfx/%S", PopUpOptions.Effect);
+ mir_snprintf(vfxService, sizeof(vfxService), "Popup/Vfx/%S", PopupOptions.Effect);
if (ServiceExists(vfxService))
if (effect = (IPopupPlusEffect *)CallService(vfxService, 0, 0))
{
@@ -615,11 +615,11 @@ int PopupWnd2::fixActions(POPUPACTION *theActions, int count) {
bool isIm = (m_hContact && (CallProtoService(GetContactProto(m_hContact), PS_GETCAPS, PFLAGNUM_1, 0) & PF1_IM)) ? true : false;
- bool enableDefaultGen = (m_hContact || !(PopUpOptions.actions&ACT_DEF_NOGLOBAL)) ? true : false;
- bool enableDefaultUsr = (isIm || m_hContact && !(PopUpOptions.actions&ACT_DEF_IMONLY)) ? true : false;
- bool iconSize = PopUpOptions.actions&ACT_LARGE ? TRUE : FALSE;
+ bool enableDefaultGen = (m_hContact || !(PopupOptions.actions&ACT_DEF_NOGLOBAL)) ? true : false;
+ bool enableDefaultUsr = (isIm || m_hContact && !(PopupOptions.actions&ACT_DEF_IMONLY)) ? true : false;
+ bool iconSize = PopupOptions.actions&ACT_LARGE ? TRUE : FALSE;
- if (PopUpOptions.actions & ACT_ENABLE) {
+ if (PopupOptions.actions & ACT_ENABLE) {
if (enableDefaultUsr && isIm && IsActionEnabled("General/Quick reply")) ++m_actionCount;
if (enableDefaultUsr && isIm && IsActionEnabled("General/Send message")) ++m_actionCount;
if (enableDefaultUsr && IsActionEnabled("General/User details")) ++m_actionCount;
@@ -836,7 +836,7 @@ void PopupWnd2::updateData(POPUPDATA2 *ppd) void PopupWnd2::buildMText()
{
- if (!(htuText && htuTitle && PopUpOptions.UseMText))
+ if (!(htuText && htuTitle && PopupOptions.UseMText))
return;
if (m_mtText) MText.Destroy(m_mtText);
@@ -930,7 +930,7 @@ LRESULT CALLBACK NullWindowProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l {
case WM_COMMAND:
case WM_CONTEXTMENU:
- PUDeletePopUp(hwnd);
+ PUDeletePopup(hwnd);
break;
}
return DefWindowProc(hwnd, message, wParam, lParam);
@@ -1042,8 +1042,8 @@ LRESULT CALLBACK ReplyEditWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM case WM_DESTROY:
PopupThreadUnlock();
- if (!(PopUpOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopUp(dat->hwndPopup);
+ if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ PUDeletePopup(dat->hwndPopup);
SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR)dat->oldWndProc);
SetWindowLongPtr(hwnd, GWLP_USERDATA, 0);
mir_free(dat);
@@ -1064,7 +1064,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case UM_INITPOPUP:
if (!m_customPopup) PopupThreadAddWindow(this);
if (m_iTimeout > 0) SetTimer(m_hwnd, POPUP_TIMER, m_iTimeout*1000, 0);
- if (m_hContact && !m_hbmAvatar && PopUpOptions.EnableAvatarUpdates)
+ if (m_hContact && !m_hbmAvatar && PopupOptions.EnableAvatarUpdates)
m_hhkAvatarChanged = HookEventMessage(ME_AV_AVATARCHANGED, m_hwnd, UM_AVATARCHANGED);
if (m_avatar->activeFrameDelay() > 0) SetTimer(m_hwnd, AVATAR_TIMER, m_avatar->activeFrameDelay(), 0);
@@ -1096,8 +1096,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara switch (lParam) {
case ACT_DEF_MESSAGE:
CallServiceSync(MS_MSG_SENDMESSAGE, (WPARAM)m_hContact, 0);
- if (!(PopUpOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopUp(m_hwnd);
+ if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ PUDeletePopup(m_hwnd);
break;
case ACT_DEF_REPLY:
@@ -1135,8 +1135,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case ACT_DEF_DETAILS:
CallServiceSync(MS_USERINFO_SHOWDIALOG, (WPARAM)m_hContact, 0);
- if (!(PopUpOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopUp(m_hwnd);
+ if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ PUDeletePopup(m_hwnd);
break;
case ACT_DEF_MENU:
@@ -1151,8 +1151,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara acs.handleType = HANDLE_CONTACT;
acs.szProto = 0;
CallServiceSync(MS_ADDCONTACT_SHOW, NULL, (LPARAM)&acs);
- if (!(PopUpOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopUp(m_hwnd);
+ if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ PUDeletePopup(m_hwnd);
}
break;
@@ -1164,13 +1164,13 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara m_bIsPinned = !m_bIsPinned;
{
- bool iconSize = PopUpOptions.actions&ACT_LARGE ? TRUE : FALSE;
+ bool iconSize = PopupOptions.actions&ACT_LARGE ? TRUE : FALSE;
PUModifyActionIcon(m_hwnd, wParam, lParam, m_bIsPinned ? IcoLib_GetIcon(ICO_ACT_PINNED,iconSize) : IcoLib_GetIcon(ICO_ACT_PIN,iconSize));
}
break;
case ACT_DEF_DISMISS:
- PUDeletePopUp(m_hwnd);
+ PUDeletePopup(m_hwnd);
break;
case ACT_DEF_COPY:
@@ -1201,7 +1201,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara CloseClipboard();
if (sztext)
mir_free(text);
- PUDeletePopUp(m_hwnd);
+ PUDeletePopup(m_hwnd);
break;
}
}
@@ -1224,8 +1224,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara case UM_MENUDONE:
{
unlock();
- if (!(PopUpOptions.actions&ACT_DEF_KEEPWND))
- PUDeletePopUp(m_hwnd);
+ if (!(PopupOptions.actions&ACT_DEF_KEEPWND))
+ PUDeletePopup(m_hwnd);
break;
}
@@ -1240,8 +1240,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara }
if (i == m_actionCount) {
- if (PopUpOptions.overrideLeft!=false && (m_hContact!=NULL || PopUpOptions.overrideLeft == 5 || PopUpOptions.overrideLeft == 6)) {
- switch (PopUpOptions.overrideLeft){
+ if (PopupOptions.overrideLeft!=false && (m_hContact!=NULL || PopupOptions.overrideLeft == 5 || PopupOptions.overrideLeft == 6)) {
+ switch (PopupOptions.overrideLeft){
default:
case 1:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_MESSAGE); break;
case 2:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_REPLY); break;
@@ -1263,8 +1263,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara }
case WM_MBUTTONUP:
- if ( PopUpOptions.overrideMiddle!=false && (m_hContact!=NULL || PopUpOptions.overrideMiddle == 5 || PopUpOptions.overrideMiddle == 6)) {
- switch (PopUpOptions.overrideMiddle){
+ if ( PopupOptions.overrideMiddle!=false && (m_hContact!=NULL || PopupOptions.overrideMiddle == 5 || PopupOptions.overrideMiddle == 6)) {
+ switch (PopupOptions.overrideMiddle){
default:
case 1:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_MESSAGE); break;
case 2:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_REPLY); break;
@@ -1278,8 +1278,8 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara break;
case WM_CONTEXTMENU:
- if ( PopUpOptions.overrideRight!=false && (m_hContact!=NULL || PopUpOptions.overrideRight == 5 || PopUpOptions.overrideRight == 6)) {
- switch (PopUpOptions.overrideRight){
+ if ( PopupOptions.overrideRight!=false && (m_hContact!=NULL || PopupOptions.overrideRight == 5 || PopupOptions.overrideRight == 6)) {
+ switch (PopupOptions.overrideRight){
default:
case 1:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_MESSAGE); break;
case 2:SendMessage(m_hwnd, UM_POPUPACTION,0, ACT_DEF_REPLY); break;
@@ -1429,7 +1429,7 @@ LRESULT CALLBACK PopupWnd2::WindowProc(UINT message, WPARAM wParam, LPARAM lPara m_bIsHovered = false;
}
if (m_hhkAvatarChanged)
- PopUp_UnhookEventAsync((WPARAM)m_hwnd, (LPARAM)m_hhkAvatarChanged);
+ Popup_UnhookEventAsync((WPARAM)m_hwnd, (LPARAM)m_hhkAvatarChanged);
SendMessage(m_hwnd, UM_FREEPLUGINDATA, 0, 0);
SetWindowLongPtr(m_hwnd, GWLP_USERDATA, 0);
m_hwnd = 0;
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index b1f2dde562..932943f698 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -80,8 +80,8 @@ static bool isFullScreen() return false;
}
-//===== PopUp/AddPopUp
-INT_PTR PopUp_AddPopUp(WPARAM wParam, LPARAM lParam)
+//===== Popup/AddPopup
+INT_PTR Popup_AddPopup(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded) return -1;
@@ -99,11 +99,11 @@ INT_PTR PopUp_AddPopUp(WPARAM wParam, LPARAM lParam) ppd2.PluginWindowProc = ppd->PluginWindowProc;
ppd2.PluginData = ppd->PluginData;
ppd2.iSeconds = ppd->iSeconds;
- return PopUp_AddPopUp2((WPARAM)&ppd2, lParam);
+ return Popup_AddPopup2((WPARAM)&ppd2, lParam);
}
-//===== PopUp/AddPopupW
-INT_PTR PopUp_AddPopUpW(WPARAM wParam, LPARAM lParam)
+//===== Popup/AddPopupW
+INT_PTR Popup_AddPopupW(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded) return -1;
@@ -129,10 +129,10 @@ INT_PTR PopUp_AddPopUpW(WPARAM wParam, LPARAM lParam) ppd2.lpActions = ppd->lpActions;
}
- return PopUp_AddPopUp2((WPARAM)&ppd2, lParam);
+ return Popup_AddPopup2((WPARAM)&ppd2, lParam);
}
-//===== PopUp/AddPopup2
+//===== Popup/AddPopup2
static __forceinline DWORD Proto_Status2Flag_My(DWORD status)
{
if (DWORD res = Proto_Status2Flag(status))
@@ -140,7 +140,7 @@ static __forceinline DWORD Proto_Status2Flag_My(DWORD status) return PF2_IDLE;
}
-INT_PTR PopUp_AddPopUp2(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_AddPopup2(WPARAM wParam, LPARAM lParam)
{
/* NOTE: we will return 0 instead of -1 since tabSRMM stops using popup after first failure :/ */
@@ -184,11 +184,11 @@ INT_PTR PopUp_AddPopUp2(WPARAM wParam, LPARAM lParam) if (bShowMode != PU_SHOWMODE_FAVORITE)
{
- if (!PopUpOptions.ModuleIsEnabled)
+ if (!PopupOptions.ModuleIsEnabled)
return -1;
#ifdef _DEBUG
- _itoa(PopUpOptions.DisableWhenFullscreen,temp,10);
- OutputDebugStringA("PopUpOptions.DisableWhenFullscreen: \t");
+ _itoa(PopupOptions.DisableWhenFullscreen,temp,10);
+ OutputDebugStringA("PopupOptions.DisableWhenFullscreen: \t");
OutputDebugStringA(temp);
OutputDebugStringA("\n");
_itoa(bShowMode,temp,10);
@@ -200,7 +200,7 @@ INT_PTR PopUp_AddPopUp2(WPARAM wParam, LPARAM lParam) OutputDebugStringA("\n");
#endif
- if (PopUpOptions.DisableWhenFullscreen && (bShowMode != PU_SHOWMODE_FULLSCREEN) && isFullScreen())
+ if (PopupOptions.DisableWhenFullscreen && (bShowMode != PU_SHOWMODE_FULLSCREEN) && isFullScreen())
return -1;
if (db_get_dw(NULL, MODULNAME, LPGEN("Global Status"), 0) &
@@ -235,8 +235,8 @@ INT_PTR PopUp_AddPopUp2(WPARAM wParam, LPARAM lParam) return 0;
}
-//===== PopUp/GetContact
-INT_PTR PopUp_GetContact(WPARAM wParam, LPARAM lParam)
+//===== Popup/GetContact
+INT_PTR Popup_GetContact(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded) return -1;
@@ -246,8 +246,8 @@ INT_PTR PopUp_GetContact(WPARAM wParam, LPARAM lParam) return (INT_PTR)(-1);
}
-//===== PopUp/GetPluginData
-INT_PTR PopUp_GetPluginData(WPARAM wParam, LPARAM lParam)
+//===== Popup/GetPluginData
+INT_PTR Popup_GetPluginData(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded || !wParam)
return -1;
@@ -258,14 +258,14 @@ INT_PTR PopUp_GetPluginData(WPARAM wParam, LPARAM lParam) return (INT_PTR)(-1);
}
-//===== PopUp/IsSecondLineShown
-INT_PTR PopUp_IsSecondLineShown(WPARAM wParam, LPARAM lParam)
+//===== Popup/IsSecondLineShown
+INT_PTR Popup_IsSecondLineShown(WPARAM wParam, LPARAM lParam)
{
return 1;
}
-//===== PopUp/ChangeTextW
-INT_PTR PopUp_ChangeTextW(WPARAM wParam, LPARAM lParam)
+//===== Popup/ChangeTextW
+INT_PTR Popup_ChangeTextW(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded || !wParam)
return -1;
@@ -278,8 +278,8 @@ INT_PTR PopUp_ChangeTextW(WPARAM wParam, LPARAM lParam) return 0;
}
-//===== PopUp/ChangeW
-INT_PTR PopUp_ChangeW(WPARAM wParam, LPARAM lParam)
+//===== Popup/ChangeW
+INT_PTR Popup_ChangeW(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded || !wParam)
return -1;
@@ -292,8 +292,8 @@ INT_PTR PopUp_ChangeW(WPARAM wParam, LPARAM lParam) return 0;
}
-//===== PopUp/Change2
-INT_PTR PopUp_Change2(WPARAM wParam, LPARAM lParam)
+//===== Popup/Change2
+INT_PTR Popup_Change2(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded) return -1;
@@ -304,8 +304,8 @@ INT_PTR PopUp_Change2(WPARAM wParam, LPARAM lParam) return 0;
}
-//===== PopUp/ShowMessage
-INT_PTR PopUp_ShowMessage(WPARAM wParam, LPARAM lParam) {
+//===== Popup/ShowMessage
+INT_PTR Popup_ShowMessage(WPARAM wParam, LPARAM lParam) {
if (!gbPopupLoaded || !wParam || !lParam) return -1;
if (closing) return 0;
@@ -338,10 +338,10 @@ INT_PTR PopUp_ShowMessage(WPARAM wParam, LPARAM lParam) { default: //No no no... you must give me a good value.
return -1;
}
- return PopUp_AddPopUp2((WPARAM)&ppd2, (LPARAM)((lParam&0x80000000)?APF_NO_HISTORY:0));
+ return Popup_AddPopup2((WPARAM)&ppd2, (LPARAM)((lParam&0x80000000)?APF_NO_HISTORY:0));
}
-INT_PTR PopUp_ShowMessageW(WPARAM wParam, LPARAM lParam) {
+INT_PTR Popup_ShowMessageW(WPARAM wParam, LPARAM lParam) {
if (!gbPopupLoaded || !wParam || !lParam) return -1;
if (closing) return 0;
@@ -374,11 +374,11 @@ INT_PTR PopUp_ShowMessageW(WPARAM wParam, LPARAM lParam) { default: //No no no... you must give me a good value.
return -1;
}
- return PopUp_AddPopUp2((WPARAM)&ppd2, (LPARAM)((lParam&0x80000000)?APF_NO_HISTORY:0));
+ return Popup_AddPopup2((WPARAM)&ppd2, (LPARAM)((lParam&0x80000000)?APF_NO_HISTORY:0));
}
-//===== PopUp/Query
-INT_PTR PopUp_Query(WPARAM wParam, LPARAM lParam)
+//===== Popup/Query
+INT_PTR Popup_Query(WPARAM wParam, LPARAM lParam)
{
if (!gbPopupLoaded) return -1;
@@ -387,21 +387,21 @@ INT_PTR PopUp_Query(WPARAM wParam, LPARAM lParam) switch (wParam) {
case PUQS_ENABLEPOPUPS: {
- if (PopUpOptions.ModuleIsEnabled) return 1; //They're already ON!!!
+ if (PopupOptions.ModuleIsEnabled) return 1; //They're already ON!!!
else { //Module was disabled.
svcEnableDisableMenuCommand(0,0);
return 0;
}
}
case PUQS_DISABLEPOPUPS: {
- if (!(PopUpOptions.ModuleIsEnabled)) return 1; //They're already OFF!!!
+ if (!(PopupOptions.ModuleIsEnabled)) return 1; //They're already OFF!!!
else {
svcEnableDisableMenuCommand(0,0);
return 0;
}
}
case PUQS_GETSTATUS:
- return (PopUpOptions.ModuleIsEnabled);
+ return (PopupOptions.ModuleIsEnabled);
default:
return -1;
}
@@ -409,8 +409,8 @@ INT_PTR PopUp_Query(WPARAM wParam, LPARAM lParam) }
-//===== PopUp/RegisterActions
-INT_PTR PopUp_RegisterActions(WPARAM wParam, LPARAM lParam)
+//===== Popup/RegisterActions
+INT_PTR Popup_RegisterActions(WPARAM wParam, LPARAM lParam)
{
LPPOPUPACTION actions = (LPPOPUPACTION)wParam;
for (int i=0; i < lParam; ++i)
@@ -419,13 +419,13 @@ INT_PTR PopUp_RegisterActions(WPARAM wParam, LPARAM lParam) }
-INT_PTR PopUp_RegisterNotification(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_RegisterNotification(WPARAM wParam, LPARAM lParam)
{
return (INT_PTR)RegisterNotification((LPPOPUPNOTIFICATION)wParam);
}
-//===== PopUp/UnhookEventAsync
+//===== Popup/UnhookEventAsync
struct SafeUnhookEventParam
{
HWND hwndPopup;
@@ -440,7 +440,7 @@ static void CALLBACK SafeUnhookEventFunc(ULONG_PTR dwParam) delete (SafeUnhookEventParam *)dwParam;
}
-INT_PTR PopUp_UnhookEventAsync(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_UnhookEventAsync(WPARAM wParam, LPARAM lParam)
{
SafeUnhookEventParam *param = new SafeUnhookEventParam;
param->hwndPopup = (HWND)wParam;
@@ -449,15 +449,15 @@ INT_PTR PopUp_UnhookEventAsync(WPARAM wParam, LPARAM lParam) return 0;
}
-//===== PopUp/RegisterVfx (effekt name for drop down box)
-INT_PTR PopUp_RegisterVfx(WPARAM wParam, LPARAM lParam)
+//===== Popup/RegisterVfx (effekt name for drop down box)
+INT_PTR Popup_RegisterVfx(WPARAM wParam, LPARAM lParam)
{
OptAdv_RegisterVfx((char *)lParam);
return 0;
}
-//===== PopUp/RegisterClass (for core class api support)
-INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam)
+//===== Popup/RegisterClass (for core class api support)
+INT_PTR Popup_RegisterPopupClass(WPARAM wParam, LPARAM lParam)
{
char setting[256];
POPUPCLASS *pc = (POPUPCLASS *)lParam;
@@ -513,7 +513,7 @@ INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam) return (INT_PTR)ptd;
}
-INT_PTR PopUp_UnregisterPopupClass(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_UnregisterPopupClass(WPARAM wParam, LPARAM lParam)
{
POPUPTREEDATA *ptd = (POPUPTREEDATA*)lParam;
if (ptd == NULL)
@@ -529,8 +529,8 @@ INT_PTR PopUp_UnregisterPopupClass(WPARAM wParam, LPARAM lParam) return 1;
}
-//===== PopUp/AddPopupClass (for core class api support)
-INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam) {
+//===== Popup/AddPopupClass (for core class api support)
+INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam) {
int ret = 1;
POPUPDATACLASS *pdc = (POPUPDATACLASS *)lParam;
if (pdc->cbSize != sizeof(POPUPDATACLASS)) return ret;
@@ -564,7 +564,7 @@ INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam) { ppd2.lchContact = pdc->hContact;
ppd2.PluginData = pdc->PluginData;
- ret = PopUp_AddPopUp2((WPARAM)&ppd2, 0);
+ ret = Popup_AddPopup2((WPARAM)&ppd2, 0);
}
return ret!=0 ? 1 : 0;
}
diff --git a/plugins/Popup/src/services.h b/plugins/Popup/src/services.h index 1e965fbbe2..8dd363b679 100644 --- a/plugins/Popup/src/services.h +++ b/plugins/Popup/src/services.h @@ -26,31 +26,31 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern int num_classes; //for core class api support
-INT_PTR PopUp_AddPopUpW(WPARAM, LPARAM);
+INT_PTR Popup_AddPopupW(WPARAM, LPARAM);
-INT_PTR PopUp_AddPopUp(WPARAM, LPARAM);
-INT_PTR PopUp_AddPopUp2(WPARAM, LPARAM);
+INT_PTR Popup_AddPopup(WPARAM, LPARAM);
+INT_PTR Popup_AddPopup2(WPARAM, LPARAM);
-INT_PTR PopUp_GetContact(WPARAM, LPARAM);
-INT_PTR PopUp_IsSecondLineShown(WPARAM, LPARAM);
+INT_PTR Popup_GetContact(WPARAM, LPARAM);
+INT_PTR Popup_IsSecondLineShown(WPARAM, LPARAM);
-INT_PTR PopUp_ChangeTextW(WPARAM, LPARAM);
+INT_PTR Popup_ChangeTextW(WPARAM, LPARAM);
-INT_PTR PopUp_ChangeW(WPARAM, LPARAM);
-INT_PTR PopUp_Change2(WPARAM, LPARAM);
+INT_PTR Popup_ChangeW(WPARAM, LPARAM);
+INT_PTR Popup_Change2(WPARAM, LPARAM);
-INT_PTR PopUp_ShowMessage(WPARAM, LPARAM);
-INT_PTR PopUp_ShowMessageW(WPARAM, LPARAM);
+INT_PTR Popup_ShowMessage(WPARAM, LPARAM);
+INT_PTR Popup_ShowMessageW(WPARAM, LPARAM);
-INT_PTR PopUp_Query(WPARAM, LPARAM);
-INT_PTR PopUp_GetPluginData(WPARAM, LPARAM);
-INT_PTR PopUp_RegisterActions(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_RegisterNotification(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_UnhookEventAsync(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_RegisterVfx(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_Query(WPARAM, LPARAM);
+INT_PTR Popup_GetPluginData(WPARAM, LPARAM);
+INT_PTR Popup_RegisterActions(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_RegisterNotification(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_UnhookEventAsync(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_RegisterVfx(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_RegisterPopupClass(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_UnregisterPopupClass(WPARAM wParam, LPARAM lParam);
-INT_PTR PopUp_CreateClassPopup(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_RegisterPopupClass(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_UnregisterPopupClass(WPARAM wParam, LPARAM lParam);
+INT_PTR Popup_CreateClassPopup(WPARAM wParam, LPARAM lParam);
#endif // __services_h__
diff --git a/plugins/Popup/src/skin.cpp b/plugins/Popup/src/skin.cpp index 864d6c4c59..865912ca29 100644 --- a/plugins/Popup/src/skin.cpp +++ b/plugins/Popup/src/skin.cpp @@ -47,10 +47,10 @@ PopupSkin::~PopupSkin() SIZE PopupSkin::measureAction(HDC hdc, POPUPACTION *act) const
{
SIZE sz = {0};
- if (!(PopUpOptions.actions&ACT_ENABLE))
+ if (!(PopupOptions.actions&ACT_ENABLE))
return sz;
- if (PopUpOptions.actions&ACT_LARGE)
+ if (PopupOptions.actions&ACT_LARGE)
{
sz.cx = sz.cy = 32;
} else
@@ -58,7 +58,7 @@ SIZE PopupSkin::measureAction(HDC hdc, POPUPACTION *act) const sz.cx = sz.cy = 16;
}
- if (PopUpOptions.actions&ACT_TEXT)
+ if (PopupOptions.actions&ACT_TEXT)
{
char *name = strchr(act->lpzTitle, '/');
if (!name) name = act->lpzTitle;
@@ -94,7 +94,7 @@ SIZE PopupSkin::measureActionBar(HDC hdc, PopupWnd2 *wnd) const {
SIZE szAction = measureAction(hdc, &wnd->getActions()[i].actionA);
- if (PopUpOptions.actions & ACT_TEXT)
+ if (PopupOptions.actions & ACT_TEXT)
{
sz.cx = max(sz.cx, szAction.cx);
sz.cy += szAction.cy;
@@ -110,16 +110,16 @@ SIZE PopupSkin::measureActionBar(HDC hdc, PopupWnd2 *wnd) const void PopupSkin::drawAction(MyBitmap *bmp, POPUPACTION *act, int x, int y, bool hover) const
{
- if (!(PopUpOptions.actions&ACT_ENABLE))
+ if (!(PopupOptions.actions&ACT_ENABLE))
return;
bmp->DrawIcon(act->lchIcon,
- (PopUpOptions.actions&ACT_TEXT) ? x : (x+2),
+ (PopupOptions.actions&ACT_TEXT) ? x : (x+2),
y+2,
- (PopUpOptions.actions&ACT_LARGE) ? 32 : 16,
- (PopUpOptions.actions&ACT_LARGE) ? 32 : 16);
+ (PopupOptions.actions&ACT_LARGE) ? 32 : 16,
+ (PopupOptions.actions&ACT_LARGE) ? 32 : 16);
- if (PopUpOptions.actions&ACT_TEXT)
+ if (PopupOptions.actions&ACT_TEXT)
{
char *name = strchr(act->lpzTitle, '/');
if (!name) name = act->lpzTitle;
@@ -138,10 +138,10 @@ void PopupSkin::drawAction(MyBitmap *bmp, POPUPACTION *act, int x, int y, bool h WCHAR *str = TranslateW(wname);
GetTextExtentPoint32W(bmp->getDC(), str, lstrlenW(str), &szText);
bmp->Draw_TextW(str,
- (PopUpOptions.actions&ACT_LARGE) ? (x+szSpace.cx+32) : (x+szSpace.cx+16),
+ (PopupOptions.actions&ACT_LARGE) ? (x+szSpace.cx+32) : (x+szSpace.cx+16),
max(
y+2,
- y+2 + (((PopUpOptions.actions&ACT_LARGE) ? 32 : 16) - szText.cy)/2
+ y+2 + (((PopupOptions.actions&ACT_LARGE) ? 32 : 16) - szText.cy)/2
));
mir_free(wname);
@@ -153,8 +153,8 @@ void PopupSkin::drawAction(MyBitmap *bmp, POPUPACTION *act, int x, int y, bool h RECT rc;
rc.left = x;
rc.top = y;
- rc.right = x + ((PopUpOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
- rc.bottom = y + ((PopUpOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
+ rc.right = x + ((PopupOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
+ rc.bottom = y + ((PopupOptions.actions&ACT_LARGE) ? 32 : 16) + 4;
bmp->saveAlpha(rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top);
HBRUSH hbr = CreateSolidBrush(fonts.clActionHover);
FrameRect(bmp->getDC(), &rc, hbr);
@@ -176,7 +176,7 @@ void PopupSkin::drawActionBar(MyBitmap *bmp, PopupWnd2 *wnd, int x, int y) const wnd->getActions()[i].rc.right = x + szAction.cx;
wnd->getActions()[i].rc.bottom = y + szAction.cy;
- if (PopUpOptions.actions & ACT_TEXT)
+ if (PopupOptions.actions & ACT_TEXT)
{
y += szAction.cy;
} else
@@ -227,7 +227,7 @@ void PopupSkin::measure(HDC hdc, PopupWnd2 *wnd, int maxw, POPUPOPTIONS *options }
wnd->getArgs()->clear();
- wnd->getArgs()->add("options.avatarsize", PopUpOptions.avatarSize);
+ wnd->getArgs()->add("options.avatarsize", PopupOptions.avatarSize);
wnd->getArgs()->add("window.width", maxw);
wnd->getArgs()->add("window.maxwidth", maxw);
@@ -627,7 +627,7 @@ void PopupSkin::display(MyBitmap *bmp, PopupWnd2 *wnd, int maxw, POPUPOPTIONS *o drawActionBar(bmp, wnd,
db_get_b(NULL, MODULNAME, "CenterActions", 0) ?
(pos.x + (textAreaWidth - wnd->getRenderInfo()->actw)/2) :
- (PopUpOptions.actions&ACT_RIGHTICONS) ?
+ (PopupOptions.actions&ACT_RIGHTICONS) ?
(pos.x + textAreaWidth - wnd->getRenderInfo()->actw) :
// else
pos.x,
@@ -1403,7 +1403,7 @@ const PopupSkin *Skins::getSkin(LPCTSTR name) void Skins::loadActiveSkin()
{
for (SKINLIST *p = m_skins; p; p = p->next)
- if (!lstrcmpi(p->name, PopUpOptions.SkinPack))
+ if (!lstrcmpi(p->name, PopupOptions.SkinPack))
{
if (p->skin)
break;
@@ -1417,7 +1417,7 @@ void Skins::loadActiveSkin() void Skins::freeAllButActive()
{
for (SKINLIST *p = m_skins; p; p = p->next)
- if (lstrcmpi(p->name, PopUpOptions.SkinPack))
+ if (lstrcmpi(p->name, PopupOptions.SkinPack))
{
delete p->skin;
p->skin = NULL;
diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h index 3fef922ed5..a9dea05713 100644 --- a/plugins/Popup/src/version.h +++ b/plugins/Popup/src/version.h @@ -5,8 +5,8 @@ #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __PLUGIN_NAME "PopUp plus"
-#define __FILENAME "PopUp.dll"
+#define __PLUGIN_NAME "Popup plus"
+#define __FILENAME "Popup.dll"
#define __DESCRIPTION "Provides popup notification services for different plugins."
#define __AUTHOR "MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"
#define __AUTHOREMAIL "mp-king@web.de"
diff --git a/plugins/QuickMessages/src/main.cpp b/plugins/QuickMessages/src/main.cpp index c8aded16da..ce8db16a78 100644 --- a/plugins/QuickMessages/src/main.cpp +++ b/plugins/QuickMessages/src/main.cpp @@ -227,7 +227,7 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam) int menunum;
ButtonData * bd=NULL;
HMENU hMenu=NULL,hSubMenu=NULL;
- BOOL bSetPopUpMark=FALSE;
+ BOOL bSetPopupMark=FALSE;
if(g_iButtonsCount){
hMenu = CreatePopupMenu();
@@ -239,22 +239,22 @@ static int CustomButtonPressed(WPARAM wParam,LPARAM lParam) if(bd->dwOPFlags&QMF_NEW)
continue;
- bSetPopUpMark=FALSE;
+ bSetPopupMark=FALSE;
if(bd->pszValue==0&&bd->fEntryType==0)
{
hSubMenu = CreatePopupMenu();
- bSetPopUpMark=TRUE;
+ bSetPopupMark=TRUE;
}
if(bd->pszValue&&bd->fEntryType==0)
hSubMenu=NULL;
if(bd->fEntryType&QMF_EX_SEPARATOR)
- AppendMenu((HMENU)((hSubMenu&&!bSetPopUpMark)?hSubMenu:hMenu),MF_SEPARATOR,0,NULL);
+ AppendMenu((HMENU)((hSubMenu&&!bSetPopupMark)?hSubMenu:hMenu),MF_SEPARATOR,0,NULL);
else
- AppendMenu((HMENU)((hSubMenu&&!bSetPopUpMark)?hSubMenu:hMenu),
- MF_STRING|(bSetPopUpMark?MF_POPUP:0),
- (bSetPopUpMark?(UINT_PTR)hSubMenu:(menunum+1)), bd->pszName);
+ AppendMenu((HMENU)((hSubMenu&&!bSetPopupMark)?hSubMenu:hMenu),
+ MF_STRING|(bSetPopupMark?MF_POPUP:0),
+ (bSetPopupMark?(UINT_PTR)hSubMenu:(menunum+1)), bd->pszName);
}
res = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, NULL);
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
diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index c3f79bcd6b..a2ec230e48 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -133,15 +133,15 @@ void ShowStatusIconNotify(HANDLE); // crypt_popups.cpp
//static int CALLBACK PopupDlgProc(HWND,UINT,WPARAM,LPARAM);
-void showPopUp(LPCSTR,HANDLE,HICON,UINT);
-void showPopUpEC(HANDLE);
-void showPopUpDCmsg(HANDLE,LPCSTR);
-void showPopUpDC(HANDLE);
-void showPopUpKS(HANDLE);
-void showPopUpKRmsg(HANDLE,LPCSTR);
-void showPopUpKR(HANDLE);
-void showPopUpSM(HANDLE);
-void showPopUpRM(HANDLE);
+void showPopup(LPCSTR,HANDLE,HICON,UINT);
+void showPopupEC(HANDLE);
+void showPopupDCmsg(HANDLE,LPCSTR);
+void showPopupDC(HANDLE);
+void showPopupKS(HANDLE);
+void showPopupKRmsg(HANDLE,LPCSTR);
+void showPopupKR(HANDLE);
+void showPopupSM(HANDLE);
+void showPopupRM(HANDLE);
// crypt_meta.cpp
BOOL isProtoMetaContacts(HANDLE);
diff --git a/plugins/SecureIM/src/crypt_dll.cpp b/plugins/SecureIM/src/crypt_dll.cpp index c98d6e8489..4b3c73c088 100644 --- a/plugins/SecureIM/src/crypt_dll.cpp +++ b/plugins/SecureIM/src/crypt_dll.cpp @@ -104,11 +104,11 @@ BOOL CalculateKeyX(pUinKey ptr,HANDLE hContact) { CallService(MS_DB_CONTACT_WRITESETTING, (WPARAM)hContact, (LPARAM)&cws);
// key exchange is finished
- showPopUpEC(ptr->hContact);
+ showPopupEC(ptr->hContact);
}
else {
// agree value problem
- showPopUp(sim002,hContact,g_hPOP[POP_PU_DIS],0);
+ showPopup(sim002,hContact,g_hPOP[POP_PU_DIS],0);
}
return agr != 0;
}
diff --git a/plugins/SecureIM/src/crypt_popups.cpp b/plugins/SecureIM/src/crypt_popups.cpp index 721dafd0b5..b584f5902d 100644 --- a/plugins/SecureIM/src/crypt_popups.cpp +++ b/plugins/SecureIM/src/crypt_popups.cpp @@ -1,6 +1,6 @@ #include "commonheaders.h"
-void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type)
+void showPopup(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type)
{
//type=0 key colors
//type=1 session colors
@@ -49,56 +49,56 @@ void showPopUp(LPCSTR lpzText,HANDLE hContact,HICON hIcon, UINT type) ppd.colorBack = colorBack;
ppd.colorText = colorText;
ppd.iSeconds = timeout;
- PUAddPopUpW(&ppd);
+ PUAddPopupW(&ppd);
}
-void showPopUpDCmsg(HANDLE hContact,LPCSTR msg)
+void showPopupDCmsg(HANDLE hContact,LPCSTR msg)
{
if (db_get_b(0, MODULENAME, "dc", 1))
- showPopUp(msg, hContact, g_hPOP[POP_PU_DIS], 1);
+ showPopup(msg, hContact, g_hPOP[POP_PU_DIS], 1);
}
-void showPopUpDC(HANDLE hContact)
+void showPopupDC(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "dc", 1))
- showPopUp(sim006, hContact, g_hPOP[POP_PU_DIS], 1);
+ showPopup(sim006, hContact, g_hPOP[POP_PU_DIS], 1);
}
-void showPopUpEC(HANDLE hContact)
+void showPopupEC(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "ec", 1))
- showPopUp(sim001, hContact, g_hPOP[POP_PU_EST], 1);
+ showPopup(sim001, hContact, g_hPOP[POP_PU_EST], 1);
}
-void showPopUpKS(HANDLE hContact)
+void showPopupKS(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "ks",1))
- showPopUp(sim007, hContact, g_hPOP[POP_PU_PRC], 0);
+ showPopup(sim007, hContact, g_hPOP[POP_PU_PRC], 0);
}
-void showPopUpKRmsg(HANDLE hContact,LPCSTR msg)
+void showPopupKRmsg(HANDLE hContact,LPCSTR msg)
{
if (db_get_b(0, MODULENAME, "kr", 1))
- showPopUp(msg, hContact, g_hPOP[POP_PU_PRC], 0);
+ showPopup(msg, hContact, g_hPOP[POP_PU_PRC], 0);
}
-void showPopUpKR(HANDLE hContact)
+void showPopupKR(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "kr", 1))
- showPopUp(sim008, hContact, g_hPOP[POP_PU_PRC], 0);
+ showPopup(sim008, hContact, g_hPOP[POP_PU_PRC], 0);
}
-void showPopUpSM(HANDLE hContact)
+void showPopupSM(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "ss", 0))
- showPopUp(sim009, hContact, g_hPOP[POP_PU_MSS], 2);
+ showPopup(sim009, hContact, g_hPOP[POP_PU_MSS], 2);
SkinPlaySound("OutgoingSecureMessage");
}
-void showPopUpRM(HANDLE hContact)
+void showPopupRM(HANDLE hContact)
{
if (db_get_b(0, MODULENAME, "sr", 0))
- showPopUp(sim010, hContact, g_hPOP[POP_PU_MSR], 2);
+ showPopup(sim010, hContact, g_hPOP[POP_PU_MSR], 2);
SkinPlaySound("IncomingSecureMessage");
}
diff --git a/plugins/SecureIM/src/popupOptions.cpp b/plugins/SecureIM/src/popupOptions.cpp index e25403582c..9195ed7cb7 100644 --- a/plugins/SecureIM/src/popupOptions.cpp +++ b/plugins/SecureIM/src/popupOptions.cpp @@ -81,9 +81,9 @@ INT_PTR CALLBACK PopOptionsDlgProc(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM l switch (LOWORD(wParam)) {
case IDC_PREV:
//preview popups...
- showPopUp(LPGEN("Key Popup"),NULL,g_hPOP[POP_PU_PRC],0);
- showPopUp(LPGEN("Secure Popup"),NULL,g_hPOP[POP_PU_EST],1);
- showPopUp(LPGEN("Message Popup"),NULL,g_hPOP[POP_PU_MSR],2);
+ showPopup(LPGEN("Key Popup"),NULL,g_hPOP[POP_PU_PRC],0);
+ showPopup(LPGEN("Secure Popup"),NULL,g_hPOP[POP_PU_EST],1);
+ showPopup(LPGEN("Message Popup"),NULL,g_hPOP[POP_PU_MSR],2);
break;
case IDC_EC:
//set ec checkbox value
@@ -166,7 +166,7 @@ int onRegisterPopOptions(WPARAM wParam, LPARAM) odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCE(IDD_POPUP);
odp.pszTitle = (char*)MODULENAME;
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.pfnDlgProc = PopOptionsDlgProc;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index 3524f78775..b2af53bb19 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -14,12 +14,12 @@ int __cdecl onContactSettingChanged(WPARAM wParam,LPARAM lParam) { if (stat == ID_STATUS_OFFLINE) { // go offline
if (ptr->mode == MODE_NATIVE && cpp_keyx(ptr->cntx)) { // have active context
cpp_delete_context(ptr->cntx); ptr->cntx=0; // reset context
- showPopUpDC(hContact); // show popup "Disabled"
+ showPopupDC(hContact); // show popup "Disabled"
ShowStatusIconNotify(hContact); // change icon in CL
}
else if (ptr->mode == MODE_RSAAES && exp->rsa_get_state(ptr->cntx) == 7) {
deleteRSAcntx(ptr);
- showPopUpDC(hContact); // show popup "Disabled"
+ showPopupDC(hContact); // show popup "Disabled"
ShowStatusIconNotify(hContact); // change icon in CL
}
}
diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index f1366e1521..633812e802 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -121,7 +121,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE;
CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUp(sim003,pccsd->hContact,g_hPOP[POP_PU_DIS],0);
+ showPopup(sim003,pccsd->hContact,g_hPOP[POP_PU_DIS],0);
}
else {
createRSAcntx(ptr);
@@ -194,7 +194,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ppre->szMessage = szMsgUtf;
// show decoded message
- showPopUpRM(ptr->hContact);
+ showPopupRM(ptr->hContact);
SAFE_FREE(ptr->msgSplitted);
pccsd->wParam |= PREF_SIMNOMETA;
return CallService(MS_PROTO_CHAINRECV, wParam, lParam);
@@ -217,7 +217,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) createRSAcntx(ptr);
loadRSAkey(ptr);
if (exp->rsa_get_state(ptr->cntx) == 0 )
- showPopUpKR(ptr->hContact);
+ showPopupKR(ptr->hContact);
{
LPSTR szOldMsg = exp->rsa_recv(ptr->cntx,szEncMsg);
@@ -229,7 +229,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ppre->szMessage = szNewMsg;
// show decoded message
- showPopUpRM(ptr->hContact);
+ showPopupRM(ptr->hContact);
SAFE_FREE(ptr->msgSplitted);
pccsd->wParam |= PREF_SIMNOMETA;
return CallService(MS_PROTO_CHAINRECV, wParam, lParam);
@@ -265,8 +265,8 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->lParam = (LPARAM)(char*)keyToSend;
CallService(MS_PROTO_CHAINSEND, wParam, lParam); // send new key
- showPopUp(sim005,NULL,g_hPOP[POP_PU_DIS],0);
- showPopUpKS(ptr->hContact);
+ showPopup(sim005,NULL,g_hPOP[POP_PU_DIS],0);
+ showPopupKS(ptr->hContact);
return 1;
}
break;
@@ -302,8 +302,8 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) if (cpp_keyx(ptr->cntx)) {
// decrypt sended back message and save message for future sending with a new secret key
addMsg2Queue(ptr, pccsd->wParam, ptrA(decodeMsg(ptr,(LPARAM)pccsd,szEncMsg)));
- showPopUpRM(ptr->hContact);
- showPopUp(sim004,NULL,g_hPOP[POP_PU_DIS],0);
+ showPopupRM(ptr->hContact);
+ showPopup(sim004,NULL,g_hPOP[POP_PU_DIS],0);
}
return 1; // don't display it ...
@@ -314,7 +314,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) // other user has disabled SecureIM with you
cpp_delete_context(ptr->cntx); ptr->cntx=0;
- showPopUpDC(ptr->hContact);
+ showPopupDC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
waitForExchange(ptr,3); // äîñëàòü íåøèôðîâàííî
@@ -336,7 +336,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYR received");
// receive KeyB from user;
- showPopUpKR(ptr->hContact);
+ showPopupKR(ptr->hContact);
if (ptr->cntx && cpp_keyb(ptr->cntx)) {
// reinit key exchange if an old key from user is found
@@ -347,7 +347,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYR InitKeyB error");
// tell to the other side that we have the plugin disabled with him
- showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
+ showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
ShowStatusIconNotify(ptr->hContact);
waitForExchange(ptr,3); // äîñëàòü íåøèôðîâàííî
@@ -364,7 +364,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) loadRSAkey(ptr);
exp->rsa_connect(ptr->cntx);
- showPopUpKS(pccsd->hContact);
+ showPopupKS(pccsd->hContact);
ShowStatusIconNotify(pccsd->hContact);
return 1;
}
@@ -381,7 +381,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE;
CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUpKS(ptr->hContact);
+ showPopupKS(ptr->hContact);
waitForExchange(ptr); // çàïóñòèì îæèäàíèå
return 1;
}
@@ -396,7 +396,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE;
CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUpKS(ptr->hContact);
+ showPopupKS(ptr->hContact);
}
break;
@@ -404,14 +404,14 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYA received");
// receive KeyA from user;
- showPopUpKR(ptr->hContact);
+ showPopupKR(ptr->hContact);
cpp_reset_context(ptr->cntx);
if (InitKeyB(ptr,szEncMsg) != CPP_ERROR_NONE) {
Sent_NetLog("onRecvMsg: SiG_KEYA InitKeyB error");
// tell to the other side that we have the plugin disabled with him
- showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
+ showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
ShowStatusIconNotify(ptr->hContact);
waitForExchange(ptr,3); // äîñëàòü íåøèôðîâàííî
@@ -432,14 +432,14 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Sent_NetLog("onRecvMsg: SiG_KEYB received");
// receive KeyB from user;
- showPopUpKR(ptr->hContact);
+ showPopupKR(ptr->hContact);
// clear all and send DISA if received KeyB, and not exist KeyA or error on InitKeyB
if (!cpp_keya(ptr->cntx) || InitKeyB(ptr,szEncMsg) != CPP_ERROR_NONE) {
Sent_NetLog("onRecvMsg: SiG_KEYB InitKeyB error");
// tell to the other side that we have the plugin disabled with him
- showPopUp(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
+ showPopup(sim013,ptr->hContact,g_hPOP[POP_PU_DIS],0);
ShowStatusIconNotify(ptr->hContact);
cpp_reset_context(ptr->cntx);
@@ -464,7 +464,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) // receive message
if (cpp_keyx(ptr->cntx) && (ssig == SiG_ENON||ssig == SiG_ENOF)) {
Sent_NetLog("onRecvMsg: message received");
- showPopUpRM(ptr->hContact);
+ showPopupRM(ptr->hContact);
}
Sent_NetLog("onRecvMsg: exit");
@@ -523,7 +523,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) // îòïðàâëÿåì çàøèôðîâàííîå ñîîáùåíèå
splitMessageSend(ptr,szNewMsg);
- showPopUpSM(ptr->hContact);
+ showPopupSM(ptr->hContact);
return returnNoError(pccsd->hContact);
}
@@ -560,7 +560,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) // øëåì øèôðîâàííîå â îôôëàéí
exp->rsa_send(ptr->cntx, ptrA( miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));
- showPopUpSM(ptr->hContact);
+ showPopupSM(ptr->hContact);
return returnNoError(pccsd->hContact);
}
@@ -593,7 +593,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) if (ptr->cntx && exp->rsa_get_state(ptr->cntx) == 7) {
exp->rsa_send(ptr->cntx, ptrA(miranda_to_utf8((LPCSTR)pccsd->lParam,pccsd->wParam)));
ShowStatusIconNotify(ptr->hContact);
- showPopUpSM(ptr->hContact);
+ showPopupSM(ptr->hContact);
return returnNoError(pccsd->hContact);
}
@@ -612,7 +612,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) createRSAcntx(ptr);
loadRSAkey(ptr);
exp->rsa_connect(ptr->cntx);
- showPopUpKS(pccsd->hContact);
+ showPopupKS(pccsd->hContact);
ShowStatusIconNotify(pccsd->hContact);
return returnNoError(pccsd->hContact);
}
@@ -645,7 +645,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) ccsd.szProtoService = PSS_MESSAGE;
CallService(MS_PROTO_CHAINSEND, wParam, (LPARAM)&ccsd);
- showPopUpDC(pccsd->hContact);
+ showPopupDC(pccsd->hContact);
ShowStatusIconNotify(pccsd->hContact);
}
return CallService(MS_PROTO_CHAINSEND, wParam, lParam);
@@ -723,7 +723,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->wParam |= PREF_METANODB;
CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUpDC(pccsd->hContact);
+ showPopupDC(pccsd->hContact);
ShowStatusIconNotify(pccsd->hContact);
}
return returnNoError(pccsd->hContact);
@@ -746,7 +746,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE;
int ret = CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUpSM(ptr->hContact);
+ showPopupSM(ptr->hContact);
return ret;
}
@@ -768,7 +768,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) pccsd->szProtoService = PSS_MESSAGE;
CallService(MS_PROTO_CHAINSEND, wParam, lParam);
- showPopUpKS(pccsd->hContact);
+ showPopupKS(pccsd->hContact);
ShowStatusIconNotify(pccsd->hContact);
waitForExchange(ptr); // çàïóñêàåì îæèäàíèå
@@ -807,7 +807,7 @@ INT_PTR __cdecl onSendFile(WPARAM wParam, LPARAM lParam) char buf[MAX_PATH];
sprintf(buf,"%s\n%s",Translate(sim011),file[i]);
- showPopUp(buf,NULL,g_hPOP[POP_PU_MSS],2);
+ showPopup(buf,NULL,g_hPOP[POP_PU_MSS],2);
if (ptr->mode == MODE_RSAAES)
exp->rsa_encrypt_file(ptr->cntx,file[i],file_out);
@@ -902,7 +902,7 @@ int __cdecl onProtoAck(WPARAM wParam,LPARAM lParam) }
sprintf(buf,"%s\n%s",Translate(sim012),file_out);
- showPopUp(buf,NULL,g_hPOP[POP_PU_MSR],2);
+ showPopup(buf,NULL,g_hPOP[POP_PU_MSR],2);
if (ptr->mode == MODE_RSAAES )
exp->rsa_decrypt_file(ptr->cntx,ptr->lastFileRecv,file_out);
diff --git a/plugins/SecureIM/src/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp index d065d0b397..a55a393875 100644 --- a/plugins/SecureIM/src/svcs_rsa.cpp +++ b/plugins/SecureIM/src/svcs_rsa.cpp @@ -52,7 +52,7 @@ int __cdecl rsa_check_pub(HANDLE context, PBYTE pub, int pubLen, PBYTE sig, int if (bAAK) {
if (k ) mir_snprintf(msg,MSGSIZE,Translate(sim523),cnm,uin,sha,sha_old);
else mir_snprintf(msg,MSGSIZE,Translate(sim521),cnm,uin,sha);
- showPopUpKRmsg(ptr->hContact,msg);
+ showPopupKRmsg(ptr->hContact,msg);
HistoryLog(ptr->hContact,msg);
v = 1;
#if defined(_DEBUG) || defined(NETLIB_LOG)
@@ -94,7 +94,7 @@ void __cdecl rsa_notify(HANDLE context, int state) switch( state) {
case 1:
- showPopUpEC(ptr->hContact);
+ showPopupEC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
waitForExchange(ptr,2); // äîñûëàåì ñîîáùåíèÿ èç î÷åðåäè
return;
@@ -125,7 +125,7 @@ void __cdecl rsa_notify(HANDLE context, int state) {
char buf[1024];
sprintf(buf,sim510,-state);
- showPopUpDCmsg(ptr->hContact,buf);
+ showPopupDCmsg(ptr->hContact,buf);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
waitForExchange(ptr,3); // äîñûëàåì íåøèôðîâàíî
@@ -134,7 +134,7 @@ void __cdecl rsa_notify(HANDLE context, int state) case -3: // ñîåäèíåíèå ðàçîðâàíî âðó÷íóþ
case -4: // ñîåäèíåíèå ðàçîðâàíî âðó÷íóþ äðóãîé ñòîðîíîé
- showPopUpDC(ptr->hContact);
+ showPopupDC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
waitForExchange(ptr,3); // äîñûëàåì íåøèôðîâàíî
@@ -143,7 +143,7 @@ void __cdecl rsa_notify(HANDLE context, int state) default:
return;
}
- showPopUpDCmsg(ptr->hContact,msg);
+ showPopupDCmsg(ptr->hContact,msg);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
waitForExchange(ptr,3); // äîñûëàåì íåøèôðîâàíî
diff --git a/plugins/SeenPlugin/src/options.cpp b/plugins/SeenPlugin/src/options.cpp index 3b672ad2e4..9bd9333201 100644 --- a/plugins/SeenPlugin/src/options.cpp +++ b/plugins/SeenPlugin/src/options.cpp @@ -30,7 +30,7 @@ int ModeChange_mo(WPARAM,LPARAM); int CheckIfOnline(void);
int ResetMissed(void);
-INT_PTR CALLBACK OptsPopUpsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
+INT_PTR CALLBACK OptsPopupsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam)
{
DBVARIANT dbv;
TCHAR szstamp[256];
@@ -105,7 +105,7 @@ INT_PTR CALLBACK OptsPopUpsDlgProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lpara GetDlgItemText(hdlg, IDC_POPUPSTAMPTEXT, szstamp, SIZEOF(szstamp));
_tcsncpy(ppd.lptzText, ParseString(szstamp,NULL,0), MAX_SECONDLINE);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
SendMessage(GetParent(hdlg), PSM_CHANGED, 0, 0);
}
@@ -449,9 +449,9 @@ int OptionsInit(WPARAM wparam,LPARAM) if ( ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUPS);
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTitle = LPGENT("Last seen");
- odp.pfnDlgProc = OptsPopUpsDlgProc;
+ odp.pfnDlgProc = OptsPopupsDlgProc;
Options_AddPage(wparam, &odp);
}
return 0;
diff --git a/plugins/SeenPlugin/src/utils.cpp b/plugins/SeenPlugin/src/utils.cpp index e9b06d92d4..0b8d8f3f13 100644 --- a/plugins/SeenPlugin/src/utils.cpp +++ b/plugins/SeenPlugin/src/utils.cpp @@ -458,7 +458,7 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa if (hContact > 0) CallService(MS_MSG_SENDMESSAGE,(WPARAM)hContact,0);
}
case WM_CONTEXTMENU:
- PUDeletePopUp(hwnd);
+ PUDeletePopup(hwnd);
break;
case UM_INITPOPUP: return 0;
}
@@ -499,7 +499,7 @@ void ShowPopup(HANDLE hcontact, const char * lpzProto, int newStatus) }
else _tcsncpy(ppd.lptzText, ParseString(DEFAULT_POPUPSTAMPTEXT, hcontact, 0), MAX_SECONDLINE);
ppd.PluginWindowProc = PopupDlgProc;
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
void myPlaySound(HANDLE hcontact, WORD newStatus, WORD oldStatus)
diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp index 7048794d81..0ecd0a691f 100644 --- a/plugins/SendScreenshotPlus/src/Main.cpp +++ b/plugins/SendScreenshotPlus/src/Main.cpp @@ -109,8 +109,8 @@ extern "C" int __declspec(dllexport) Load(void) int hook_ModulesLoaded(WPARAM, LPARAM)
{
- myGlobals.PopUpExist = ServiceExists(MS_POPUP_ADDPOPUP);
- myGlobals.PopUpActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
+ myGlobals.PopupExist = ServiceExists(MS_POPUP_ADDPOPUP);
+ myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
myGlobals.PluginHTTPExist = ServiceExists(MS_HTTP_ACCEPT_CONNECTIONS);
myGlobals.PluginFTPExist = ServiceExists(MS_FTPFILE_SHAREFILE);
diff --git a/plugins/SendScreenshotPlus/src/Utils.h b/plugins/SendScreenshotPlus/src/Utils.h index f82c0142a2..4b539bb896 100644 --- a/plugins/SendScreenshotPlus/src/Utils.h +++ b/plugins/SendScreenshotPlus/src/Utils.h @@ -65,7 +65,7 @@ INT_PTR SaveTIF(HBITMAP hBmp, LPTSTR szFilename); //---------------------------------------------------------------------------
/* Old stuff from Borland C++
-//void ShowPopUp(char *title, char *text);
+//void ShowPopup(char *title, char *text);
*/
#endif
diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp index 7f618368c8..de6d03b297 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.cpp @@ -695,7 +695,7 @@ INT_PTR CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) EndDialog(pmpd->hDialog, IDCANCEL);
}
}
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
}
break;
@@ -728,8 +728,8 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) // Shall the MessageBox displayed as popup?
if (!(pMsgBox->uType & (MB_INFOBAR|MB_NOPOPUP)) && // message box can be a popup?
ServiceExists(MS_POPUP_ADDPOPUPT) && // popups exist?
- myGlobals.PopUpActionsExist == 1 && // popup support ext stuct?
- (db_get_dw(NULL, "PopUp","Actions", 0) & 1) && // popup++ actions on?
+ myGlobals.PopupActionsExist == 1 && // popup support ext stuct?
+ (db_get_dw(NULL, "Popup","Actions", 0) & 1) && // popup++ actions on?
db_get_b(NULL, MODNAME, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX) // user likes popups?
)
{
diff --git a/plugins/SendScreenshotPlus/src/global.h b/plugins/SendScreenshotPlus/src/global.h index c10e8c56f5..cb1a374d0e 100644 --- a/plugins/SendScreenshotPlus/src/global.h +++ b/plugins/SendScreenshotPlus/src/global.h @@ -101,8 +101,8 @@ using namespace std; typedef struct _MGLOBAL {
DWORD mirandaVersion; // mirandaVersion
- BOOLEAN PopUpExist : 1; // Popup or MS_POPUP_ADDPOPUP exist
- BOOLEAN PopUpActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist
+ BOOLEAN PopupExist : 1; // Popup or MS_POPUP_ADDPOPUP exist
+ BOOLEAN PopupActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist
BOOLEAN PluginHTTPExist : 1; // HTTPServer or MS_HTTP_ACCEPT_CONNECTIONS exist
BOOLEAN PluginFTPExist : 1; // FTPFile or MS_FTPFILE_SHAREFILE exist
diff --git a/plugins/SmileyAdd/src/general.cpp b/plugins/SmileyAdd/src/general.cpp index dd9623d6a5..ad11e50420 100644 --- a/plugins/SmileyAdd/src/general.cpp +++ b/plugins/SmileyAdd/src/general.cpp @@ -271,6 +271,6 @@ void ReportError(const TCHAR* errmsg) _tcscpy(pd.lpwzContactName, title);
_tcscpy(pd.lpwzText, errmsg);
pd.iSeconds = -1;
- if (PUAddPopUpT(&pd) == CALLSERVICE_NOTFOUND)
+ if (PUAddPopupT(&pd) == CALLSERVICE_NOTFOUND)
MessageBox(NULL, errmsg, title, MB_OK | MB_ICONWARNING | MB_TOPMOST);
}
\ No newline at end of file diff --git a/plugins/Spamotron/src/popups.cpp b/plugins/Spamotron/src/popups.cpp index 60784891bb..4688e4baf6 100644 --- a/plugins/Spamotron/src/popups.cpp +++ b/plugins/Spamotron/src/popups.cpp @@ -188,7 +188,7 @@ int ShowPopupPreview(HWND optDlg, BYTE popupType, TCHAR *line1, TCHAR *line2) mir_sntprintf((WCHAR *)ppdp.lptzContactName, MAX_CONTACTNAME, _T("%s"), (line1)?line1:_T(PLUGIN_NAME));
if (line2)
mir_sntprintf((WCHAR *)ppdp.lptzText, MAX_SECONDLINE, _T("%s"), line2);
- return PUAddPopUpW(&ppdp);
+ return PUAddPopupW(&ppdp);
}
@@ -237,5 +237,5 @@ int ShowPopup(HANDLE hContact, BYTE popupType, TCHAR *line1, TCHAR *line2) mir_sntprintf((WCHAR *)ppdp.lptzContactName, MAX_CONTACTNAME, _T("%s"), (line1)?line1:_T(PLUGIN_NAME));
if (line2)
mir_sntprintf((WCHAR *)ppdp.lptzText, MAX_SECONDLINE, _T("%s"), line2);
- return PUAddPopUpW(&ppdp);
+ return PUAddPopupW(&ppdp);
}
\ No newline at end of file diff --git a/plugins/SplashScreen/src/debug.h b/plugins/SplashScreen/src/debug.h index 7338f644f0..cf3de0cbb3 100644 --- a/plugins/SplashScreen/src/debug.h +++ b/plugins/SplashScreen/src/debug.h @@ -30,7 +30,7 @@ int inline _DebugPopup(HANDLE hContact, TCHAR *fmt, ...) _tcsncpy_s(ppd.lptzText, debug, MAX_SECONDLINE - 20);
ppd.colorText = RGB(255,255,255);
ppd.colorBack = RGB(255,0,0);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
return 0;
}
diff --git a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp index d852cd0a0a..d597d27a43 100644 --- a/plugins/StatusPlugins/KeepStatus/keepstatus.cpp +++ b/plugins/StatusPlugins/KeepStatus/keepstatus.cpp @@ -1097,7 +1097,7 @@ static INT_PTR ShowPopup(char* msg, HICON hIcon) ppd.iSeconds = 0;
break;
}
- return PUAddPopUp(&ppd);
+ return PUAddPopup(&ppd);
}
LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
@@ -1111,12 +1111,12 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa case POPUP_ACT_CANCEL:
// cancel timer
StopChecking();
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case POPUP_ACT_CLOSEPOPUP:
// close the popup
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
}
break;
diff --git a/plugins/StatusPlugins/KeepStatus/options.cpp b/plugins/StatusPlugins/KeepStatus/options.cpp index a5fc34f085..6169ddd004 100644 --- a/plugins/StatusPlugins/KeepStatus/options.cpp +++ b/plugins/StatusPlugins/KeepStatus/options.cpp @@ -523,7 +523,7 @@ INT_PTR CALLBACK PopupOptDlgProc(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lPar {
ppd.iSeconds = -1;
}
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
break;
}
@@ -598,7 +598,7 @@ int OptionsInit(WPARAM wparam,LPARAM lparam) ZeroMemory(&odp,sizeof(odp));
odp.cbSize = sizeof(odp);
odp.position = 150000000;
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.groupPosition = 910000000;
odp.hInstance = hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_PUOPT_KEEPSTATUS);
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;
diff --git a/plugins/TooltipNotify/src/TooltipNotify.cpp b/plugins/TooltipNotify/src/TooltipNotify.cpp index 7265d3a6c7..1d71b312c5 100644 --- a/plugins/TooltipNotify/src/TooltipNotify.cpp +++ b/plugins/TooltipNotify/src/TooltipNotify.cpp @@ -298,7 +298,7 @@ int CTooltipNotify::InitializeOptions(WPARAM wParam, LPARAM lParam) odp.hInstance = m_hDllInstance;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszTitle = LPGEN("Tooltip Notify");
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = CTooltipNotify::OptionsDlgProcWrapper;
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index 8670714d42..b1ca6dfffb 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -1149,7 +1149,7 @@ void NotifyOnSend(void) ppd.colorText = Traffic_PopupFontColor;
ppd.PluginWindowProc = NULL;
ppd.iSeconds = (Traffic_PopupTimeoutDefault ? 0 : Traffic_PopupTimeoutValue);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
void NotifyOnRecv(void)
@@ -1168,7 +1168,7 @@ void NotifyOnRecv(void) ppd.colorText = Traffic_PopupFontColor;
ppd.PluginWindowProc = NULL;
ppd.iSeconds = (Traffic_PopupTimeoutDefault ? 0 : Traffic_PopupTimeoutValue);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
void CreateProtocolList(void)
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index f46d545482..0bc7d54976 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -395,7 +395,7 @@ int TrafficCounterOptInitialise(WPARAM wParam,LPARAM lParam) if (bPopupExists) {
odp.groupPosition = 100;
odp.pszTemplate=MAKEINTRESOURCEA(IDD_OPT_TRAFFIC_POPUPS);
- odp.pszGroup=LPGEN("PopUps");
+ odp.pszGroup=LPGEN("Popups");
odp.pszTitle=LPGEN("Traffic counter");
odp.pfnDlgProc=DlgProcPopupsTraffic;
odp.flags=ODPF_BOLDGROUPS;
diff --git a/plugins/TranslitSwitcher/src/Layoutproc.cpp b/plugins/TranslitSwitcher/src/Layoutproc.cpp index 26ab1ebe52..1a3fc10f6a 100644 --- a/plugins/TranslitSwitcher/src/Layoutproc.cpp +++ b/plugins/TranslitSwitcher/src/Layoutproc.cpp @@ -487,7 +487,7 @@ VOID SwitchLayout(BOOL lastword) pd.lchIcon = Skin_GetIcon("Switch Layout and Send");
lstrcpyn(pd.lptzText, buf, SIZEOF(pd.lptzText));
lstrcpyn(pd.lptzContactName, TranslateT("TranslitSwitcher"), SIZEOF(pd.lptzContactName));
- PUAddPopUpT(&pd);
+ PUAddPopupT(&pd);
}
}
else if(lstrcmp(szClassName, _T("RichEdit20W")) == 0)
diff --git a/plugins/UserInfoEx/src/commonheaders.h b/plugins/UserInfoEx/src/commonheaders.h index 32d50e43c9..85cc866c83 100644 --- a/plugins/UserInfoEx/src/commonheaders.h +++ b/plugins/UserInfoEx/src/commonheaders.h @@ -174,7 +174,7 @@ typedef struct _MGLOBAL DWORD mirandaVersion; // mirandaVersion
BYTE CanChangeDetails : 1; // is service to upload own contact information for icq present?
BYTE TzIndexExist : 1; // Win Reg has Timzone Index Info
- BYTE PopUpActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist
+ BYTE PopupActionsExist : 1; // Popup++ or MS_POPUP_REGISTERACTIONS exist
BYTE ShowPropsheetColours : 1; // cached SET_PROPSHEET_SHOWCOLOURS database value
BYTE WantAeroAdaption : 1; // reserved for later use
BYTE UseDbxTree : 1; // use dbx_tree ?
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 3cb45cd696..7ddcab2ac9 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -690,7 +690,7 @@ static LRESULT CALLBACK PopupProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lP EndDialog(pmpd->hDialog, IDCANCEL);
}
}
- PUDeletePopUp(hDlg);
+ PUDeletePopup(hDlg);
}
break;
@@ -721,8 +721,8 @@ INT_PTR MsgBoxService(WPARAM wParam, LPARAM lParam) // Shall the MessageBox displayed as popup?
if (!(pMsgBox->uType & (MB_INFOBAR|MB_NOPOPUP)) && // message box can be a popup?
ServiceExists(MS_POPUP_ADDPOPUPT) && // popups exist?
- myGlobals.PopUpActionsExist == 1 && // popup support ext stuct?
- (DB::Setting::GetDWord(NULL, "PopUp","Actions", 0) & 1) && // popup++ actions on?
+ myGlobals.PopupActionsExist == 1 && // popup support ext stuct?
+ (DB::Setting::GetDWord(NULL, "Popup","Actions", 0) & 1) && // popup++ actions on?
DB::Setting::GetByte(SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX)) // user likes popups?
return DialogBoxParam(ghInst, MAKEINTRESOURCE(IDD_MSGBOXDUMMI), pMsgBox->hParent, MsgBoxPop, lParam);
diff --git a/plugins/UserInfoEx/src/init.cpp b/plugins/UserInfoEx/src/init.cpp index ea02f62a8e..1d8966691f 100644 --- a/plugins/UserInfoEx/src/init.cpp +++ b/plugins/UserInfoEx/src/init.cpp @@ -69,7 +69,7 @@ static int OnTopToolBarLoaded(WPARAM wParam, LPARAM lParam) **/
static int OnModulesLoaded(WPARAM wParam, LPARAM lParam)
{
- myGlobals.PopUpActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
+ myGlobals.PopupActionsExist = ServiceExists(MS_POPUP_REGISTERACTIONS);
// init meta contacts
INT_PTR ptr = CallService(MS_MC_GETPROTOCOLNAME, 0, 0);
diff --git a/plugins/UserInfoEx/src/psp_options.cpp b/plugins/UserInfoEx/src/psp_options.cpp index 5ae5c14471..e47d87f5b6 100644 --- a/plugins/UserInfoEx/src/psp_options.cpp +++ b/plugins/UserInfoEx/src/psp_options.cpp @@ -954,11 +954,11 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR DBGetCheckBtn(hDlg, CHECK_OPT_POPUP_MSGBOX, SET_POPUPMSGBOX, DEFVAL_POPUPMSGBOX);
DBGetCheckBtn(hDlg, CHECK_OPT_POPUP_PROGRESS, "PopupProgress", FALSE);
// disable if popup plugin dos not sopport buttons inside popop
- if (!myGlobals.PopUpActionsExist) {
+ if (!myGlobals.PopupActionsExist) {
EnableDlgItem(hDlg, CHECK_OPT_POPUP_MSGBOX, FALSE);
EnableDlgItem(hDlg, CHECK_OPT_POPUP_PROGRESS, FALSE);
}
- else if (!(DB::Setting::GetDWord(0, "PopUp","Actions", 0) & 1)) {
+ else if (!(DB::Setting::GetDWord(0, "Popup","Actions", 0) & 1)) {
EnableDlgItem(hDlg, CHECK_OPT_POPUP_MSGBOX, FALSE);
}
@@ -1102,7 +1102,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR ppd.colorBack = SendDlgItemMessage(hDlg, CLR_BBACK, CPM_GETCOLOUR, 0, 0);
ppd.colorText = SendDlgItemMessage(hDlg, CLR_BTEXT, CPM_GETCOLOUR, 0, 0);
}
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
// Anniversary
mir_tcsncpy(ppd.lptzContactName, TranslateT("Anniversary"), SIZEOF(ppd.lptzContactName));
@@ -1119,7 +1119,7 @@ static INT_PTR CALLBACK DlgProc_Popups(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR ppd.colorBack = SendDlgItemMessage(hDlg, CLR_ABACK, CPM_GETCOLOUR, 0, 0);
ppd.colorText = SendDlgItemMessage(hDlg, CLR_ATEXT, CPM_GETCOLOUR, 0, 0);
}
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
}
break;
@@ -1272,7 +1272,7 @@ static int OnInitOptions(WPARAM wParam, LPARAM lParam) // Popups page
if (ServiceExists(MS_POPUP_ADDPOPUPT)) {
odp.pszTitle = MODNAME;
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUP);
odp.pfnDlgProc = DlgProc_Popups;
odp.flags = ODPF_BOLDGROUPS;
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index e2c5674a6f..1224c8f9ec 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -397,7 +397,7 @@ public: : CUpdProgress(data)
{
_szText = NULL;
- _bBBCode = DB::Setting::GetByte("PopUp", "UseMText", FALSE);
+ _bBBCode = DB::Setting::GetByte("Popup", "UseMText", FALSE);
_popupButtons[0].cbSize = sizeof(POPUPACTION);
_popupButtons[0].flags = PAF_ENABLED;
@@ -449,7 +449,7 @@ public: {
if (_hWnd)
{
- PUDeletePopUp(_hWnd);
+ PUDeletePopup(_hWnd);
_hWnd = NULL;
}
MIR_FREE(_szText);
diff --git a/plugins/UserInfoEx/src/svc_reminder.cpp b/plugins/UserInfoEx/src/svc_reminder.cpp index 390a1215c0..a52b513c3d 100644 --- a/plugins/UserInfoEx/src/svc_reminder.cpp +++ b/plugins/UserInfoEx/src/svc_reminder.cpp @@ -219,7 +219,7 @@ static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA {
if (HIWORD(wParam) == STN_CLICKED)
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
break;
@@ -227,7 +227,7 @@ static LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPA case WM_CONTEXTMENU:
{
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
}
@@ -292,7 +292,7 @@ static int NotifyWithPopup(HANDLE hContact, CEvent::EType eventType, int DaysToA break;
}
}
- return PUAddPopUpT(&ppd);
+ return PUAddPopupT(&ppd);
}
return 1;
}
diff --git a/plugins/VersionInfo/src/utils.cpp b/plugins/VersionInfo/src/utils.cpp index 1573d3260c..1dd59343bc 100644 --- a/plugins/VersionInfo/src/utils.cpp +++ b/plugins/VersionInfo/src/utils.cpp @@ -37,7 +37,7 @@ void Log(const TCHAR* message) pu.lchIcon = hiVIIcon;
_tcsncpy(pu.lptzContactName, TranslateT("Version Information"), MAX_CONTACTNAME);
_tcsncpy(pu.lptzText, message, MAX_SECONDLINE);
- PUAddPopUpT(&pu);
+ PUAddPopupT(&pu);
}
else MessageBox(NULL, message, _T("VersionInfo"), MB_OK | MB_ICONINFORMATION);
}
diff --git a/plugins/Weather/src/weather.h b/plugins/Weather/src/weather.h index 84d1b2b888..b60a90559a 100644 --- a/plugins/Weather/src/weather.h +++ b/plugins/Weather/src/weather.h @@ -476,7 +476,7 @@ void RemoveIconSettings(); BOOL CALLBACK TextOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam);
BOOL CALLBACK AdvOptionsProc(HWND hdlg,UINT msg,WPARAM wparam,LPARAM lparam);
INT_PTR CALLBACK DlgProcText(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-INT_PTR CALLBACK DlgPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
+INT_PTR CALLBACK DlgPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
// functions in weather_popup.c
int WeatherPopup(WPARAM wParam, LPARAM lParam);
diff --git a/plugins/Weather/src/weather_contacts.cpp b/plugins/Weather/src/weather_contacts.cpp index 2cc4187bf1..c8b50a49a2 100644 --- a/plugins/Weather/src/weather_contacts.cpp +++ b/plugins/Weather/src/weather_contacts.cpp @@ -202,7 +202,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa EnableWindow(GetDlgItem(hwndDlg, IDC_BROWSE), (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));
// other checkbox options
- CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopUp", FALSE));
+ CheckDlgButton(hwndDlg, IDC_DPop, db_get_b(hContact, WEATHERPROTONAME, "DPopup", FALSE));
CheckDlgButton(hwndDlg, IDC_DAutoUpdate, db_get_b(hContact, WEATHERPROTONAME, "DAutoUpdate", FALSE));
CheckDlgButton(hwndDlg, IDC_Internal, db_get_b(hContact, WEATHERPROTONAME, "History", 0));
@@ -389,7 +389,7 @@ INT_PTR CALLBACK DlgProcChange(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa db_set_b(hContact, WEATHERPROTONAME, "History", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Internal));
db_set_b(hContact, WEATHERPROTONAME, "Overwrite", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_Overwrite));
db_set_b(hContact, WEATHERPROTONAME, "File", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_External));
- db_set_b(hContact, WEATHERPROTONAME, "DPopUp", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));
+ db_set_b(hContact, WEATHERPROTONAME, "DPopup", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DPop));
db_set_b(hContact, WEATHERPROTONAME, "DAutoUpdate", (BYTE)IsDlgButtonChecked(hwndDlg, IDC_DAutoUpdate));
// re-enable the protocol and update the data for the station
diff --git a/plugins/Weather/src/weather_opt.cpp b/plugins/Weather/src/weather_opt.cpp index 6a3e7a00da..b1fdff274b 100644 --- a/plugins/Weather/src/weather_opt.cpp +++ b/plugins/Weather/src/weather_opt.cpp @@ -185,10 +185,10 @@ void LoadOptions(void) // advanced
opt.DisCondIcon = db_get_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", false);
// popup options
- opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopUp", true);
+ opt.UsePopup = db_get_b(NULL, WEATHERPROTONAME, "UsePopup", true);
opt.UpdatePopup = db_get_b(NULL, WEATHERPROTONAME, "UpdatePopup", true);
opt.AlertPopup = db_get_b(NULL, WEATHERPROTONAME, "AlertPopup", true);
- opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopUpOnChange", true);
+ opt.PopupOnChange = db_get_b(NULL, WEATHERPROTONAME, "PopupOnChange", true);
opt.ShowWarnings = db_get_b(NULL, WEATHERPROTONAME, "ShowWarnings", true);
// popup colors
opt.BGColour = db_get_dw(NULL, WEATHERPROTONAME, "BackgroundColour", GetSysColor(COLOR_BTNFACE));
@@ -254,10 +254,10 @@ void SaveOptions(void) // advanced
db_set_b(NULL, WEATHERPROTONAME, "DisableConditionIcon", (BYTE)opt.DisCondIcon);
// popup options
- db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup);
+ db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup);
db_set_b(NULL, WEATHERPROTONAME, "UpdatePopup", (BYTE)opt.UpdatePopup);
db_set_b(NULL, WEATHERPROTONAME, "AlertPopup", (BYTE)opt.AlertPopup);
- db_set_b(NULL, WEATHERPROTONAME, "PopUpOnChange", (BYTE)opt.PopupOnChange);
+ db_set_b(NULL, WEATHERPROTONAME, "PopupOnChange", (BYTE)opt.PopupOnChange);
db_set_b(NULL, WEATHERPROTONAME, "ShowWarnings", (BYTE)opt.ShowWarnings);
// popup colors
db_set_dw(NULL, WEATHERPROTONAME, "BackgroundColour", opt.BGColour);
@@ -304,10 +304,10 @@ int OptInit(WPARAM wParam,LPARAM lParam) { if (( ServiceExists(MS_POPUP_ADDPOPUPT))) {
odp.position = 100000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POPUP);
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.groupPosition = 910000000;
odp.ptszTab = NULL;
- odp.pfnDlgProc = DlgPopUpOpts;
+ odp.pfnDlgProc = DlgPopupOpts;
Options_AddPage(wParam, &odp);
}
diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp index 2a3e3580e5..0ad926e5a1 100644 --- a/plugins/Weather/src/weather_popup.cpp +++ b/plugins/Weather/src/weather_popup.cpp @@ -36,7 +36,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam) {
// determine if the popup should display or not
if (opt.UsePopup && opt.UpdatePopup && (!opt.PopupOnChange || (BOOL)lParam) &&
- !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopUp", 0))
+ !db_get_b((HANDLE)wParam, WEATHERPROTONAME, "DPopup", 0))
{
POPUPDATAT ppd = {0};
WEATHERINFO winfo;
@@ -59,7 +59,7 @@ int WeatherPopup(WPARAM wParam, LPARAM lParam) ppd.colorBack = (opt.UseWinColors)?GetSysColor(COLOR_BTNFACE):opt.BGColour;
ppd.colorText = (opt.UseWinColors)?GetSysColor(COLOR_WINDOWTEXT):opt.TextColour;
ppd.iSeconds = opt.pDelay;
- PUAddPopUpT( &ppd );
+ PUAddPopupT( &ppd );
}
return 0;
}
@@ -105,7 +105,7 @@ int WeatherError(WPARAM wParam, LPARAM lParam) ppd.colorBack = (opt.UseWinColors)?GetSysColor(COLOR_BTNFACE):opt.BGColour;
ppd.colorText = (opt.UseWinColors)?GetSysColor(COLOR_WINDOWTEXT):opt.TextColour;
ppd.iSeconds = opt.pDelay;
- PUAddPopUpT( &ppd );
+ PUAddPopupT( &ppd );
}
return 0;
}
@@ -135,13 +135,13 @@ LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa switch(message) {
case WM_COMMAND:
ID = opt.LeftClickAction;
- if (ID != IDM_M7) PUDeletePopUp(hWnd);
+ if (ID != IDM_M7) PUDeletePopup(hWnd);
SendMessage(hPopupWindow, ID, (WPARAM)hContact, 0);
return TRUE;
case WM_CONTEXTMENU:
ID = opt.RightClickAction;
- if (ID != IDM_M7) PUDeletePopUp(hWnd);
+ if (ID != IDM_M7) PUDeletePopup(hWnd);
SendMessage(hPopupWindow, ID, (WPARAM)hContact, 0);
return TRUE;
@@ -250,7 +250,7 @@ void ReadPopupOpt(HWND hdlg) }
// copied and modified from NewStatusNotify
-INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgPopupOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
int ID;
TCHAR str[512];
@@ -375,7 +375,7 @@ INT_PTR CALLBACK DlgPopUpOpts(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) break;
case IDC_PD1:
- // Popup delay setting from PopUp plugin
+ // Popup delay setting from Popup plugin
SetDlgItemText(hdlg, IDC_DELAY, _T("0"));
CheckRadioButton(hdlg, IDC_PD1, IDC_PD3, IDC_PD1);
break;
diff --git a/plugins/Weather/src/weather_svcs.cpp b/plugins/Weather/src/weather_svcs.cpp index 0185b78072..34e026b0d5 100644 --- a/plugins/Weather/src/weather_svcs.cpp +++ b/plugins/Weather/src/weather_svcs.cpp @@ -250,7 +250,7 @@ void UpdatePopupMenu(BOOL State) {
// update option setting
opt.UsePopup = State;
- db_set_b(NULL, WEATHERPROTONAME, "UsePopUp", (BYTE)opt.UsePopup);
+ db_set_b(NULL, WEATHERPROTONAME, "UsePopup", (BYTE)opt.UsePopup);
CLISTMENUITEM mi = { sizeof(mi) };
if (State)
@@ -371,7 +371,7 @@ void AddMenuItems(void) mi.pszName = LPGEN("Weather Notification");
mi.icolibItem = GetIconHandle("popup");
mi.position = 0;
- mi.pszPopupName = LPGEN("PopUps");
+ mi.pszPopupName = LPGEN("Popups");
mi.pszService = WEATHERPROTONAME "/PopupMenu";
hEnableDisablePopupMenu = Menu_AddMainMenuItem(&mi);
UpdatePopupMenu(opt.UsePopup);
diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index a6cee642ff..95777c3fd5 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -102,7 +102,7 @@ int UpdateWeather(HANDLE hContact) // have weather alert issued?
dbres = db_get_ts(hContact, WEATHERCONDITION, "Alert", &dbv);
if ( !dbres && dbv.ptszVal[0] != 0) {
- if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopUp", 0) && Ch) {
+ if (opt.AlertPopup && !db_get_b(hContact, WEATHERPROTONAME, "DPopup", 0) && Ch) {
// display alert popup
wsprintf(str, _T("Alert for %s%c%s"), winfo.city, 255, dbv.ptszVal);
WPShowMessage(str, SM_WEATHERALERT);
diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index c13d4cc428..92817875f7 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -962,7 +962,7 @@ int HandlePopupClick(HWND hWnd, int action) }//fallthrough
case 1: //DISMISS
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
}
diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 4d02d6ff0e..98dbef5e6f 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -37,7 +37,7 @@ void PopupNotifyNoBirthdays() _tcscpy(pd.lptzContactName, TranslateT("WhenWasIt"));
_tcscpy(pd.lptzText, TranslateT("No upcoming birthdays."));
- PUAddPopUpT(&pd);
+ PUAddPopupT(&pd);
}
TCHAR *BuildDTBText(int dtb, TCHAR *name, TCHAR *text, int size)
@@ -105,7 +105,7 @@ int PopupNotifyBirthday(HANDLE hContact, int dtb, int age) else
mir_sntprintf(pd.lptzText, MAX_SECONDLINE, TranslateT("%s\n%s just turned %d."), text, sex, age);
- PUAddPopUpT(&pd);
+ PUAddPopupT(&pd);
free(name);
return 0;
@@ -149,7 +149,7 @@ int PopupNotifyMissedBirthday(HANDLE hContact, int dab, int age) else
mir_sntprintf(pd.lptzText, MAX_SECONDLINE, TranslateT("%s\n%s just turned %d."), text, sex, age);
- PUAddPopUpT(&pd);
+ PUAddPopupT(&pd);
free(name);
return 0;
diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index dd61f51c49..f9f43b2318 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -185,7 +185,7 @@ void ShowPopupMessage(TCHAR *title, TCHAR *message, HANDLE icon) _tcscpy(pd.lptzText, message);
pd.colorText = commonData.foreground;
pd.colorBack = commonData.background;
- PUAddPopUpT(&pd);
+ PUAddPopupT(&pd);
}
DWORD WINAPI RefreshUserDetailsWorkerThread(LPVOID param)
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");
diff --git a/plugins/YAMN/src/account.cpp b/plugins/YAMN/src/account.cpp index 0a82e05305..8138528813 100644 --- a/plugins/YAMN/src/account.cpp +++ b/plugins/YAMN/src/account.cpp @@ -341,28 +341,28 @@ static DWORD ReadNotificationFromMemory(char **Parser,char *End,YAMN_NOTIFICATIO MessageBox(NULL,Debug,_T("debug"),MB_OK);
#endif
- Which->PopUpB=*(COLORREF *)(*Parser);
+ Which->PopupB=*(COLORREF *)(*Parser);
(*Parser)+=sizeof(COLORREF);
if (*Parser>=End)
return EACC_FILECOMPATIBILITY;
#ifdef DEBUG_FILEREAD
- _stprintf(Debug,_T("PopUpB: %04x, remaining %d chars"),Which->PopUpB,End-*Parser);
+ _stprintf(Debug,_T("PopupB: %04x, remaining %d chars"),Which->PopupB,End-*Parser);
MessageBox(NULL,Debug,_T("debug"),MB_OK);
#endif
- Which->PopUpT=*(COLORREF *)(*Parser);
+ Which->PopupT=*(COLORREF *)(*Parser);
(*Parser)+=sizeof(COLORREF);
if (*Parser>=End)
return EACC_FILECOMPATIBILITY;
#ifdef DEBUG_FILEREAD
- _stprintf(Debug,_T("PopUpT: %04x, remaining %d chars"),Which->PopUpT,End-*Parser);
+ _stprintf(Debug,_T("PopupT: %04x, remaining %d chars"),Which->PopupT,End-*Parser);
MessageBox(NULL,Debug,_T("debug"),MB_OK);
#endif
- Which->PopUpTime=*(DWORD *)(*Parser);
+ Which->PopupTime=*(DWORD *)(*Parser);
(*Parser)+=sizeof(DWORD);
if (*Parser>=End)
return EACC_FILECOMPATIBILITY;
#ifdef DEBUG_FILEREAD
- _stprintf(Debug,_T("PopUpTime: %04x, remaining %d chars"),Which->PopUpTime,End-*Parser);
+ _stprintf(Debug,_T("PopupTime: %04x, remaining %d chars"),Which->PopupTime,End-*Parser);
MessageBox(NULL,Debug,_T("debug"),MB_OK);
#endif
@@ -896,9 +896,9 @@ static INT_PTR PerformAccountWriting(HYAMNPROTOPLUGIN Plugin,HANDLE File) throw (DWORD)EACC_SYSTEM;
if ((!WriteFile(File,(char *)&ActualAccount->NewMailN.Flags,sizeof(DWORD),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopUpB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopUpT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopUpTime,sizeof(DWORD),&WrittenBytes,NULL)))
+ (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopupB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopupT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->NewMailN.PopupTime,sizeof(DWORD),&WrittenBytes,NULL)))
throw (DWORD)EACC_SYSTEM;
if ((Stat=WriteStringToFileW(File,ActualAccount->NewMailN.App)) ||
@@ -906,9 +906,9 @@ static INT_PTR PerformAccountWriting(HYAMNPROTOPLUGIN Plugin,HANDLE File) throw (DWORD)Stat;
if ((!WriteFile(File,(char *)&ActualAccount->NoNewMailN.Flags,sizeof(DWORD),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopUpB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopUpT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopUpTime,sizeof(DWORD),&WrittenBytes,NULL)))
+ (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopupB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopupT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->NoNewMailN.PopupTime,sizeof(DWORD),&WrittenBytes,NULL)))
throw (DWORD)EACC_SYSTEM;
if ((Stat=WriteStringToFileW(File,ActualAccount->NoNewMailN.App)) ||
@@ -916,9 +916,9 @@ static INT_PTR PerformAccountWriting(HYAMNPROTOPLUGIN Plugin,HANDLE File) throw (DWORD)Stat;
if ((!WriteFile(File,(char *)&ActualAccount->BadConnectN.Flags,sizeof(DWORD),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopUpB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopUpT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
- (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopUpTime,sizeof(DWORD),&WrittenBytes,NULL)))
+ (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopupB,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopupT,sizeof(COLORREF),&WrittenBytes,NULL)) ||
+ (!WriteFile(File,(char *)&ActualAccount->BadConnectN.PopupTime,sizeof(DWORD),&WrittenBytes,NULL)))
throw (DWORD)EACC_SYSTEM;
if ((Stat=WriteStringToFileW(File,ActualAccount->BadConnectN.App)) ||
diff --git a/plugins/YAMN/src/browser/badconnect.cpp b/plugins/YAMN/src/browser/badconnect.cpp index 2c0f9b65e5..cb549b29f3 100644 --- a/plugins/YAMN/src/browser/badconnect.cpp +++ b/plugins/YAMN/src/browser/badconnect.cpp @@ -11,7 +11,7 @@ //--------------------------------------------------------------------------------------------------
-LRESULT CALLBACK BadConnectPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT CALLBACK BadConnectPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{
DWORD PluginParam;
switch(msg)
@@ -27,12 +27,12 @@ LRESULT CALLBACK BadConnectPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPa si.cb=sizeof(si);
ActualAccount=(HACCOUNT)CallService(MS_POPUP_GETCONTACT,(WPARAM)hWnd,0);
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read wait\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read wait\n");
#endif
if (WAIT_OBJECT_0==WaitToReadFcn(ActualAccount->AccountAccessSO))
{
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter\n");
#endif
if (ActualAccount->BadConnectN.App != NULL)
{
@@ -54,13 +54,13 @@ LRESULT CALLBACK BadConnectPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPa }
}
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read done\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read done\n");
#endif
ReadDoneFcn(ActualAccount->AccountAccessSO);
}
#ifdef DEBUG_SYNCHRO
else
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
#endif
SendMessage(hWnd,UM_DESTROYPOPUP,0,0);
}
@@ -94,13 +94,13 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARA {
case WM_INITDIALOG:
{
- BOOL ShowPopUp,ShowMsg,ShowIco;
+ BOOL ShowPopup,ShowMsg,ShowIco;
HACCOUNT ActualAccount;
DWORD ErrorCode;
char* TitleStrA;
char *Message1A=NULL;
TCHAR *Message1W=NULL;
- POPUPDATAT BadConnectPopUp;
+ POPUPDATAT BadConnectPopup;
ActualAccount=((struct BadConnectionParam *)lParam)->account;
ErrorCode=((struct BadConnectionParam *)lParam)->errcode;
@@ -120,46 +120,46 @@ INT_PTR CALLBACK DlgProcYAMNBadConnection(HWND hDlg,UINT msg,WPARAM wParam,LPARA TitleStrA = new char[strlen(ActualAccount->Name)+strlen(Translate(BADCONNECTTITLE))];
wsprintfA(TitleStrA,Translate(BADCONNECTTITLE),ActualAccount->Name);
- ShowPopUp=ActualAccount->BadConnectN.Flags & YAMN_ACC_POP;
+ ShowPopup=ActualAccount->BadConnectN.Flags & YAMN_ACC_POP;
ShowMsg=ActualAccount->BadConnectN.Flags & YAMN_ACC_MSG;
ShowIco=ActualAccount->BadConnectN.Flags & YAMN_ACC_ICO;
- if (ShowPopUp)
+ if (ShowPopup)
{
- BadConnectPopUp.lchContact=ActualAccount;
- BadConnectPopUp.lchIcon=g_LoadIconEx(3);
- BadConnectPopUp.colorBack=ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? ActualAccount->BadConnectN.PopUpB : GetSysColor(COLOR_BTNFACE);
- BadConnectPopUp.colorText=ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? ActualAccount->BadConnectN.PopUpT : GetSysColor(COLOR_WINDOWTEXT);
- BadConnectPopUp.iSeconds=ActualAccount->BadConnectN.PopUpTime;
+ BadConnectPopup.lchContact=ActualAccount;
+ BadConnectPopup.lchIcon=g_LoadIconEx(3);
+ BadConnectPopup.colorBack=ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? ActualAccount->BadConnectN.PopupB : GetSysColor(COLOR_BTNFACE);
+ BadConnectPopup.colorText=ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC ? ActualAccount->BadConnectN.PopupT : GetSysColor(COLOR_WINDOWTEXT);
+ BadConnectPopup.iSeconds=ActualAccount->BadConnectN.PopupTime;
- BadConnectPopUp.PluginWindowProc=BadConnectPopUpProc;
- BadConnectPopUp.PluginData=0; //it's bad connect popup
- lstrcpyn(BadConnectPopUp.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(BadConnectPopUp.lptzContactName));
+ BadConnectPopup.PluginWindowProc=BadConnectPopupProc;
+ BadConnectPopup.PluginData=0; //it's bad connect popup
+ lstrcpyn(BadConnectPopup.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(BadConnectPopup.lptzContactName));
}
if (ActualAccount->Plugin->Fcn != NULL && ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr != NULL)
{
Message1W=ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);
SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);
- lstrcpyn(BadConnectPopUp.lptzText,Message1W,sizeof(BadConnectPopUp.lptzText));
- if (ShowPopUp)
- PUAddPopUpT(&BadConnectPopUp);
+ lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));
+ if (ShowPopup)
+ PUAddPopupT(&BadConnectPopup);
}
else if (ActualAccount->Plugin->Fcn != NULL && ActualAccount->Plugin->Fcn->GetErrorStringAFcnPtr != NULL)
{
Message1W=ActualAccount->Plugin->Fcn->GetErrorStringWFcnPtr(ErrorCode);
SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);
- lstrcpyn(BadConnectPopUp.lptzText,Message1W,sizeof(BadConnectPopUp.lptzText));
- if (ShowPopUp)
- PUAddPopUpT(&BadConnectPopUp);
+ lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));
+ if (ShowPopup)
+ PUAddPopupT(&BadConnectPopup);
}
else
{
Message1W=TranslateT("Unknown error");
SetDlgItemText(hDlg,IDC_STATICMSG,Message1W);
- lstrcpyn(BadConnectPopUp.lptzText,Message1W,sizeof(BadConnectPopUp.lptzText));
- if (ShowPopUp)
- PUAddPopUpT(&BadConnectPopUp);
+ lstrcpyn(BadConnectPopup.lptzText,Message1W,sizeof(BadConnectPopup.lptzText));
+ if (ShowPopup)
+ PUAddPopupT(&BadConnectPopup);
}
if (!ShowMsg && !ShowIco)
diff --git a/plugins/YAMN/src/browser/mailbrowser.cpp b/plugins/YAMN/src/browser/mailbrowser.cpp index 45691b407a..747e572dd8 100644 --- a/plugins/YAMN/src/browser/mailbrowser.cpp +++ b/plugins/YAMN/src/browser/mailbrowser.cpp @@ -36,12 +36,12 @@ struct CMailNumbersSub int Display; //uses YAMN_MSG_DISPLAY flag
int DisplayTC; //uses YAMN_MSG_DISPLAY flag and YAMN_MSG_DISPLAYC flag
int DisplayUC; //uses YAMN_MSG_DISPLAY flag and YAMN_MSG_DISPLAYC flag and YAMN_MSG_UNSEEN flag
- int PopUp; //uses YAMN_MSG_POPUP flag
- int PopUpTC; //uses YAMN_MSG_POPUPC flag
- int PopUpNC; //uses YAMN_MSG_POPUPC flag and YAMN_MSG_NEW flag
- int PopUpRun; //uses YAMN_MSG_POPUP flag and YAMN_MSG_NEW flag
- int PopUpSL2NC; //uses YAMN_MSG_SPAML2 flag and YAMN_MSG_NEW flag
- int PopUpSL3NC; //uses YAMN_MSG_SPAML3 flag and YAMN_MSG_NEW flag
+ int Popup; //uses YAMN_MSG_POPUP flag
+ int PopupTC; //uses YAMN_MSG_POPUPC flag
+ int PopupNC; //uses YAMN_MSG_POPUPC flag and YAMN_MSG_NEW flag
+ int PopupRun; //uses YAMN_MSG_POPUP flag and YAMN_MSG_NEW flag
+ int PopupSL2NC; //uses YAMN_MSG_SPAML2 flag and YAMN_MSG_NEW flag
+ int PopupSL3NC; //uses YAMN_MSG_SPAML3 flag and YAMN_MSG_NEW flag
// int SysTray; //uses YAMN_MSG_SYSTRAY flag
int SysTrayUC; //uses YAMN_MSG_SYSTRAY flag and YAMN_MSG_UNSEEN flag
// int Sound; //uses YAMN_MSG_SOUND flag
@@ -127,17 +127,17 @@ int ChangeExistingMailStatus(HWND hListView,HACCOUNT ActualAccount,struct CMailN //Adds new mails to ListView and if any new, shows multi popup (every new message is new popup window created by popup plugin)
// hListView- handle of listview window
// ActualAccount- handle of account, whose mails are show
-// NewMailPopUp- pointer to prepared structure for popup plugin, can be NULL if no popup show
+// NewMailPopup- pointer to prepared structure for popup plugin, can be NULL if no popup show
// MailNumbers- pointer to structure, in which function stores numbers of mails with some property
// nflags- flags what to do when new mail arrives
// returns one of UPDATE_XXX value (not implemented yet)
int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumbers *MailNumbers,DWORD nflags);
//Window callback procedure for popup window (created by popup plugin)
-LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
+LRESULT CALLBACK NewMailPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
//Window callback procedure for popup window (created by popup plugin)
-LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
+LRESULT CALLBACK NoNewMailPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam);
//Dialog callback procedure for mail browser
INT_PTR CALLBACK DlgProcYAMNMailBrowser(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lParam);
@@ -245,34 +245,34 @@ void IncrementMailCounters(HYAMNMAIL msgq,struct CMailNumbers *MN) MN->Real.DisplayUC++;
if (msgq->Flags & YAMN_MSG_POPUP)
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUp++;
+ MN->Virtual.Popup++;
else
- MN->Real.PopUp++;
+ MN->Real.Popup++;
if ((msgq->Flags & YAMN_MSG_POPUPC) == YAMN_MSG_POPUPC)
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUpTC++;
+ MN->Virtual.PopupTC++;
else
- MN->Real.PopUpTC++;
+ MN->Real.PopupTC++;
if ((msgq->Flags & (YAMN_MSG_NEW | YAMN_MSG_POPUPC)) == (YAMN_MSG_NEW | YAMN_MSG_POPUPC))
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUpNC++;
+ MN->Virtual.PopupNC++;
else
- MN->Real.PopUpNC++;
+ MN->Real.PopupNC++;
if ((msgq->Flags & (YAMN_MSG_NEW | YAMN_MSG_POPUP)) == (YAMN_MSG_NEW | YAMN_MSG_POPUP))
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUpRun++;
+ MN->Virtual.PopupRun++;
else
- MN->Real.PopUpRun++;
+ MN->Real.PopupRun++;
if ((msgq->Flags & YAMN_MSG_NEW) && YAMN_MSG_SPAML(msgq->Flags,YAMN_MSG_SPAML2))
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUpSL2NC++;
+ MN->Virtual.PopupSL2NC++;
else
- MN->Real.PopUpSL2NC++;
+ MN->Real.PopupSL2NC++;
if ((msgq->Flags & YAMN_MSG_NEW) && YAMN_MSG_SPAML(msgq->Flags,YAMN_MSG_SPAML3))
if (msgq->Flags & YAMN_MSG_VIRTUAL)
- MN->Virtual.PopUpSL3NC++;
+ MN->Virtual.PopupSL3NC++;
else
- MN->Real.PopUpSL3NC++;
+ MN->Real.PopupSL3NC++;
/* if (msgq->MailData->Flags & YAMN_MSG_SYSTRAY)
if (msgq->Flags & YAMN_MSG_VIRTUAL)
MN->Virtual.SysTray++;
@@ -319,7 +319,7 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags) HYAMNMAIL msgq;
BOOL Loaded;
- BOOL RunMailBrowser,RunPopUps;
+ BOOL RunMailBrowser,RunPopups;
mwui=(struct CMailWinUserInfo *)GetWindowLongPtr(hDlg,DWLP_USER);
//now we ensure read access for account and write access for its mails
@@ -396,13 +396,13 @@ int UpdateMails(HWND hDlg,HACCOUNT ActualAccount,DWORD nflags,DWORD nnflags) if ( (nflags & YAMN_ACC_POP) &&
(ActualAccount->Flags & YAMN_ACC_POPN) &&
- (MN.Real.PopUpNC+MN.Virtual.PopUpNC)) //if some popups with mails are needed to show
- RunPopUps=TRUE;
- else RunPopUps=FALSE;
+ (MN.Real.PopupNC+MN.Virtual.PopupNC)) //if some popups with mails are needed to show
+ RunPopups=TRUE;
+ else RunPopups=FALSE;
if (RunMailBrowser)
ChangeExistingMailStatus(GetDlgItem(hDlg,IDC_LISTMAILS),ActualAccount,&MN);
- if (RunMailBrowser || RunPopUps)
+ if (RunMailBrowser || RunPopups)
AddNewMailsToListView(hDlg==NULL ? NULL : GetDlgItem(hDlg,IDC_LISTMAILS),ActualAccount,&MN,nflags);
if (RunMailBrowser)
@@ -485,7 +485,7 @@ void MimeDateToLocalizedDateTime(char *datein, WCHAR *dateout, int lendateout); int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWORD nflags)
{
HYAMNMAIL msgq;
- POPUPDATAT NewMailPopUp = {0};
+ POPUPDATAT NewMailPopup = {0};
WCHAR *FromStr;
WCHAR SizeStr[20];
@@ -510,14 +510,14 @@ int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumb lfoundi=0;
}
- NewMailPopUp.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
- NewMailPopUp.lchIcon=g_LoadIconEx(2);
- NewMailPopUp.colorBack=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopUpB : GetSysColor(COLOR_BTNFACE);
- NewMailPopUp.colorText=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopUpT : GetSysColor(COLOR_WINDOWTEXT);
- NewMailPopUp.iSeconds=ActualAccount->NewMailN.PopUpTime;
+ NewMailPopup.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
+ NewMailPopup.lchIcon=g_LoadIconEx(2);
+ NewMailPopup.colorBack=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopupB : GetSysColor(COLOR_BTNFACE);
+ NewMailPopup.colorText=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopupT : GetSysColor(COLOR_WINDOWTEXT);
+ NewMailPopup.iSeconds=ActualAccount->NewMailN.PopupTime;
- NewMailPopUp.PluginWindowProc=NewMailPopUpProc;
- NewMailPopUp.PluginData=(void *)0; //it's new mail popup
+ NewMailPopup.PluginWindowProc=NewMailPopupProc;
+ NewMailPopup.PluginData=(void *)0; //it's new mail popup
for (msgq=(HYAMNMAIL)ActualAccount->Mails;msgq != NULL;msgq=msgq->Next,lfoundi++)
{
@@ -600,16 +600,16 @@ int AddNewMailsToListView(HWND hListView,HACCOUNT ActualAccount,struct CMailNumb }
if ((nflags & YAMN_ACC_POP) && (ActualAccount->Flags & YAMN_ACC_POPN) && (msgq->Flags & YAMN_MSG_POPUP) && (msgq->Flags & YAMN_MSG_NEW)) {
- lstrcpyn(NewMailPopUp.lptzContactName, FromStr, SIZEOF(NewMailPopUp.lptzContactName));
- lstrcpyn(NewMailPopUp.lptzText, UnicodeHeader.Subject, SIZEOF(NewMailPopUp.lptzText));
+ lstrcpyn(NewMailPopup.lptzContactName, FromStr, SIZEOF(NewMailPopup.lptzContactName));
+ lstrcpyn(NewMailPopup.lptzText, UnicodeHeader.Subject, SIZEOF(NewMailPopup.lptzText));
PYAMN_MAILSHOWPARAM MailParam = (PYAMN_MAILSHOWPARAM)malloc(sizeof(YAMN_MAILSHOWPARAM));
if (MailParam) {
MailParam->account = ActualAccount;
MailParam->mail = msgq;
MailParam->ThreadRunningEV = 0;
- NewMailPopUp.PluginData = MailParam;
- PUAddPopUpT(&NewMailPopUp);
+ NewMailPopup.PluginData = MailParam;
+ PUAddPopupT(&NewMailPopup);
}
}
@@ -645,15 +645,15 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR if (MN->Real.EventNC+MN->Virtual.EventNC)
NotifyEventHooks(hNewMailHook,0,0);
- if ((nflags & YAMN_ACC_KBN) && (MN->Real.PopUpRun+MN->Virtual.PopUpRun))
+ if ((nflags & YAMN_ACC_KBN) && (MN->Real.PopupRun+MN->Virtual.PopupRun))
{
- CallService(MS_KBDNOTIFY_STARTBLINK,(WPARAM)MN->Real.PopUpNC+MN->Virtual.PopUpNC,NULL);
+ CallService(MS_KBDNOTIFY_STARTBLINK,(WPARAM)MN->Real.PopupNC+MN->Virtual.PopupNC,NULL);
}
- if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopUpRun+MN->Virtual.PopUpRun))
+ if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopupRun+MN->Virtual.PopupRun))
{
char sMsg[250];
- _snprintf(sMsg,249,Translate("%s : %d new mail message(s), %d total"),ActualAccount->Name,MN->Real.PopUpNC+MN->Virtual.PopUpNC,MN->Real.PopUpTC+MN->Virtual.PopUpTC);
+ _snprintf(sMsg,249,Translate("%s : %d new mail message(s), %d total"),ActualAccount->Name,MN->Real.PopupNC+MN->Virtual.PopupNC,MN->Real.PopupTC+MN->Virtual.PopupTC);
if (!(nflags & YAMN_ACC_CONTNOEVENT)) {
CLISTEVENT cEvent;
cEvent.cbSize = sizeof(CLISTEVENT);
@@ -676,22 +676,22 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR if ((nflags & YAMN_ACC_POP) &&
!(ActualAccount->Flags & YAMN_ACC_POPN) &&
- (MN->Real.PopUpRun+MN->Virtual.PopUpRun))
+ (MN->Real.PopupRun+MN->Virtual.PopupRun))
{
- POPUPDATAT NewMailPopUp ={0};
+ POPUPDATAT NewMailPopup ={0};
- NewMailPopUp.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
- NewMailPopUp.lchIcon=g_LoadIconEx(2);
- NewMailPopUp.colorBack=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopUpB : GetSysColor(COLOR_BTNFACE);
- NewMailPopUp.colorText=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopUpT : GetSysColor(COLOR_WINDOWTEXT);
- NewMailPopUp.iSeconds=ActualAccount->NewMailN.PopUpTime;
+ NewMailPopup.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
+ NewMailPopup.lchIcon=g_LoadIconEx(2);
+ NewMailPopup.colorBack=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopupB : GetSysColor(COLOR_BTNFACE);
+ NewMailPopup.colorText=nflags & YAMN_ACC_POPC ? ActualAccount->NewMailN.PopupT : GetSysColor(COLOR_WINDOWTEXT);
+ NewMailPopup.iSeconds=ActualAccount->NewMailN.PopupTime;
- NewMailPopUp.PluginWindowProc = NewMailPopUpProc;
- NewMailPopUp.PluginData = (void *)0; //multiple popups
+ NewMailPopup.PluginWindowProc = NewMailPopupProc;
+ NewMailPopup.PluginData = (void *)0; //multiple popups
- lstrcpyn(NewMailPopUp.lptzContactName, _A2T(ActualAccount->Name),SIZEOF(NewMailPopUp.lptzContactName));
- wsprintf(NewMailPopUp.lptzText,TranslateT("%d new mail message(s), %d total"),MN->Real.PopUpNC+MN->Virtual.PopUpNC,MN->Real.PopUpTC+MN->Virtual.PopUpTC);
- PUAddPopUpT(&NewMailPopUp);
+ lstrcpyn(NewMailPopup.lptzContactName, _A2T(ActualAccount->Name),SIZEOF(NewMailPopup.lptzContactName));
+ wsprintf(NewMailPopup.lptzText,TranslateT("%d new mail message(s), %d total"),MN->Real.PopupNC+MN->Virtual.PopupNC,MN->Real.PopupTC+MN->Virtual.PopupTC);
+ PUAddPopupT(&NewMailPopup);
}
//destroy tray icon if no new mail
@@ -779,35 +779,35 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR if (nflags & YAMN_ACC_SND)
CallService(MS_SKIN_PLAYSOUND,0,(LPARAM)YAMN_NEWMAILSOUND);
- if ((nnflags & YAMN_ACC_POP) && (MN->Real.PopUpRun+MN->Virtual.PopUpRun==0))
+ if ((nnflags & YAMN_ACC_POP) && (MN->Real.PopupRun+MN->Virtual.PopupRun==0))
{
- POPUPDATAT NoNewMailPopUp;
+ POPUPDATAT NoNewMailPopup;
- NoNewMailPopUp.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
- NoNewMailPopUp.lchIcon=g_LoadIconEx(1);
- NoNewMailPopUp.colorBack=ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? ActualAccount->NoNewMailN.PopUpB : GetSysColor(COLOR_BTNFACE);
- NoNewMailPopUp.colorText=ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? ActualAccount->NoNewMailN.PopUpT : GetSysColor(COLOR_WINDOWTEXT);
- NoNewMailPopUp.iSeconds=ActualAccount->NoNewMailN.PopUpTime;
+ NoNewMailPopup.lchContact=(ActualAccount->hContact != NULL) ? ActualAccount->hContact : ActualAccount;
+ NoNewMailPopup.lchIcon=g_LoadIconEx(1);
+ NoNewMailPopup.colorBack=ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? ActualAccount->NoNewMailN.PopupB : GetSysColor(COLOR_BTNFACE);
+ NoNewMailPopup.colorText=ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC ? ActualAccount->NoNewMailN.PopupT : GetSysColor(COLOR_WINDOWTEXT);
+ NoNewMailPopup.iSeconds=ActualAccount->NoNewMailN.PopupTime;
- NoNewMailPopUp.PluginWindowProc=NoNewMailPopUpProc;
- NoNewMailPopUp.PluginData=(void *)0; //it's not new mail popup
+ NoNewMailPopup.PluginWindowProc=NoNewMailPopupProc;
+ NoNewMailPopup.PluginData=(void *)0; //it's not new mail popup
- lstrcpyn(NoNewMailPopUp.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(NoNewMailPopUp.lptzContactName));
- if (MN->Real.PopUpSL2NC+MN->Virtual.PopUpSL2NC)
- wsprintf(NoNewMailPopUp.lptzText,TranslateT("No new mail message, %d spam(s)"),MN->Real.PopUpSL2NC+MN->Virtual.PopUpSL2NC);
+ lstrcpyn(NoNewMailPopup.lptzContactName,_A2T(ActualAccount->Name),SIZEOF(NoNewMailPopup.lptzContactName));
+ if (MN->Real.PopupSL2NC+MN->Virtual.PopupSL2NC)
+ wsprintf(NoNewMailPopup.lptzText,TranslateT("No new mail message, %d spam(s)"),MN->Real.PopupSL2NC+MN->Virtual.PopupSL2NC);
else
- lstrcpyn(NoNewMailPopUp.lptzText,TranslateT("No new mail message"),SIZEOF(NoNewMailPopUp.lptzText));
- PUAddPopUpT(&NoNewMailPopUp);
+ lstrcpyn(NoNewMailPopup.lptzText,TranslateT("No new mail message"),SIZEOF(NoNewMailPopup.lptzText));
+ PUAddPopupT(&NoNewMailPopup);
}
- if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopUpRun+MN->Virtual.PopUpRun==0))
+ if ((nflags & YAMN_ACC_CONT) && (MN->Real.PopupRun+MN->Virtual.PopupRun==0))
{
if (ActualAccount->hContact != NULL)
{
- if (MN->Real.PopUpTC+MN->Virtual.PopUpTC)
+ if (MN->Real.PopupTC+MN->Virtual.PopupTC)
{
char tmp[255];
- sprintf(tmp,Translate("%d new mail message(s), %d total"),MN->Real.PopUpNC+MN->Virtual.PopUpNC,MN->Real.PopUpTC+MN->Virtual.PopUpTC);
+ sprintf(tmp,Translate("%d new mail message(s), %d total"),MN->Real.PopupNC+MN->Virtual.PopupNC,MN->Real.PopupTC+MN->Virtual.PopupTC);
db_set_s(ActualAccount->hContact, "CList", "StatusMsg", tmp);
}
else db_set_s(ActualAccount->hContact, "CList", "StatusMsg", Translate("No new mail message"));
@@ -820,7 +820,7 @@ void DoMailActions(HWND hDlg,HACCOUNT ActualAccount,struct CMailNumbers *MN,DWOR }
DWORD WINAPI ShowEmailThread(LPVOID Param);
-LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT CALLBACK NewMailPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{
INT_PTR PluginParam=0;
switch(msg)
@@ -860,12 +860,12 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam #ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read wait\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read wait\n");
#endif
if (WAIT_OBJECT_0==WaitToReadFcn(Account->AccountAccessSO))
{
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter\n");
#endif
switch(msg)
{
@@ -880,13 +880,13 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam break;
}
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read done\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read done\n");
#endif
ReadDoneFcn(Account->AccountAccessSO);
}
#ifdef DEBUG_SYNCHRO
else
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
#endif
}
if ((Account->NewMailN.Flags & YAMN_ACC_CONT) && !(Account->NewMailN.Flags & YAMN_ACC_CONTNOEVENT)) {
@@ -938,7 +938,7 @@ LRESULT CALLBACK NewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam return DefWindowProc(hWnd,msg,wParam,lParam);
}
-LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
+LRESULT CALLBACK NoNewMailPopupProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lParam)
{
switch(msg)
{
@@ -960,12 +960,12 @@ LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPar ActualAccount = (HACCOUNT) hContact;
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read wait\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read wait\n");
#endif
if (WAIT_OBJECT_0==WaitToReadFcn(ActualAccount->AccountAccessSO))
{
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter\n");
#endif
switch(msg)
{
@@ -984,13 +984,13 @@ LRESULT CALLBACK NoNewMailPopUpProc(HWND hWnd,UINT msg,WPARAM wParam,LPARAM lPar break;
}
#ifdef DEBUG_SYNCHRO
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read done\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read done\n");
#endif
ReadDoneFcn(ActualAccount->AccountAccessSO);
}
#ifdef DEBUG_SYNCHRO
else
- DebugLog(SynchroFile,"PopUpProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
+ DebugLog(SynchroFile,"PopupProc:LEFTCLICK:ActualAccountSO-read enter failed\n");
#endif
SendMessageW(hWnd,UM_DESTROYPOPUP,0,0);
}
diff --git a/plugins/YAMN/src/proto/pop3/pop3opt.cpp b/plugins/YAMN/src/proto/pop3/pop3opt.cpp index 698ce1f9fa..33e8d0be3c 100644 --- a/plugins/YAMN/src/proto/pop3/pop3opt.cpp +++ b/plugins/YAMN/src/proto/pop3/pop3opt.cpp @@ -185,7 +185,7 @@ int YAMNOptInitSvc(WPARAM wParam,LPARAM lParam) Options_AddPage(wParam, &odp);
if ( ServiceExists(MS_POPUP_ADDPOPUP)) {
- odp.pszGroup = LPGEN("PopUps");
+ odp.pszGroup = LPGEN("Popups");
odp.pszTab = LPGEN("YAMN");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_POP3ACCOUNTPOPUP);
odp.pfnDlgProc = DlgProcPOP3AccPopup;
@@ -334,9 +334,9 @@ BOOL DlgShowAccountPopup(HWND hDlg,WPARAM wParam,LPARAM lParam) #ifdef DEBUG_SYNCHRO
DebugLog(SynchroFile,"Options:SHOWACCOUNT:ActualAccountSO-read enter\n");
#endif
- SetDlgItemInt(hDlg,IDC_EDITPOPS,ActualAccount->NewMailN.PopUpTime,FALSE);
- SetDlgItemInt(hDlg,IDC_EDITNPOPS,ActualAccount->NoNewMailN.PopUpTime,FALSE);
- SetDlgItemInt(hDlg,IDC_EDITFPOPS,ActualAccount->BadConnectN.PopUpTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITPOPS,ActualAccount->NewMailN.PopupTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITNPOPS,ActualAccount->NoNewMailN.PopupTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITFPOPS,ActualAccount->BadConnectN.PopupTime,FALSE);
CheckDlgButton(hDlg,IDC_CHECKPOP,ActualAccount->NewMailN.Flags & YAMN_ACC_POP ? BST_CHECKED : BST_UNCHECKED);
@@ -392,9 +392,9 @@ BOOL DlgShowAccount(HWND hDlg,WPARAM wParam,LPARAM lParam) DlgSetItemTextW(hDlg, IDC_EDITAPPPARAM, ActualAccount->NewMailN.AppParam);
SetDlgItemInt(hDlg,IDC_EDITPORT,ActualAccount->Server->Port,FALSE);
SetDlgItemInt(hDlg,IDC_EDITINTERVAL,ActualAccount->Interval/60,FALSE);
- SetDlgItemInt(hDlg,IDC_EDITPOPS,ActualAccount->NewMailN.PopUpTime,FALSE);
- SetDlgItemInt(hDlg,IDC_EDITNPOPS,ActualAccount->NoNewMailN.PopUpTime,FALSE);
- SetDlgItemInt(hDlg,IDC_EDITFPOPS,ActualAccount->BadConnectN.PopUpTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITPOPS,ActualAccount->NewMailN.PopupTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITNPOPS,ActualAccount->NoNewMailN.PopupTime,FALSE);
+ SetDlgItemInt(hDlg,IDC_EDITFPOPS,ActualAccount->BadConnectN.PopupTime,FALSE);
for (i=0;i<=CPLENSUPP;i++)
if ((i<CPLENSUPP) && (CodePageNamesSupp[i].CP==ActualAccount->CP))
{
@@ -524,8 +524,8 @@ BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam) #endif
if (ActualAccount->NewMailN.Flags & YAMN_ACC_POPC)
{
- SendDlgItemMessage(hDlg,IDC_CPB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NewMailN.PopUpB);
- SendDlgItemMessage(hDlg,IDC_CPT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NewMailN.PopUpT);
+ SendDlgItemMessage(hDlg,IDC_CPB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NewMailN.PopupB);
+ SendDlgItemMessage(hDlg,IDC_CPT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NewMailN.PopupT);
}
else
{
@@ -534,8 +534,8 @@ BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam) }
if (ActualAccount->BadConnectN.Flags & YAMN_ACC_POPC)
{
- SendDlgItemMessage(hDlg,IDC_CPFB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->BadConnectN.PopUpB);
- SendDlgItemMessage(hDlg,IDC_CPFT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->BadConnectN.PopUpT);
+ SendDlgItemMessage(hDlg,IDC_CPFB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->BadConnectN.PopupB);
+ SendDlgItemMessage(hDlg,IDC_CPFT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->BadConnectN.PopupT);
}
else
{
@@ -544,8 +544,8 @@ BOOL DlgShowAccountColors(HWND hDlg,WPARAM wParam,LPARAM lParam) }
if (ActualAccount->NoNewMailN.Flags & YAMN_ACC_POPC)
{
- SendDlgItemMessage(hDlg,IDC_CPNB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NoNewMailN.PopUpB);
- SendDlgItemMessage(hDlg,IDC_CPNT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NoNewMailN.PopUpT);
+ SendDlgItemMessage(hDlg,IDC_CPNB,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NoNewMailN.PopupB);
+ SendDlgItemMessage(hDlg,IDC_CPNT,CPM_SETCOLOUR,0,(LPARAM)ActualAccount->NoNewMailN.PopupT);
}
else
{
@@ -1384,11 +1384,11 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa TesterN.PluginData=NULL;
if (IsDlgButtonChecked(hDlg,IDC_CHECKPOP)==BST_CHECKED)
- PUAddPopUpT(&Tester);
+ PUAddPopupT(&Tester);
if (IsDlgButtonChecked(hDlg,IDC_CHECKFPOP)==BST_CHECKED)
- PUAddPopUpT(&TesterF);
+ PUAddPopupT(&TesterF);
if (IsDlgButtonChecked(hDlg,IDC_CHECKNPOP)==BST_CHECKED)
- PUAddPopUpT(&TesterN);
+ PUAddPopupT(&TesterN);
Changed=TRUE;
}
break;
@@ -1510,17 +1510,17 @@ INT_PTR CALLBACK DlgProcPOP3AccPopup(HWND hDlg,UINT msg,WPARAM wParam,LPARAM lPa (CheckFPopup ? YAMN_ACC_POP : 0) |
(CheckFPopupW ? YAMN_ACC_POPC : 0);
- ActualAccount->NewMailN.PopUpB=SendDlgItemMessage(hDlg,IDC_CPB,CPM_GETCOLOUR,0,0);
- ActualAccount->NewMailN.PopUpT=SendDlgItemMessage(hDlg,IDC_CPT,CPM_GETCOLOUR,0,0);
- ActualAccount->NewMailN.PopUpTime=Time;
+ ActualAccount->NewMailN.PopupB=SendDlgItemMessage(hDlg,IDC_CPB,CPM_GETCOLOUR,0,0);
+ ActualAccount->NewMailN.PopupT=SendDlgItemMessage(hDlg,IDC_CPT,CPM_GETCOLOUR,0,0);
+ ActualAccount->NewMailN.PopupTime=Time;
- ActualAccount->NoNewMailN.PopUpB=SendDlgItemMessage(hDlg,IDC_CPNB,CPM_GETCOLOUR,0,0);
- ActualAccount->NoNewMailN.PopUpT=SendDlgItemMessage(hDlg,IDC_CPNT,CPM_GETCOLOUR,0,0);
- ActualAccount->NoNewMailN.PopUpTime=TimeN;
+ ActualAccount->NoNewMailN.PopupB=SendDlgItemMessage(hDlg,IDC_CPNB,CPM_GETCOLOUR,0,0);
+ ActualAccount->NoNewMailN.PopupT=SendDlgItemMessage(hDlg,IDC_CPNT,CPM_GETCOLOUR,0,0);
+ ActualAccount->NoNewMailN.PopupTime=TimeN;
- ActualAccount->BadConnectN.PopUpB=SendDlgItemMessage(hDlg,IDC_CPFB,CPM_GETCOLOUR,0,0);
- ActualAccount->BadConnectN.PopUpT=SendDlgItemMessage(hDlg,IDC_CPFT,CPM_GETCOLOUR,0,0);
- ActualAccount->BadConnectN.PopUpTime=TimeF;
+ ActualAccount->BadConnectN.PopupB=SendDlgItemMessage(hDlg,IDC_CPFB,CPM_GETCOLOUR,0,0);
+ ActualAccount->BadConnectN.PopupT=SendDlgItemMessage(hDlg,IDC_CPFT,CPM_GETCOLOUR,0,0);
+ ActualAccount->BadConnectN.PopupTime=TimeF;
diff --git a/plugins/YAPP/src/notify_imp.cpp b/plugins/YAPP/src/notify_imp.cpp index be2e14cdc1..0be4fbd15f 100644 --- a/plugins/YAPP/src/notify_imp.cpp +++ b/plugins/YAPP/src/notify_imp.cpp @@ -67,7 +67,7 @@ INT_PTR svcPopup2DefaultActions(WPARAM wParam, LPARAM lParam) return 0;
}
-INT_PTR CALLBACK DlgProcPopUps(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+INT_PTR CALLBACK DlgProcPopups(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
{
/* To change options use MNotifySet*(hNotify, ....) Apply/Cancel is implemented in notify.dll */
HANDLE hNotify = (HANDLE)GetWindowLongPtr(hwnd, GWLP_USERDATA);
@@ -98,7 +98,7 @@ int NotifyOptionsInitialize(WPARAM wParam,LPARAM lParam) odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
odp.pszTitle = LPGEN("YAPP Popups");
odp.flags=ODPF_BOLDGROUPS;
- odp.pfnDlgProc = DlgProcPopUps;
+ odp.pfnDlgProc = DlgProcPopups;
CallService(MS_NOTIFY_OPT_ADDPAGE, wParam, (LPARAM)&odp);
return 0;
}
diff --git a/plugins/YAPP/src/options.cpp b/plugins/YAPP/src/options.cpp index c8cc3955f0..7158404a00 100644 --- a/plugins/YAPP/src/options.cpp +++ b/plugins/YAPP/src/options.cpp @@ -472,7 +472,7 @@ int OptInit(WPARAM wParam, LPARAM lParam) odp.flags = ODPF_BOLDGROUPS;
odp.position = -790000000;
odp.hInstance = hInst;
- odp.pszTitle = LPGEN("PopUps");
+ odp.pszTitle = LPGEN("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1);
odp.pszTab = LPGEN("Settings");
diff --git a/plugins/YAPP/src/services.cpp b/plugins/YAPP/src/services.cpp index 2fe5802224..25e3093a04 100644 --- a/plugins/YAPP/src/services.cpp +++ b/plugins/YAPP/src/services.cpp @@ -298,9 +298,9 @@ static INT_PTR ShowMessageW(WPARAM wParam, LPARAM lParam) return 0;
}
-//=====PopUp/ShowHistory
+//=====Popup/ShowHistory
-INT_PTR PopUp_ShowHistory(WPARAM wParam, LPARAM lParam)
+INT_PTR Popup_ShowHistory(WPARAM wParam, LPARAM lParam)
{
if (!hHistoryWindow)
hHistoryWindow = CreateDialog(hInst, MAKEINTRESOURCE(IDD_LST_HISTORY), NULL, DlgProcHistLst);
@@ -413,8 +413,8 @@ void InitServices() CreateServiceFunction(MS_POPUP_SHOWMESSAGE, ShowMessage);
CreateServiceFunction(MS_POPUP_SHOWMESSAGE"W", ShowMessageW);
- CreateServiceFunction(MS_POPUP_SHOWHISTORY, PopUp_ShowHistory);
- CreateServiceFunction("PopUp/ToggleEnabled", TogglePopups);
+ CreateServiceFunction(MS_POPUP_SHOWHISTORY, Popup_ShowHistory);
+ CreateServiceFunction("Popup/ToggleEnabled", TogglePopups);
}
void DeinitServices()
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index ba7c30123c..0b7acda833 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -89,7 +89,7 @@ int IconsChanged(WPARAM, LPARAM) int TTBLoaded(WPARAM, LPARAM)
{
TTBButton ttb = { sizeof(ttb) };
- ttb.pszService = "PopUp/ToggleEnabled";
+ ttb.pszService = "Popup/ToggleEnabled";
ttb.lParamUp = 1;
ttb.dwFlags = TTBBF_VISIBLE | TTBBF_SHOWTOOLTIP | TTBBF_ASPUSHBUTTON;
if (db_get_b(0, MODULE, "Enabled", 1))
@@ -200,7 +200,7 @@ void InitMenuItems(void) hMenuItemHistory = Menu_AddMainMenuItem(&mi);
mi.hIcon = IcoLib_GetIcon(isEnabled ? ICO_POPUP_ON : ICO_POPUP_OFF, 0);
- mi.pszService = "PopUp/ToggleEnabled";
+ mi.pszService = "Popup/ToggleEnabled";
mi.ptszName = (isEnabled ? LPGENT("Disable Popups") : LPGENT("Enable Popups"));
hMenuItem = Menu_AddMainMenuItem(&mi);
}
diff --git a/plugins/YAPP/src/yapp_history.h b/plugins/YAPP/src/yapp_history.h index 540777def0..c07c32f2ae 100644 --- a/plugins/YAPP/src/yapp_history.h +++ b/plugins/YAPP/src/yapp_history.h @@ -82,7 +82,7 @@ Useful if you've missed a popup when it appeared. wParam - 0 lParam - 0 */ -#define MS_POPUP_SHOWHISTORY "PopUp/ShowHistory" +#define MS_POPUP_SHOWHISTORY "Popup/ShowHistory" extern PopupHistoryList lstPopupHistory; //defined in main.cpp extern HWND hHistoryWindow; //the history window diff --git a/protocols/AimOscar/src/popup.cpp b/protocols/AimOscar/src/popup.cpp index 96c2a936b4..2d9489c5ac 100644 --- a/protocols/AimOscar/src/popup.cpp +++ b/protocols/AimOscar/src/popup.cpp @@ -43,13 +43,13 @@ LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM if (p->url != NULL)
ShellExecuteA(NULL, "open", p->url, NULL, NULL, SW_SHOW);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return 0;
}
break;
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc index 3cf23fd4c8..803a7f2103 100644 --- a/protocols/FacebookRM/res/facebook.rc +++ b/protocols/FacebookRM/res/facebook.rc @@ -267,7 +267,8 @@ END //
// Generated from the TEXTINCLUDE 3 resource.
//
-
+
+
/////////////////////////////////////////////////////////////////////////////
#endif // not APSTUDIO_INVOKED
diff --git a/protocols/FacebookRM/src/events.cpp b/protocols/FacebookRM/src/events.cpp index 7944090c1f..89a78842e6 100644 --- a/protocols/FacebookRM/src/events.cpp +++ b/protocols/FacebookRM/src/events.cpp @@ -48,17 +48,17 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa {
case WM_COMMAND:
{
- //Get the plugin data (we need the PopUp service to do it)
+ //Get the plugin data (we need the Popup service to do it)
popup_data *data = (popup_data *)PUGetPluginData(hwnd);
if (data != NULL)
data->proto->OpenUrl(data->url);
// After a click, destroy popup
- PUDeletePopUp(hwnd);
+ PUDeletePopup(hwnd);
} break;
case WM_CONTEXTMENU:
- PUDeletePopUp(hwnd);
+ PUDeletePopup(hwnd);
break;
case UM_FREEPLUGINDATA:
@@ -149,7 +149,7 @@ void FacebookProto::NotifyEvent(TCHAR* title, TCHAR* info, HANDLE contact, DWORD pd.PluginWindowProc = (WNDPROC)PopupDlgProc;
lstrcpy(pd.lptzContactName, title);
lstrcpy(pd.lptzText, info);
- ret = PUAddPopUpT(&pd);
+ ret = PUAddPopupT(&pd);
if (ret == 0)
return;
diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp index 110dc14377..c5ecfea06d 100644 --- a/protocols/FacebookRM/src/proto.cpp +++ b/protocols/FacebookRM/src/proto.cpp @@ -404,7 +404,7 @@ int FacebookProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.position = 271830;
if (ServiceExists(MS_POPUP_ADDPOPUPT))
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTab = LPGENT("Events");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_EVENTS);
odp.pfnDlgProc = FBEventsProc;
diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp index 343112cca9..c128079ad3 100644 --- a/protocols/GTalkExt/src/notifications.cpp +++ b/protocols/GTalkExt/src/notifications.cpp @@ -70,7 +70,7 @@ LRESULT CALLBACK PopupProc(HWND wnd, UINT msg, WPARAM wParam, LPARAM lParam) LPCSTR acc;
if (MESSAGE_CLOSEPOPUP == msg)
- PUDeletePopUp(wnd);
+ PUDeletePopup(wnd);
switch (msg) {
case UM_INITPOPUP:
@@ -115,7 +115,7 @@ static bool DoAddPopup(POPUPDATAT *data) ShowWindow(handle, SW_RESTORE);
}
}
- result = PUAddPopUpT(data) == 0;
+ result = PUAddPopupT(data) == 0;
if (handle) DestroyWindow(handle);
diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp index 1d2fb700d3..c780fb4f38 100644 --- a/protocols/GTalkExt/src/options.cpp +++ b/protocols/GTalkExt/src/options.cpp @@ -26,7 +26,7 @@ static const LPTSTR ACCOUNT_PROP_NAME = _T("{BF447EBA-27AE-4DB7-893C-FC42A3F74D75}");
static const LPTSTR DIALOG_INITIALIZED_PROP_NAME = _T("{5EE59FE5-679A-4A29-B0A1-03092E7AC20E}");
-static const LPTSTR POPUPS_OPTIONS_GROUP = LPGENT("PopUps");
+static const LPTSTR POPUPS_OPTIONS_GROUP = LPGENT("Popups");
static const LPTSTR NETWORK_OPTIONS_GROUP = LPGENT("Network");
static const LPSTR NOTIFY_SETTINGS_FROM_MOD_NAME = SHORT_PLUGIN_NAME ".NotifySettingsFromModName";
diff --git a/protocols/Gadu-Gadu/src/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp index fcd58ea3e9..9343f75bb5 100644 --- a/protocols/Gadu-Gadu/src/popups.cpp +++ b/protocols/Gadu-Gadu/src/popups.cpp @@ -43,12 +43,12 @@ LRESULT CALLBACK PopupWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPar if (puData->flags & GG_POPUP_MULTILOGON)
puData->gg->sessions_view(0, 0);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
}
case WM_CONTEXTMENU:
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp index 813a223306..97cbc22653 100644 --- a/protocols/IcqOscarJ/src/fam_03buddy.cpp +++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp @@ -572,7 +572,7 @@ void CIcqProto::handleUserOnline(BYTE *buf, WORD wLen, serverthread_info *info) icq_sendRemoveContact(dwUIN, NULL);
AddToSpammerList(dwUIN);
if (getSettingByte(NULL, "PopupsSpamEnabled", DEFAULT_SPAM_POPUPS_ENABLED))
- ShowPopUpMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM);
+ ShowPopupMsg(hContact, LPGEN("Spambot Detected"), LPGEN("Contact deleted & further events blocked."), POPTYPE_SPAM);
CallService(MS_DB_CONTACT_DELETE, (WPARAM)hContact, 0);
NetLog_Server("Contact %u deleted", dwUIN);
diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp index 2a4766d1a8..ac3a7c9795 100644 --- a/protocols/IcqOscarJ/src/fam_04message.cpp +++ b/protocols/IcqOscarJ/src/fam_04message.cpp @@ -2959,7 +2959,7 @@ void CIcqProto::handleTypingNotification(BYTE *buf, WORD wLen, WORD wFlags, DWOR char *nick = NickFromHandleUtf(hContact);
null_snprintf(szMsg, MAX_PATH, ICQTranslateUtfStatic(LPGEN("Contact \"%s\" has closed the message window."), szFormat, MAX_PATH), nick);
- ShowPopUpMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE);
+ ShowPopupMsg(hContact, ICQTranslateUtfStatic(LPGEN("ICQ Note"), szFormat, MAX_PATH), szMsg, LOG_NOTE);
SAFE_FREE((void**)&nick);
NetLog_Server("%s has closed the message window.", strUID(dwUin, szUid));
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index e43d1dc719..166f81ce79 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -31,7 +31,7 @@ #include <win2k.h>
-extern BOOL bPopUpService;
+extern BOOL bPopupService;
static const char* szLogLevelDescr[] = {
LPGEN("Display all problems"),
@@ -606,12 +606,12 @@ int CIcqProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcIcqPrivacyOpts;
Options_AddPage(wParam, &odp);
- if (bPopUpService) {
+ if (bPopupService) {
odp.position = 100000000;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS);
odp.groupPosition = 900000000;
odp.pfnDlgProc = DlgProcIcqPopupOpts;
- odp.ptszGroup = LPGENT("PopUps");
+ odp.ptszGroup = LPGENT("Popups");
odp.ptszTab = NULL;
Options_AddPage(wParam, &odp);
}
diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp index e978f6e5af..bef035a294 100644 --- a/protocols/IcqOscarJ/src/icq_popups.cpp +++ b/protocols/IcqOscarJ/src/icq_popups.cpp @@ -24,12 +24,12 @@ // -----------------------------------------------------------------------------
// DESCRIPTION:
//
-// PopUp Plugin stuff
+// Popup Plugin stuff
//
// -----------------------------------------------------------------------------
#include "icqoscar.h"
-extern BOOL bPopUpService;
+extern BOOL bPopupService;
static const UINT icqPopupsControls[] = {
IDC_POPUPS_LOG_ENABLED, IDC_POPUPS_SPAM_ENABLED, IDC_PREVIEW, IDC_USESYSICONS, IDC_POPUP_LOG0_TIMEOUT,
@@ -102,11 +102,11 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR switch (LOWORD(wParam)) {
case IDC_PREVIEW:
{
- ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"), LOG_NOTE);
- ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING);
- ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"), LOG_ERROR);
- ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"), LOG_FATAL);
- ppro->ShowPopUpMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM);
+ ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Note"), LOG_NOTE);
+ ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Warning"), LOG_WARNING);
+ ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Error"), LOG_ERROR);
+ ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Fatal"), LOG_FATAL);
+ ppro->ShowPopupMsg(NULL, LPGEN("Popup Title"), LPGEN("Sample Spambot"), POPTYPE_SPAM);
}
return FALSE;
@@ -200,9 +200,9 @@ INT_PTR CALLBACK DlgProcIcqPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR return FALSE;
}
-int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType)
+int CIcqProto::ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType)
{
- if (bPopUpService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED))
+ if (bPopupService && getSettingByte(NULL, "PopupsEnabled", DEFAULT_POPUPS_ENABLED))
{
POPUPDATAT ppd = { 0 };
LPCTSTR rsIcon;
@@ -284,7 +284,7 @@ int CIcqProto::ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *sz ppd.PluginWindowProc = NULL;
ppd.PluginData = NULL;
ppd.iSeconds = ppd.iSeconds;
- return PUAddPopUpT(&ppd);
+ return PUAddPopupT(&ppd);
}
return -1; // Failure
}
diff --git a/protocols/IcqOscarJ/src/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h index 95e997a826..5214329cbd 100644 --- a/protocols/IcqOscarJ/src/icq_popups.h +++ b/protocols/IcqOscarJ/src/icq_popups.h @@ -24,7 +24,7 @@ // -----------------------------------------------------------------------------
// DESCRIPTION:
//
-// Headers for PopUp Plugin support
+// Headers for Popup Plugin support
//
// -----------------------------------------------------------------------------
#ifndef __ICQ_POPUPS_H
diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 561fe3e60b..81d15edf0e 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -553,7 +553,7 @@ struct CIcqProto : public PROTO_INTERFACE BOOL unpackUID(BYTE **ppBuf, WORD *pwLen, DWORD *pdwUIN, uid_str *ppszUID);
//----| icq_popups.cpp |--------------------------------------------------------------
- int ShowPopUpMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType);
+ int ShowPopupMsg(HANDLE hContact, const char *szTitle, const char *szMsg, BYTE bType);
//----| icq_proto.cpp |--------------------------------------------------------------
void __cdecl CheekySearchThread( void* );
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 017025ea03..58f71046f4 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -35,7 +35,7 @@ HINSTANCE hInst;
int hLangpack;
CLIST_INTERFACE *pcli;
-BOOL bPopUpService = FALSE;
+BOOL bPopupService = FALSE;
HANDLE hExtraXStatus;
@@ -91,7 +91,7 @@ IconItem g_IconsList[4] = int ModuleLoad(WPARAM wParam, LPARAM lParam)
{
- bPopUpService = ServiceExists(MS_POPUP_ADDPOPUP);
+ bPopupService = ServiceExists(MS_POPUP_ADDPOPUP);
return 0;
}
diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp index 402863a456..881fe82cba 100644 --- a/protocols/IcqOscarJ/src/log.cpp +++ b/protocols/IcqOscarJ/src/log.cpp @@ -29,7 +29,7 @@ // -----------------------------------------------------------------------------
#include "icqoscar.h"
-extern BOOL bPopUpService;
+extern BOOL bPopupService;
static const char *szLevelDescr[] = {LPGEN("ICQ Note"), LPGEN("ICQ Warning"), LPGEN("ICQ Error"), LPGEN("ICQ Fatal")};
@@ -46,9 +46,9 @@ void __cdecl CIcqProto::icq_LogMessageThread(void* arg) if (!err)
return;
- if (bPopUpService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED))
+ if (bPopupService && getSettingByte(NULL, "PopupsLogEnabled", DEFAULT_LOG_POPUPS_ENABLED))
{
- ShowPopUpMsg(NULL, err->szTitle, err->szMsg, err->bLevel);
+ ShowPopupMsg(NULL, err->szTitle, err->szMsg, err->bLevel);
SAFE_FREE((void**)&err->szMsg);
SAFE_FREE((void**)&err);
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);
diff --git a/protocols/MSN/src/msn_mail.cpp b/protocols/MSN/src/msn_mail.cpp index cbd45e8f92..87d6dbebed 100644 --- a/protocols/MSN/src/msn_mail.cpp +++ b/protocols/MSN/src/msn_mail.cpp @@ -220,7 +220,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) TCHAR tBuffer2[512];
int UnreadMessages = mUnreadMessages;
int UnreadJunkEmails = mUnreadJunkEmails;
- bool ShowPopUp = isInitial;
+ bool ShowPopup = isInitial;
MimeHeaders tFileInfo;
tFileInfo.readFromBuffer(msgBody);
@@ -277,7 +277,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) mir_sntprintf(tBuffer, SIZEOF(tBuffer), msgtxt, mimeFromW, Fromaddr);
mir_free(mimeFromW);
mir_free(mimeSubjectW);
- ShowPopUp = true;
+ ShowPopup = true;
}
else
{
@@ -292,7 +292,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) if (UnreadMessages == mUnreadMessages && UnreadJunkEmails == mUnreadJunkEmails && !isInitial)
return;
- ShowPopUp &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0));
+ ShowPopup &= mUnreadMessages != 0 || (mUnreadJunkEmails != 0 && !getByte("DisableHotmailJunk", 0));
HANDLE hContact = MSN_HContactFromEmail(MyOptions.szEmail);
if (hContact)
@@ -300,7 +300,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
displayEmailCount(hContact);
- if (ShowPopUp && !getByte("DisableHotmailTray", 1))
+ if (ShowPopup && !getByte("DisableHotmailTray", 1))
{
CLISTEVENT cle = {0};
@@ -321,7 +321,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) SendBroadcast(NULL, ACKTYPE_EMAIL, ACKRESULT_STATUS, NULL, 0);
// Disable to notify receiving hotmail
- if (ShowPopUp && !getByte("DisableHotmail", 0))
+ if (ShowPopup && !getByte("DisableHotmail", 0))
{
SkinPlaySound(mailsoundname);
@@ -342,7 +342,7 @@ void CMsnProto::sttNotificationMessage(char* msgBody, bool isInitial) szUrl);
}
- if (!getByte("RunMailerOnHotmail", 0) || !ShowPopUp || isInitial)
+ if (!getByte("RunMailerOnHotmail", 0) || !ShowPopup || isInitial)
return;
char mailerpath[MAX_PATH];
diff --git a/protocols/MSN/src/msn_misc.cpp b/protocols/MSN/src/msn_misc.cpp index 9e110b8fd0..bf31569fd8 100644 --- a/protocols/MSN/src/msn_misc.cpp +++ b/protocols/MSN/src/msn_misc.cpp @@ -941,7 +941,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara else if (tData->url != NULL)
CallService(MS_UTILS_OPENURL, 1, (LPARAM)tData->url);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case WM_CONTEXTMENU:
@@ -950,7 +950,7 @@ LRESULT CALLBACK NullWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lPara if (hContact)
CallService(MS_CLIST_REMOVEEVENT, (WPARAM)hContact, (LPARAM) 1);
}
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
break;
case UM_FREEPLUGINDATA:
diff --git a/protocols/MSN/src/msn_opts.cpp b/protocols/MSN/src/msn_opts.cpp index 644fddaa6e..37c9ec9db6 100644 --- a/protocols/MSN/src/msn_opts.cpp +++ b/protocols/MSN/src/msn_opts.cpp @@ -474,9 +474,9 @@ static INT_PTR CALLBACK DlgProcMsnConnOpts(HWND hwndDlg, UINT msg, WPARAM wParam }
/////////////////////////////////////////////////////////////////////////////////////////
-// PopUp Options Dialog: style, position, color, font...
+// Popup Options Dialog: style, position, color, font...
-static INT_PTR CALLBACK DlgProcHotmailPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
+static INT_PTR CALLBACK DlgProcHotmailPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
{
static bool bEnabled;
@@ -717,7 +717,7 @@ int CMsnProto::OnOptionsInit(WPARAM wParam,LPARAM lParam) odp.ptszTab = LPGENT("Notifications");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_NOTIFY);
- odp.pfnDlgProc = DlgProcHotmailPopUpOpts;
+ odp.pfnDlgProc = DlgProcHotmailPopupOpts;
Options_AddPage(wParam, &odp);
return 0;
@@ -737,7 +737,7 @@ void CMsnProto::LoadOptions(void) {
memset(&MyOptions, 0, sizeof(MyOptions));
- //PopUp Options
+ //Popup Options
MyOptions.ManageServer = getByte("ManageServer", TRUE) != 0;
MyOptions.ShowErrorsAsPopups = getByte("ShowErrorsAsPopups", TRUE) != 0;
MyOptions.SlowSend = getByte("SlowSend", FALSE) != 0;
diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp index 69c99a37ec..0d171b9b17 100644 --- a/protocols/Skype/src/skype_utils.cpp +++ b/protocols/Skype/src/skype_utils.cpp @@ -368,7 +368,7 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag {
if (::Miranda_Terminated()) return;
- if ( !::ServiceExists(MS_POPUP_ADDPOPUPT) || !::db_get_b(NULL, "PopUp", "ModuleIsEnabled", 1))
+ if ( !::ServiceExists(MS_POPUP_ADDPOPUPT) || !::db_get_b(NULL, "Popup", "ModuleIsEnabled", 1))
::MessageBoxW(NULL, message, caption, MB_OK | flags);
else
{
@@ -381,7 +381,7 @@ void CSkypeProto::ShowNotification(const wchar_t *caption, const wchar_t *messag ::wcsncpy(ppd.lpwzText, message, MAX_SECONDLINE);
ppd.lchIcon = ::Skin_GetIcon("Skype_main");
- PUAddPopUpW(&ppd);
+ PUAddPopupW(&ppd);
}
}
diff --git a/protocols/Tlen/src/jabber_opt.cpp b/protocols/Tlen/src/jabber_opt.cpp index fb0e68de1d..7201c3d2b5 100644 --- a/protocols/Tlen/src/jabber_opt.cpp +++ b/protocols/Tlen/src/jabber_opt.cpp @@ -587,7 +587,7 @@ static void MailPopupPreview(DWORD colorBack, DWORD colorText, char *title, char ppd.colorText = colorText;
ppd.iSeconds = delay;
if ( ServiceExists(MS_POPUP_ADDPOPUP))
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
static INT_PTR CALLBACK TlenPopupsDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/protocols/Tlen/src/jabber_thread.cpp b/protocols/Tlen/src/jabber_thread.cpp index fa3022279a..fbf25a6de8 100644 --- a/protocols/Tlen/src/jabber_thread.cpp +++ b/protocols/Tlen/src/jabber_thread.cpp @@ -1140,7 +1140,7 @@ static void TlenMailPopup(TlenProtocol *proto, char *title, char *emailInfo) ppd.iSeconds = db_get_dw(NULL, proto->m_szModuleName, "MailPopupDelay", 4);
else if (delayMode == 2)
ppd.iSeconds = -1;
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
/*
* Incoming e-mail notification
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 0e39bdf63c..27c46541e3 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -554,7 +554,7 @@ void TwitterProto::ShowContactPopup(HANDLE hContact,const std::string &text) }
mbcs_to_tcs(CP_UTF8,text.c_str(),popup.lptzText,MAX_SECONDLINE);
- PUAddPopUpT(&popup);
+ PUAddPopupT(&popup);
}
void TwitterProto::UpdateStatuses(bool pre_read, bool popups, bool tweetToMsg)
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index deeb0f88c7..105210bf4d 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -337,7 +337,7 @@ int TwitterProto::OnOptionsInit(WPARAM wParam,LPARAM) if(ServiceExists(MS_POPUP_ADDPOPUPT))
{
- odp.ptszTab = LPGENT("PopUps");
+ odp.ptszTab = LPGENT("Popups");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS_POPUPS);
odp.pfnDlgProc = popup_options_proc;
Options_AddPage(wParam, &odp);
@@ -433,7 +433,7 @@ void TwitterProto::ShowPopup(const wchar_t *text, int Error) }
if(ServiceExists(MS_POPUP_ADDPOPUPT))
- PUAddPopUpT(&popup);
+ PUAddPopupT(&popup);
else
MessageBox(0,popup.lptzText,popup.lptzContactName,0);
}
@@ -450,7 +450,7 @@ void TwitterProto::ShowPopup(const char *text, int Error) }
if(ServiceExists(MS_POPUP_ADDPOPUPT))
- PUAddPopUpT(&popup);
+ PUAddPopupT(&popup);
else
MessageBox(0,popup.lptzText,popup.lptzContactName,0);
}
diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index eb0a8b2543..4843d8c6e0 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -406,7 +406,7 @@ namespace popup_options popup.colorText = get_text_color(hwndDlg,false);
popup.colorBack = get_back_color(hwndDlg,false);
- PUAddPopUpT(&popup);
+ PUAddPopupT(&popup);
}
}
diff --git a/protocols/WinPopup/src/messagebox.cpp b/protocols/WinPopup/src/messagebox.cpp index eb99d07d74..80ddd5471a 100644 --- a/protocols/WinPopup/src/messagebox.cpp +++ b/protocols/WinPopup/src/messagebox.cpp @@ -183,7 +183,7 @@ void GetErrorMessage (DWORD dwLastError, CString &msg) static void PopupOrMessageBox (LPPOPUPDATAT ppdp)
{
- if (CALLSERVICE_NOTFOUND == PUAddPopUpT (ppdp))
+ if (CALLSERVICE_NOTFOUND == PUAddPopupT (ppdp))
{
MSGBOXPARAMS mbp = { 0 };
mbp.cbSize = sizeof (MSGBOXPARAMS);
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp index a0b336ffd6..06c431353f 100644 --- a/protocols/Xfire/src/main.cpp +++ b/protocols/Xfire/src/main.cpp @@ -2537,13 +2537,13 @@ void gamedetectiont(LPVOID lparam) if(disabledpopups)
if(db_get_b(NULL,protocolname,"nopopups",0))
{
- if(ServiceExists("PopUp/EnableDisableMenuCommand"))
+ if(ServiceExists("Popup/EnableDisableMenuCommand"))
{
- CallService("PopUp/EnableDisableMenuCommand",NULL,NULL);
+ CallService("Popup/EnableDisableMenuCommand",NULL,NULL);
}
- else if(ServiceExists("PopUp/ToggleEnabled"))
+ else if(ServiceExists("Popup/ToggleEnabled"))
{
- CallService("PopUp/ToggleEnabled",NULL,NULL);
+ CallService("Popup/ToggleEnabled",NULL,NULL);
}
disabledpopups=FALSE;
}
@@ -2677,15 +2677,15 @@ void gamedetectiont(LPVOID lparam) //popup abschalten, menuservice funk aufrufen
if(db_get_b(NULL,protocolname,"nopopups",0))
{
- if(ServiceExists("PopUp/EnableDisableMenuCommand")&&db_get_b(NULL,"PopUp","ModuleIsEnabled",0)==1) /**/
+ if(ServiceExists("Popup/EnableDisableMenuCommand")&&db_get_b(NULL,"Popup","ModuleIsEnabled",0)==1) /**/
{
disabledpopups=TRUE;
- CallService("PopUp/EnableDisableMenuCommand",NULL,NULL);
+ CallService("Popup/EnableDisableMenuCommand",NULL,NULL);
}
- else if(ServiceExists("PopUp/ToggleEnabled")&&db_get_b(NULL,"YAPP","Enabled",0)==1)
+ else if(ServiceExists("Popup/ToggleEnabled")&&db_get_b(NULL,"YAPP","Enabled",0)==1)
{
disabledpopups=TRUE;
- CallService("PopUp/ToggleEnabled",NULL,NULL);
+ CallService("Popup/ToggleEnabled",NULL,NULL);
}
}
//sound abschalten
diff --git a/protocols/Xfire/src/tools.cpp b/protocols/Xfire/src/tools.cpp index 9dff6e4d61..77f63ac661 100644 --- a/protocols/Xfire/src/tools.cpp +++ b/protocols/Xfire/src/tools.cpp @@ -119,7 +119,7 @@ int displayPopup(HWND hWnd, LPCSTR lpText, LPCSTR lpCaption, UINT uType,HICON hi ppd.colorText = RGB(0,0,0);
}
- PUAddPopUp(&ppd);
+ PUAddPopup(&ppd);
}
return IDOK;
diff --git a/protocols/Yahoo/src/options.h b/protocols/Yahoo/src/options.h index d707509ec8..8916ee2ed4 100644 --- a/protocols/Yahoo/src/options.h +++ b/protocols/Yahoo/src/options.h @@ -16,7 +16,7 @@ BOOL CALLBACK DlgProcYahooOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK DlgProcYahooOptsConn(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK DlgProcYahooOptsIgnore(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); -//BOOL CALLBACK DlgProcYahooPopUpOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +//BOOL CALLBACK DlgProcYahooPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); int YahooOptInit(WPARAM wParam,LPARAM lParam); #endif
diff --git a/protocols/Yahoo/src/util.cpp b/protocols/Yahoo/src/util.cpp index 0a02e6b498..a022d3e598 100644 --- a/protocols/Yahoo/src/util.cpp +++ b/protocols/Yahoo/src/util.cpp @@ -206,14 +206,14 @@ static LRESULT CALLBACK PopupWindowProc( HWND hWnd, UINT message, WPARAM wParam, if (szURL != NULL)
CallService(MS_UTILS_OPENURL, TRUE, (LPARAM)szURL);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return 0;
}
break;
case WM_CONTEXTMENU:
DebugLog("[PopupWindowProc] WM_CONTEXTMENU");
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
case UM_FREEPLUGINDATA:
@@ -248,7 +248,7 @@ int CYahooProto::ShowPopup(const TCHAR* nickname, const TCHAR* msg, const char * DebugLog("[MS_POPUP_ADDPOPUP] Generating a popup for [%S] %S", nickname, msg);
- PUAddPopUpT(&ppd);
+ PUAddPopupT(&ppd);
return 1;
}
diff --git a/src/core/stdchat/src/chat.h b/src/core/stdchat/src/chat.h index 739f835f85..ea4debd0a4 100644 --- a/src/core/stdchat/src/chat.h +++ b/src/core/stdchat/src/chat.h @@ -340,7 +340,7 @@ struct GlobalLogSettings_t { BOOL LogIndentEnabled;
BOOL StripFormat;
BOOL SoundsFocus;
- BOOL PopUpInactiveOnly;
+ BOOL PopupInactiveOnly;
BOOL TrayIconInactiveOnly;
BOOL AddColonToAutoComplete;
BOOL TabsEnable;
diff --git a/src/core/stdchat/src/main.cpp b/src/core/stdchat/src/main.cpp index d3a8c58007..b2985d4098 100644 --- a/src/core/stdchat/src/main.cpp +++ b/src/core/stdchat/src/main.cpp @@ -31,7 +31,7 @@ HICON hIcons[30]; BOOL IEviewInstalled = FALSE;
HBRUSH hListBkgBrush = NULL;
BOOL SmileyAddInstalled = FALSE;
-BOOL PopUpInstalled = FALSE;
+BOOL PopupInstalled = FALSE;
HBRUSH hEditBkgBrush = NULL;
HBRUSH hListSelectedBkgBrush = NULL;
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp index c0107ea3b5..130a1120a7 100644 --- a/src/core/stdchat/src/options.cpp +++ b/src/core/stdchat/src/options.cpp @@ -28,7 +28,7 @@ extern HBRUSH hListBkgBrush; extern HBRUSH hListSelectedBkgBrush;
extern HICON hIcons[30];
extern FONTINFO aFonts[OPTIONS_FONTCOUNT];
-extern BOOL PopUpInstalled;
+extern BOOL PopupInstalled;
extern SESSION_INFO g_TabSession;
HANDLE g_hOptions = NULL;
@@ -166,19 +166,19 @@ static const struct branch_t branch5[] = { };
static const struct branch_t branch6[] = {
- { LPGENT("Show pop-ups only when the chat room is not active"), "PopUpInactiveOnly", 0, 1},
- { LPGENT("Show pop-up for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0},
- { LPGENT("Show pop-up for users joining"), "PopupFlags", GC_EVENT_JOIN, 0},
- { LPGENT("Show pop-up for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0},
- { LPGENT("Show pop-up for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0},
- { LPGENT("Show pop-up for actions"), "PopupFlags", GC_EVENT_ACTION, 0},
- { LPGENT("Show pop-up for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0},
- { LPGENT("Show pop-up for users leaving"), "PopupFlags", GC_EVENT_PART, 0},
- { LPGENT("Show pop-up for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0},
- { LPGENT("Show pop-up for notices "), "PopupFlags", GC_EVENT_NOTICE, 0},
- { LPGENT("Show pop-up for name changes"), "PopupFlags", GC_EVENT_NICK, 0},
- { LPGENT("Show pop-up for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0},
- { LPGENT("Show pop-up for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0},
+ { LPGENT("Show Popups only when the chat room is not active"), "PopupInactiveOnly", 0, 1},
+ { LPGENT("Show Popup for topic changes"), "PopupFlags", GC_EVENT_TOPIC, 0},
+ { LPGENT("Show Popup for users joining"), "PopupFlags", GC_EVENT_JOIN, 0},
+ { LPGENT("Show Popup for users disconnecting"), "PopupFlags", GC_EVENT_QUIT, 0},
+ { LPGENT("Show Popup for messages"), "PopupFlags", GC_EVENT_MESSAGE, 0},
+ { LPGENT("Show Popup for actions"), "PopupFlags", GC_EVENT_ACTION, 0},
+ { LPGENT("Show Popup for highlights"), "PopupFlags", GC_EVENT_HIGHLIGHT, 0},
+ { LPGENT("Show Popup for users leaving"), "PopupFlags", GC_EVENT_PART, 0},
+ { LPGENT("Show Popup for users kicking other user"), "PopupFlags", GC_EVENT_KICK, 0},
+ { LPGENT("Show Popup for notices "), "PopupFlags", GC_EVENT_NOTICE, 0},
+ { LPGENT("Show Popup for name changes"), "PopupFlags", GC_EVENT_NICK, 0},
+ { LPGENT("Show Popup for information messages"), "PopupFlags", GC_EVENT_INFORMATION, 0},
+ { LPGENT("Show Popup for status changes"), "PopupFlags", GC_EVENT_ADDSTATUS, 0},
};
HTREEITEM hItemB0[SIZEOF(branch0)];
@@ -515,8 +515,8 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA hListHeading3 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), LPGEN("Default events to show in new chat rooms if the \'event filter\' is enabled"), db_get_b(NULL, "Chat", "Branch3Exp", 0)?TRUE:FALSE);
hListHeading4 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), LPGEN("Icons to display in the message log"), db_get_b(NULL, "Chat", "Branch4Exp", 0)?TRUE:FALSE);
hListHeading5 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), LPGEN("Icons to display in the tray"), db_get_b(NULL, "Chat", "Branch5Exp", 0)?TRUE:FALSE);
- if (PopUpInstalled)
- hListHeading6 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), LPGEN("Pop-ups to display"), db_get_b(NULL, "Chat", "Branch6Exp", 0)?TRUE:FALSE);
+ if (PopupInstalled)
+ hListHeading6 = InsertBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), LPGEN("Popups to display"), db_get_b(NULL, "Chat", "Branch6Exp", 0)?TRUE:FALSE);
FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading0, branch0, hItemB0, SIZEOF(branch0), 0);
FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading1, branch1, hItemB1, SIZEOF(branch1), 0);
FillBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading2, branch2, hItemB2, SIZEOF(branch2), 0);
@@ -592,14 +592,14 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA SaveBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), branch3, hItemB3, SIZEOF(branch3));
SaveBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), branch4, hItemB4, SIZEOF(branch4));
SaveBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), branch5, hItemB5, SIZEOF(branch5));
- if (PopUpInstalled)
+ if (PopupInstalled)
SaveBranch(GetDlgItem(hwndDlg, IDC_CHECKBOXES), branch6, hItemB6, SIZEOF(branch6));
g_Settings.dwIconFlags = db_get_dw(NULL, "Chat", "IconFlags", 0x0000);
g_Settings.dwTrayIconFlags = db_get_dw(NULL, "Chat", "TrayIconFlags", 0x1000);
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;
if (b != db_get_b(NULL, "Chat", "Tabs", 1)) {
@@ -626,7 +626,7 @@ static INT_PTR CALLBACK DlgProcOptions1(HWND hwndDlg,UINT uMsg,WPARAM wParam,LPA db_set_b(NULL, "Chat", "Branch5Exp", b);
b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading0, TVIS_EXPANDED)&TVIS_EXPANDED?1:0;
db_set_b(NULL, "Chat", "Branch0Exp", b);
- if (PopUpInstalled) {
+ if (PopupInstalled) {
b = TreeView_GetItemState(GetDlgItem(hwndDlg, IDC_CHECKBOXES), hListHeading6, TVIS_EXPANDED)&TVIS_EXPANDED?1:0;
db_set_b(NULL, "Chat", "Branch6Exp", b);
} }
@@ -922,7 +922,7 @@ static int OptionsInitialize(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcOptions2;
Options_AddPage(wParam, &odp);
- if (PopUpInstalled) {
+ if (PopupInstalled) {
odp.position = 910000002;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONSPOPUP);
odp.pszTitle = LPGEN("Chat");
@@ -962,7 +962,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/src/core/stdchat/src/services.cpp b/src/core/stdchat/src/services.cpp index a57293814c..04d749ad2b 100644 --- a/src/core/stdchat/src/services.cpp +++ b/src/core/stdchat/src/services.cpp @@ -27,7 +27,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HICON hIcons[30];
extern HIMAGELIST hImageList, hIconsList;
extern BOOL SmileyAddInstalled;
-extern BOOL PopUpInstalled;
+extern BOOL PopupInstalled;
extern BOOL IEviewInstalled;
HANDLE hSendEvent;
@@ -743,7 +743,7 @@ static INT_PTR Service_GetAddEventPtr(WPARAM wParam, LPARAM lParam) static int ModuleLoad(WPARAM wParam, LPARAM lParam)
{
- PopUpInstalled = ServiceExists(MS_POPUP_ADDPOPUP);
+ PopupInstalled = ServiceExists(MS_POPUP_ADDPOPUP);
return 0;
}
diff --git a/src/core/stdchat/src/tools.cpp b/src/core/stdchat/src/tools.cpp index 45ef0ed99a..6da05002a0 100644 --- a/src/core/stdchat/src/tools.cpp +++ b/src/core/stdchat/src/tools.cpp @@ -102,7 +102,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA CallFunctionAsync(ShowRoomFromPopup, si);
- PUDeletePopUp(hWnd);
+ PUDeletePopup(hWnd);
return TRUE;
}
break;
@@ -116,7 +116,7 @@ static INT_PTR CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA if (si->hWnd && KillTimer(si->hWnd, TIMERID_FLASHWND))
FlashWindow(si->hWnd, FALSE);
- PUDeletePopUp( hWnd );
+ PUDeletePopup( hWnd );
}
break;
}
@@ -163,7 +163,7 @@ static int ShowPopup (HANDLE hContact, SESSION_INFO* si, HICON hIcon, char* psz pd.PluginWindowProc = (WNDPROC)PopupDlgProc;
pd.PluginData = si;
- return PUAddPopUpT(&pd);
+ return PUAddPopupT(&pd);
}
static BOOL DoTrayIcon(SESSION_INFO* si, GCEVENT * gce)
@@ -305,7 +305,7 @@ BOOL DoSoundsFlashPopupTrayStuff(SESSION_INFO* si, GCEVENT * gce, BOOL bHighligh db_unset(si->hContact, "CList", "Hidden");
if (bInactive)
DoTrayIcon(si, gce);
- if (bInactive || !g_Settings.PopUpInactiveOnly)
+ if (bInactive || !g_Settings.PopupInactiveOnly)
DoPopup(si, gce);
if (g_Settings.TabsEnable && bInactive && g_TabSession.hWnd)
SendMessage(g_TabSession.hWnd, GC_SETMESSAGEHIGHLIGHT, 0, (LPARAM) si);
@@ -319,7 +319,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
|