summaryrefslogtreecommitdiff
path: root/plugins/BuddyExpectator/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/BuddyExpectator/src')
-rw-r--r--plugins/BuddyExpectator/src/BuddyExpectator.cpp60
-rw-r--r--plugins/BuddyExpectator/src/options.cpp78
-rw-r--r--plugins/BuddyExpectator/src/options.h10
3 files changed, 74 insertions, 74 deletions
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;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 06:24:18 +0000