From 88d56b4791202034588ff5b10d9c05fff3019934 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 4 Jun 2019 12:42:13 +0300 Subject: finally fixes #1963 (Remove Free for Chat, On the Phone and Out of Lunch statuses completely) --- plugins/BuddyPounce/src/dialog.cpp | 17 ++++------------- plugins/BuddyPounce/src/resource.h | 3 --- 2 files changed, 4 insertions(+), 16 deletions(-) (limited to 'plugins/BuddyPounce/src') diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index 9421b8e51d..db306951f4 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -97,10 +97,7 @@ INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l | (IsDlgButtonChecked(hwnd, IDC_CHECK4) << 3) | (IsDlgButtonChecked(hwnd, IDC_CHECK5) << 4) | (IsDlgButtonChecked(hwnd, IDC_CHECK6) << 5) - | (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6) - | (IsDlgButtonChecked(hwnd, IDC_CHECK8) << 7) - | (IsDlgButtonChecked(hwnd, IDC_CHECK9) << 8) - | (IsDlgButtonChecked(hwnd, IDC_CHECK10) << 9); + | (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6); if (!mir_wstrcmp(type, L"Any")) { if (LOWORD(wParam) == IDOK) @@ -138,10 +135,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("Not available")); SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("Occupied")); SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("Do not disturb")); - SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free for chat")); - SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("Invisible")); - SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On the phone")); - SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("Out to lunch")); + SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Invisible")); } } else { @@ -159,10 +153,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To Not available")); SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("To Occupied")); SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To Do not disturb")); - SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Free for chat")); - SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("To Invisible")); - SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("To On the phone")); - SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out to lunch")); + SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Invisible")); } } CheckDlgButton(hwnd, IDC_CHECK1, (statusFlag & ANY) ? BST_CHECKED : BST_UNCHECKED); @@ -171,7 +162,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta CheckDlgButton(hwnd, IDC_CHECK4, (statusFlag & NA) >> 3 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwnd, IDC_CHECK5, (statusFlag & OCCUPIED) >> 4 ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwnd, IDC_CHECK6, (statusFlag & DND) >> 5 ? BST_CHECKED : BST_UNCHECKED); - CheckDlgButton(hwnd, IDC_CHECK8, (statusFlag & INVISIBLE) >> 7 ? BST_CHECKED : BST_UNCHECKED); + CheckDlgButton(hwnd, IDC_CHECK7, (statusFlag & INVISIBLE) >> 6 ? BST_CHECKED : BST_UNCHECKED); } void deletePounce(MCONTACT hContact) diff --git a/plugins/BuddyPounce/src/resource.h b/plugins/BuddyPounce/src/resource.h index 08ddca83fb..1f826f13f2 100644 --- a/plugins/BuddyPounce/src/resource.h +++ b/plugins/BuddyPounce/src/resource.h @@ -62,9 +62,6 @@ #define IDC_CHECK5 1085 #define IDC_CHECK6 1086 #define IDC_CHECK7 1087 -#define IDC_CHECK8 1088 -#define IDC_CHECK9 1089 -#define IDC_CHECK10 1090 #define IDC_SETTINGMSG2 1095 #define IDC_USEADVANCED 1096 #define IDC_SHOWDELIVERYMSGS 1097 -- cgit v1.2.3