fixes #1963 (Remove Free for Chat, On the Phone and Out to Lunch statuses completely)

5 files changed, 12 insertions, 36 deletions

diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc
index 8ba35da2f4..6291f253a1 100644
--- a/plugins/KeyboardNotify/res/resources.rc
+++ b/plugins/KeyboardNotify/res/resources.rc
@@ -80,10 +80,7 @@ BEGIN
     CONTROL         "Occupied",IDC_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,118,128,9

     CONTROL         "Not available",IDC_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,108,128,9

     CONTROL         "Do not disturb",IDC_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,128,85,9

-    CONTROL         "Free for chat",IDC_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,138,127,9

-    CONTROL         "Invisible",IDC_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,148,128,9

-    CONTROL         "On the phone",IDC_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,158,128,9

-    CONTROL         "Out to lunch",IDC_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,168,127,9

+    CONTROL         "Invisible",IDC_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,138,128,9

     GROUPBOX        "Pending Events",IDC_STATIC,155,189,147,28

     LTEXT           "Remind me every",IDC_STATIC,168,200,58,9

     EDITTEXT        IDC_SREMCHECK,226,198,37,13,ES_NUMBER

diff --git a/plugins/KeyboardNotify/src/constants.h b/plugins/KeyboardNotify/src/constants.h
index d6637469bf..d8f36a41b9 100644
--- a/plugins/KeyboardNotify/src/constants.h
+++ b/plugins/KeyboardNotify/src/constants.h
@@ -41,10 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define MAP_NA           4

 #define MAP_OCCUPIED     8

 #define MAP_DND          16

-#define MAP_FREECHAT     32

-#define MAP_INVISIBLE    64

-#define MAP_ONTHEPHONE   128

-#define MAP_OUTTOLUNCH   256

+#define MAP_INVISIBLE    32

 #define MAP_OFFLINE      512

 

 // Default settings

diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index def163577f..1abeb64cb1 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -156,10 +156,7 @@ BOOL isStatusEnabled(int status)
 		case ID_STATUS_NA:         return wStatusMap & MAP_NA;

 		case ID_STATUS_OCCUPIED:   return wStatusMap & MAP_OCCUPIED;

 		case ID_STATUS_DND:        return wStatusMap & MAP_DND;

-		case ID_STATUS_FREECHAT:   return wStatusMap & MAP_FREECHAT;

 		case ID_STATUS_INVISIBLE:  return wStatusMap & MAP_INVISIBLE;

-		case ID_STATUS_ONTHEPHONE: return wStatusMap & MAP_ONTHEPHONE;

-		case ID_STATUS_OUTTOLUNCH: return wStatusMap & MAP_OUTTOLUNCH;

 	}

 	return FALSE;

 }

diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp
index 47fbb0a007..780efa029b 100644
--- a/plugins/KeyboardNotify/src/options.cpp
+++ b/plugins/KeyboardNotify/src/options.cpp
@@ -636,19 +636,16 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 		SendDlgItemMessage(hwndDlg, IDC_MIRORWIN, CB_SETCURSEL, (WPARAM)bMirandaOrWindows, 0);
 		if (!(bFlashUntil & UNTIL_REATTENDED))
 			EnableWindow(GetDlgItem(hwndDlg, IDC_MIRORWIN), FALSE);
