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 --- plugins/NewXstatusNotify/src/options.cpp | 8 ++++---- plugins/NewXstatusNotify/src/version.h | 4 ++-- plugins/NewXstatusNotify/src/xstatus.cpp | 11 +++++++---- 3 files changed, 13 insertions(+), 10 deletions(-) (limited to 'plugins/NewXstatusNotify/src') 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