From a8a50f49bfb48bb3e4115e0d63f5c6ac8c095bf1 Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 29 Jun 2013 12:26:30 +0000 Subject: option for ignoring empty status messages now used for xstatuses option checkbox moved to main popup page in nxsn git-svn-id: http://svn.miranda-ng.org/main/trunk@5178 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- .../NewXstatusNotify/NewXstatusNotify_10.vcxproj | 13 +++ .../NewXstatusNotify_10.vcxproj.filters | 38 +++++++ .../NewXstatusNotify/NewXstatusNotify_11.vcxproj | 13 +++ .../NewXstatusNotify_11.vcxproj.filters | 38 +++++++ plugins/NewXstatusNotify/res/resource.rc | 125 ++++++++++----------- plugins/NewXstatusNotify/src/options.cpp | 8 +- plugins/NewXstatusNotify/src/version.h | 4 +- plugins/NewXstatusNotify/src/xstatus.cpp | 11 +- 8 files changed, 175 insertions(+), 75 deletions(-) diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj index 2cf457dfb5..dbe5104c4a 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj +++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj @@ -211,6 +211,19 @@ + + + + + + + + + + + + + diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters index d749cdba0e..eace4f77c5 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters +++ b/plugins/NewXstatusNotify/NewXstatusNotify_10.vcxproj.filters @@ -13,6 +13,9 @@ {4ce36c6f-321c-49f3-aeb5-00c9b133ff56} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + {e48a5e83-2b80-4f20-8ff3-ac3e450573d6} + @@ -71,4 +74,39 @@ Resource Files + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + \ No newline at end of file diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj index 2c8708f5de..59420afdb3 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj +++ b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj @@ -214,6 +214,19 @@ + + + + + + + + + + + + + diff --git a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters index d749cdba0e..eace4f77c5 100644 --- a/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters +++ b/plugins/NewXstatusNotify/NewXstatusNotify_11.vcxproj.filters @@ -13,6 +13,9 @@ {4ce36c6f-321c-49f3-aeb5-00c9b133ff56} ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe + + {e48a5e83-2b80-4f20-8ff3-ac3e450573d6} + @@ -71,4 +74,39 @@ Resource Files + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + + Resource Files\Icons + + \ No newline at end of file diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index f37dc07d72..ddbc8db248 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -49,11 +49,6 @@ BEGIN IDD_OPT_POPUP, DIALOG BEGIN - RIGHTMARGIN, 308 - VERTGUIDE, 6 - VERTGUIDE, 163 - VERTGUIDE, 288 - BOTTOMMARGIN, 142 END IDD_OPT_XPOPUP, DIALOG @@ -175,69 +170,71 @@ BEGIN ICON IDI_ENABLEALL,IDC_ENABLEALLICON,211,210,16,16,SS_CENTERIMAGE END -IDD_OPT_POPUP DIALOGEX 0, 0, 309, 230 +IDD_OPT_POPUP DIALOGEX 0, 0, 309, 233 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 0, 0, 0x1 BEGIN - CTEXT "Background",IDC_STATIC,63,11,44,8 - CTEXT "Text",IDC_STATIC,106,11,24,8 - CONTROL "",IDC_OFFLINE_BG,"ColourPicker",WS_TABSTOP,72,22,24,12 - CONTROL "",IDC_OFFLINE_TX,"ColourPicker",WS_TABSTOP,105,22,24,12 - CONTROL "",IDC_ONLINE_BG,"ColourPicker",WS_TABSTOP,72,38,24,12 - CONTROL "",IDC_ONLINE_TX,"ColourPicker",WS_TABSTOP,105,38,24,12 - CONTROL "",IDC_AWAY_BG,"ColourPicker",WS_TABSTOP,72,54,24,12 - CONTROL "",IDC_AWAY_TX,"ColourPicker",WS_TABSTOP,105,54,24,12 - CONTROL "",IDC_NA_BG,"ColourPicker",WS_TABSTOP,72,70,24,12 - CONTROL "",IDC_NA_TX,"ColourPicker",WS_TABSTOP,105,70,24,12 - CONTROL "",IDC_OCCUPIED_BG,"ColourPicker",WS_TABSTOP,72,86,24,12 - CONTROL "",IDC_OCCUPIED_TX,"ColourPicker",WS_TABSTOP,105,86,24,12 - CONTROL "",IDC_DND_BG,"ColourPicker",WS_TABSTOP,72,102,24,12 - CONTROL "",IDC_DND_TX,"ColourPicker",WS_TABSTOP,105,102,24,12 - CONTROL "",IDC_FREEFORCHAT_BG,"ColourPicker",WS_TABSTOP,72,118,24,12 - CONTROL "",IDC_FREEFORCHAT_TX,"ColourPicker",WS_TABSTOP,105,118,24,12 - CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,72,134,24,12 - CONTROL "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,105,134,24,12 - CONTROL "",IDC_OUTTOLUNCH_BG,"ColourPicker",WS_TABSTOP,72,150,24,12 - CONTROL "",IDC_OUTTOLUNCH_TX,"ColourPicker",WS_TABSTOP,105,150,24,12 - CONTROL "",IDC_ONTHEPHONE_BG,"ColourPicker",WS_TABSTOP,72,166,24,12 - CONTROL "",IDC_ONTHEPHONE_TX,"ColourPicker",WS_TABSTOP,105,166,24,12 + CTEXT "Background",IDC_STATIC,64,11,44,8 + CTEXT "Text",IDC_STATIC,107,11,24,8 + CONTROL "",IDC_OFFLINE_BG,"ColourPicker",WS_TABSTOP,73,22,24,12 + CONTROL "",IDC_OFFLINE_TX,"ColourPicker",WS_TABSTOP,106,22,24,12 + CONTROL "",IDC_ONLINE_BG,"ColourPicker",WS_TABSTOP,73,38,24,12 + CONTROL "",IDC_ONLINE_TX,"ColourPicker",WS_TABSTOP,106,38,24,12 + CONTROL "",IDC_AWAY_BG,"ColourPicker",WS_TABSTOP,73,54,24,12 + CONTROL "",IDC_AWAY_TX,"ColourPicker",WS_TABSTOP,106,54,24,12 + CONTROL "",IDC_NA_BG,"ColourPicker",WS_TABSTOP,73,70,24,12 + CONTROL "",IDC_NA_TX,"ColourPicker",WS_TABSTOP,106,70,24,12 + CONTROL "",IDC_OCCUPIED_BG,"ColourPicker",WS_TABSTOP,73,86,24,12 + CONTROL "",IDC_OCCUPIED_TX,"ColourPicker",WS_TABSTOP,106,86,24,12 + CONTROL "",IDC_DND_BG,"ColourPicker",WS_TABSTOP,73,102,24,12 + CONTROL "",IDC_DND_TX,"ColourPicker",WS_TABSTOP,106,102,24,12 + CONTROL "",IDC_FREEFORCHAT_BG,"ColourPicker",WS_TABSTOP,73,118,24,12 + CONTROL "",IDC_FREEFORCHAT_TX,"ColourPicker",WS_TABSTOP,106,118,24,12 + CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,134,24,12 + CONTROL "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,134,24,12 + CONTROL "",IDC_OUTTOLUNCH_BG,"ColourPicker",WS_TABSTOP,73,150,24,12 + CONTROL "",IDC_OUTTOLUNCH_TX,"ColourPicker",WS_TABSTOP,106,150,24,12 + CONTROL "",IDC_ONTHEPHONE_BG,"ColourPicker",WS_TABSTOP,73,166,24,12 + CONTROL "",IDC_ONTHEPHONE_TX,"ColourPicker",WS_TABSTOP,106,166,24,12 GROUPBOX "Colours",IDC_STATIC,143,0,164,44,WS_GROUP - CONTROL "Use custom colours",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,8,151,13 - CONTROL "Use Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,30,151,13 - CONTROL "Use Popup colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,19,151,13 - GROUPBOX "Popup text",IDC_STATIC,144,46,164,76,WS_GROUP - CONTROL "Read status message",IDC_READAWAYMSG,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,151,104,151,13 - CONTROL "Show previous status too",IDC_SHOWPREVIOUSSTATUS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,151,92,151,13 - GROUPBOX "Timeout",IDC_STATIC,144,124,164,35 - EDITTEXT IDC_TIMEOUT_VALUE,160,138,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER - CONTROL "",IDC_TIMEOUT_VALUE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,181,138,11,12 + CONTROL "Use custom colours",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,8,151,13 + CONTROL "Use Windows colours",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,30,151,13 + CONTROL "Use Popup colours",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,149,19,151,13 + GROUPBOX "Popup text",IDC_STATIC,144,44,164,85,WS_GROUP + CONTROL "Read status message",IDC_READAWAYMSG,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,148,102,151,13 + CONTROL "Show previous status too",IDC_SHOWPREVIOUSSTATUS,"Button",BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,148,90,151,13 + GROUPBOX "Timeout",IDC_STATIC,143,129,164,35 + EDITTEXT IDC_TIMEOUT_VALUE,159,143,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER + CONTROL "",IDC_TIMEOUT_VALUE_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS | UDS_NOTHOUSANDS,180,143,11,12 PUSHBUTTON "Preview",IDC_PREVIEW,43,206,57,15 - GROUPBOX "Popups on contact status change to:",IDC_STATIC,0,0,138,200,WS_GROUP - GROUPBOX "Click action",IDC_STATIC,144,160,164,67,WS_GROUP - CONTROL "Show contact group name",IDC_SHOWGROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,58,151,9 - CONTROL "Use alternative descriptions",IDC_SHOWALTDESCS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,80,151,13 - CTEXT "0 = Default",IDC_STATUS_STATIC_DEFAULT,225,135,76,8 - CTEXT "-1 = Infinite",IDC_STATUS_STATIC_INFINITE,223,145,76,8 - LTEXT "Sec",IDC_STATUS_STATIC_SEC,197,140,21,8 - COMBOBOX IDC_STATUS_LC,151,182,150,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_STATUS_RC,151,209,150,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "On left click",IDC_STATIC,153,171,151,8 - LTEXT "On right click",IDC_STATIC,153,198,151,8 - CONTROL "",IDC_XSTATUS_TX,"ColourPicker",WS_TABSTOP,105,182,24,12 - CONTROL "",IDC_XSTATUS_BG,"ColourPicker",WS_TABSTOP,72,182,24,12 - LTEXT "Offline",IDC_STATIC,5,24,56,8 - LTEXT "Online",IDC_STATIC,5,40,56,8 - LTEXT "Away",IDC_STATIC,5,56,56,8 - LTEXT "NA",IDC_STATIC,5,72,56,8 - LTEXT "Occupied",IDC_STATIC,5,88,56,8 - LTEXT "DND",IDC_STATIC,5,104,56,8 - LTEXT "Free for chat",IDC_STATIC,5,120,56,8 - LTEXT "Invisible",IDC_STATIC,5,136,56,8 - LTEXT "Out to lunch",IDC_STATIC,5,152,56,8 - LTEXT "On the phone",IDC_STATIC,5,168,56,8 - LTEXT "Extra status",IDC_STATIC,5,184,56,8 - CONTROL "Show status description",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,68,151,13 + GROUPBOX "Popups when status changes to:",IDC_STATIC,1,0,138,200,WS_GROUP + GROUPBOX "Click action",IDC_STATIC,143,164,164,67,WS_GROUP + CONTROL "Show contact group name",IDC_SHOWGROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,56,151,9 + CONTROL "Use alternative descriptions",IDC_SHOWALTDESCS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,78,151,13 + CTEXT "0 = Default",IDC_STATUS_STATIC_DEFAULT,224,140,76,8 + CTEXT "-1 = Infinite",IDC_STATUS_STATIC_INFINITE,222,150,76,8 + LTEXT "Sec",IDC_STATUS_STATIC_SEC,196,144,21,8 + COMBOBOX IDC_STATUS_LC,150,185,150,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + COMBOBOX IDC_STATUS_RC,150,212,150,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "On left click",IDC_STATIC,152,174,151,8 + LTEXT "On right click",IDC_STATIC,152,201,151,8 + CONTROL "",IDC_XSTATUS_TX,"ColourPicker",WS_TABSTOP,106,182,24,12 + CONTROL "",IDC_XSTATUS_BG,"ColourPicker",WS_TABSTOP,73,182,24,12 + LTEXT "Offline",IDC_STATIC,6,24,56,8 + LTEXT "Online",IDC_STATIC,6,40,56,8 + LTEXT "Away",IDC_STATIC,6,56,56,8 + LTEXT "NA",IDC_STATIC,6,72,56,8 + LTEXT "Occupied",IDC_STATIC,6,88,56,8 + LTEXT "DND",IDC_STATIC,6,104,56,8 + LTEXT "Free for chat",IDC_STATIC,6,120,56,8 + LTEXT "Invisible",IDC_STATIC,6,136,56,8 + LTEXT "Out to lunch",IDC_STATIC,6,152,56,8 + LTEXT "On the phone",IDC_STATIC,6,168,56,8 + LTEXT "Extra status",IDC_STATIC,6,184,56,8 + CONTROL "Show status description",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,66,151,13 + CONTROL "Ignore empty status and xStatus messages",IDC_PUIGNOREREMOVE, + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,117,152,8 END IDD_OPT_XPOPUP DIALOGEX 0, 0, 305, 230 @@ -334,9 +331,8 @@ IDD_OPT_SMPOPUP DIALOGEX 0, 0, 305, 226 STYLE DS_SETFONT | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CONTROL | DS_CENTER | WS_CHILD FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "General",IDC_STATIC,7,0,289,39 + GROUPBOX "General",IDC_STATIC,7,0,289,27 CONTROL "Show Popups when I connect",IDC_ONCONNECT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,11,274,8 - CONTROL "Ignore empty status messages",IDC_PUIGNOREREMOVE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,25,274,8 GROUPBOX "Protocols",IDC_STATIC,7,41,289,124 CTEXT "Enable/Disable protocols which you don't wish to be notified for:",IDC_STATIC,14,52,274,10 CONTROL "",IDC_PROTOCOLLIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,51,66,201,90 @@ -366,7 +362,6 @@ IDI_ENABLEALL ICON "enable_all.ico" IDI_VARIABLES ICON "variables.ico" IDI_STATUS_MESSAGE ICON "status_message.ico" - #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 8399ce547b..7486715434 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -57,6 +57,7 @@ void LoadOptions() opt.PopupTimeout = db_get_dw(0, MODULE, "PopupTimeout", 0); opt.LeftClickAction= db_get_b(0, MODULE, "LeftClickAction", 5); opt.RightClickAction = db_get_b(0, MODULE, "RightClickAction", 1); + opt.IgnoreEmpty = db_get_b(0, MODULE, "IgnoreEmpty", 1); // IDD_OPT_XPOPUP opt.PDisableForMusic = db_get_b(0, MODULE, "PDisableForMusic", 1); opt.PTruncateMsg = db_get_b(0, MODULE, "PTruncateMsg", 0); @@ -82,7 +83,6 @@ void LoadOptions() opt.LTruncateMsg = db_get_b(0, MODULE, "LTruncateMsg", 0); opt.LMsgLen = db_get_dw(0, MODULE, "LMsgLen", 128); //IDD_OPT_SMPOPUP - opt.IgnoreEmpty = db_get_b(0, MODULE, "IgnoreEmpty", 1); opt.PopupOnConnect = db_get_b(0, MODULE, "PopupOnConnect", 0); // OTHER opt.TempDisabled = db_get_b(0, MODULE, "TempDisable", 0); @@ -127,6 +127,7 @@ void SaveOptions() db_set_dw(0, MODULE, "PopupTimeout", opt.PopupTimeout); db_set_b(0, MODULE, "LeftClickAction", opt.LeftClickAction); db_set_b(0, MODULE, "RightClickAction", opt.RightClickAction); + db_set_b(0, MODULE, "IgnoreEmpty", opt.IgnoreEmpty); // IDD_OPT_XPOPUP db_set_b(0, MODULE, "PDisableForMusic", opt.PDisableForMusic); db_set_b(0, MODULE, "PTruncateMsg", opt.PTruncateMsg); @@ -152,7 +153,6 @@ void SaveOptions() db_set_b(0, MODULE, "LTruncateMsg", opt.LTruncateMsg); db_set_dw(0, MODULE, "LMsgLen", opt.LMsgLen); //IDD_OPT_SMPOPUP - db_set_b(0, MODULE, "IgnoreEmpty", opt.IgnoreEmpty); db_set_b(0, MODULE, "PopupOnConnect", opt.PopupOnConnect); } @@ -312,6 +312,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM CheckDlgButton(hwndDlg, IDC_READAWAYMSG, opt.ReadAwayMsg); CheckDlgButton(hwndDlg, IDC_SHOWPREVIOUSSTATUS, opt.ShowPreviousStatus); CheckDlgButton(hwndDlg, IDC_SHOWGROUP, opt.ShowGroup); + CheckDlgButton(hwndDlg, IDC_PUIGNOREREMOVE, opt.IgnoreEmpty); SendDlgItemMessage(hwndDlg, IDC_TIMEOUT_VALUE, EM_LIMITTEXT, 3, 0); SendDlgItemMessage(hwndDlg, IDC_TIMEOUT_VALUE_SPIN, UDM_SETRANGE32, -1, 999); @@ -465,6 +466,7 @@ INT_PTR CALLBACK DlgProcPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM opt.PopupTimeout = GetDlgItemInt(hwndDlg, IDC_TIMEOUT_VALUE, 0, TRUE); opt.LeftClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_LC, CB_GETCURSEL, 0, 0); opt.RightClickAction = (BYTE)SendDlgItemMessage(hwndDlg, IDC_STATUS_RC, CB_GETCURSEL, 0, 0); + opt.IgnoreEmpty = IsDlgButtonChecked(hwndDlg, IDC_PUIGNOREREMOVE); SaveOptions(); return TRUE; @@ -704,7 +706,6 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA TranslateDialogDefault(hwndDlg); { CheckDlgButton(hwndDlg, IDC_ONCONNECT, opt.PopupOnConnect); - CheckDlgButton(hwndDlg, IDC_PUIGNOREREMOVE, opt.IgnoreEmpty); // Buttons SendDlgItemMessage(hwndDlg, IDC_BT_VARIABLES, BUTTONADDTOOLTIP, (WPARAM)TranslateT("Show available variables"), BATF_TCHAR); @@ -828,7 +829,6 @@ INT_PTR CALLBACK DlgProcSMPopupOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } if (((LPNMHDR)lParam)->code == PSN_APPLY ) { - opt.IgnoreEmpty = IsDlgButtonChecked(hwndDlg, IDC_PUIGNOREREMOVE); opt.PopupOnConnect = IsDlgButtonChecked(hwndDlg, IDC_ONCONNECT); // Templates diff --git a/plugins/NewXstatusNotify/src/version.h b/plugins/NewXstatusNotify/src/version.h index ffce1df914..c829851b4e 100644 --- a/plugins/NewXstatusNotify/src/version.h +++ b/plugins/NewXstatusNotify/src/version.h @@ -5,9 +5,9 @@ #define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM -#define __PLUGIN_NAME "xStatus Notify" +#define __PLUGIN_NAME "xStatus notify" #define __FILENAME "NewXstatusNotify.dll" -#define __DESCRIPTION "Notifies you when a contact changes his/her (X)status or status message." +#define __DESCRIPTION "Notifies you when a contact changes his/her (X)status or status message." #define __AUTHOR "Luca Santarelli, Vasilich, yaho" #define __AUTHOREMAIL "yaho@miranda-easy.net" #define __AUTHORWEB "http://miranda-ng.org/" diff --git a/plugins/NewXstatusNotify/src/xstatus.cpp b/plugins/NewXstatusNotify/src/xstatus.cpp index ea0acee828..6632802340 100644 --- a/plugins/NewXstatusNotify/src/xstatus.cpp +++ b/plugins/NewXstatusNotify/src/xstatus.cpp @@ -310,10 +310,13 @@ void ExtraStatusChanged(XSTATUSCHANGE *xsc) wsprintfA(buff, "%d", ID_STATUS_EXTRASTATUS); if (( db_get_b(0, MODULE, buff, 1) == 0) - || (db_get_w(xsc->hContact, xsc->szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) - || (!opt.HiddenContactsToo && db_get_b(xsc->hContact, "CList", "Hidden", 0)) - || (opt.TempDisabled)) - return; + || (db_get_w(xsc->hContact, xsc->szProto, "Status", ID_STATUS_OFFLINE) == ID_STATUS_OFFLINE) + || (!opt.HiddenContactsToo && db_get_b(xsc->hContact, "CList", "Hidden", 0)) + || (opt.TempDisabled) + || (opt.IgnoreEmpty && (xsc->stzTitle == NULL || xsc->stzTitle[0] == '\0') && (xsc->stzText == NULL || xsc->stzText[0] == '\0'))) { + FreeXSC(xsc); + return; + } char statusIDs[12], statusIDp[12]; if (opt.AutoDisable) { -- cgit v1.2.3