-		CheckDlgButton(hwndDlg, IDC_UNTILOPEN, bFlashUntil&UNTIL_EVENTSOPEN ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_UNTILCOND, bFlashUntil&UNTIL_CONDITIONS ? BST_CHECKED : BST_UNCHECKED);
-
-		CheckDlgButton(hwndDlg, IDC_ONLINE, wStatusMap&MAP_ONLINE ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_AWAY, wStatusMap&MAP_AWAY ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_NA, wStatusMap&MAP_NA ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_OCCUPIED, wStatusMap&MAP_OCCUPIED ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_DND, wStatusMap&MAP_DND ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_FREECHAT, wStatusMap&MAP_FREECHAT ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_INVISIBLE, wStatusMap&MAP_INVISIBLE ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_ONTHEPHONE, wStatusMap&MAP_ONTHEPHONE ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_OUTTOLUNCH, wStatusMap&MAP_OUTTOLUNCH ? BST_CHECKED : BST_UNCHECKED);
-		CheckDlgButton(hwndDlg, IDC_OFFLINE, wStatusMap&MAP_OFFLINE ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_UNTILOPEN, bFlashUntil & UNTIL_EVENTSOPEN ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_UNTILCOND, bFlashUntil & UNTIL_CONDITIONS ? BST_CHECKED : BST_UNCHECKED);
+
+		CheckDlgButton(hwndDlg, IDC_ONLINE, wStatusMap & MAP_ONLINE ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_AWAY, wStatusMap & MAP_AWAY ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_NA, wStatusMap & MAP_NA ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_OCCUPIED, wStatusMap & MAP_OCCUPIED ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_DND, wStatusMap & MAP_DND ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_INVISIBLE, wStatusMap & MAP_INVISIBLE ? BST_CHECKED : BST_UNCHECKED);
+		CheckDlgButton(hwndDlg, IDC_OFFLINE, wStatusMap & MAP_OFFLINE ? BST_CHECKED : BST_UNCHECKED);
 
 		SendDlgItemMessage(hwndDlg, IDC_REMCHECK, UDM_SETBUDDY, (WPARAM)GetDlgItem(hwndDlg, IDC_SREMCHECK), 0);
 		SendDlgItemMessage(hwndDlg, IDC_REMCHECK, UDM_SETRANGE32, 0, MAKELONG(UD_MAXVAL, 0));
@@ -689,10 +686,7 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 		case IDC_NA:
 		case IDC_OCCUPIED:
 		case IDC_DND:
-		case IDC_FREECHAT:
 		case IDC_INVISIBLE:
-		case IDC_ONTHEPHONE:
-		case IDC_OUTTOLUNCH:
 		case IDC_OFFLINE:
 			EnableWindow(GetDlgItem(hwndDlg, IDC_IFNOTTOP), IsDlgButtonChecked(hwndDlg, IDC_IFOPEN) == BST_CHECKED);
 			EnableWindow(GetDlgItem(hwndDlg, IDC_SOLDER), IsDlgButtonChecked(hwndDlg, IDC_IFOLDER) == BST_CHECKED);
@@ -785,14 +779,8 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
 					statusMap |= MAP_OCCUPIED;
 				if (IsDlgButtonChecked(hwndDlg, IDC_DND) == BST_CHECKED)
 					statusMap |= MAP_DND;
-				if (IsDlgButtonChecked(hwndDlg, IDC_FREECHAT) == BST_CHECKED)
-					statusMap |= MAP_FREECHAT;
 				if (IsDlgButtonChecked(hwndDlg, IDC_INVISIBLE) == BST_CHECKED)
 					statusMap |= MAP_INVISIBLE;
-				if (IsDlgButtonChecked(hwndDlg, IDC_ONTHEPHONE) == BST_CHECKED)
-					statusMap |= MAP_ONTHEPHONE;
-				if (IsDlgButtonChecked(hwndDlg, IDC_OUTTOLUNCH) == BST_CHECKED)
-					statusMap |= MAP_OUTTOLUNCH;
 				if (IsDlgButtonChecked(hwndDlg, IDC_OFFLINE) == BST_CHECKED)
 					statusMap |= MAP_OFFLINE;
 				g_plugin.setWord("status", statusMap);
diff --git a/plugins/KeyboardNotify/src/resource.h b/plugins/KeyboardNotify/src/resource.h
index 87528e8fec..af747a03fe 100644
--- a/plugins/KeyboardNotify/src/resource.h
+++ b/plugins/KeyboardNotify/src/resource.h
@@ -39,10 +39,7 @@
 #define IDC_NA                          1024

 #define IDC_OCCUPIED                    1025

 #define IDC_DND                         1026

-#define IDC_FREECHAT                    1027

 #define IDC_INVISIBLE                   1028

-#define IDC_ONTHEPHONE                  1029

-#define IDC_OUTTOLUNCH                  1030

 #define IDC_OFFLINE                     1031

 #define IDC_REMCHECK                    1032

 #define IDC_SREMCHECK                   1033