summaryrefslogtreecommitdiff
path: root/plugins/KeyboardNotify
diff options
context:
space:
mode:
authordartraiden <wowemuh@gmail.com>2019-07-21 19:59:18 +0300
committerdartraiden <wowemuh@gmail.com>2019-07-21 19:59:18 +0300
commitb078dfb78c89aea87cd422eae52694738e473cf3 (patch)
treeca896e82a8a5ce81f80d041f4aee7fdeeb007162 /plugins/KeyboardNotify
parentee7e29d02e94e969c1154515cd0c408c591a2414 (diff)
Restore "Free for chat" status support (fixes #1963)
Diffstat (limited to 'plugins/KeyboardNotify')
-rw-r--r--plugins/KeyboardNotify/res/resources.rc3
-rw-r--r--plugins/KeyboardNotify/src/constants.h3
-rw-r--r--plugins/KeyboardNotify/src/main.cpp1
-rw-r--r--plugins/KeyboardNotify/src/options.cpp4
-rw-r--r--plugins/KeyboardNotify/src/resource.h1
5 files changed, 10 insertions, 2 deletions
diff --git a/plugins/KeyboardNotify/res/resources.rc b/plugins/KeyboardNotify/res/resources.rc
index 6291f253a1..34ba5aa856 100644
--- a/plugins/KeyboardNotify/res/resources.rc
+++ b/plugins/KeyboardNotify/res/resources.rc
@@ -80,7 +80,8 @@ 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 "Invisible",IDC_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,168,138,128,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
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 d8f36a41b9..175b33d6bc 100644
--- a/plugins/KeyboardNotify/src/constants.h
+++ b/plugins/KeyboardNotify/src/constants.h
@@ -41,7 +41,8 @@ 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_INVISIBLE 32
+#define MAP_FREECHAT 32
+#define MAP_INVISIBLE 64
#define MAP_OFFLINE 512
// Default settings
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp
index 1abeb64cb1..230b99e734 100644
--- a/plugins/KeyboardNotify/src/main.cpp
+++ b/plugins/KeyboardNotify/src/main.cpp
@@ -156,6 +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;
}
return FALSE;
diff --git a/plugins/KeyboardNotify/src/options.cpp b/plugins/KeyboardNotify/src/options.cpp
index 780efa029b..4446fcbbf1 100644
--- a/plugins/KeyboardNotify/src/options.cpp
+++ b/plugins/KeyboardNotify/src/options.cpp
@@ -644,6 +644,7 @@ static INT_PTR CALLBACK DlgProcBasicOptions(HWND hwndDlg, UINT msg, WPARAM wPara
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_OFFLINE, wStatusMap & MAP_OFFLINE ? BST_CHECKED : BST_UNCHECKED);
@@ -686,6 +687,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_OFFLINE:
EnableWindow(GetDlgItem(hwndDlg, IDC_IFNOTTOP), IsDlgButtonChecked(hwndDlg, IDC_IFOPEN) == BST_CHECKED);
@@ -779,6 +781,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_OFFLINE) == BST_CHECKED)
diff --git a/plugins/KeyboardNotify/src/resource.h b/plugins/KeyboardNotify/src/resource.h
index af747a03fe..d645b050e2 100644
--- a/plugins/KeyboardNotify/src/resource.h
+++ b/plugins/KeyboardNotify/src/resource.h
@@ -39,6 +39,7 @@
#define IDC_NA 1024
#define IDC_OCCUPIED 1025
#define IDC_DND 1026
+#define IDC_FREECHAT 1027
#define IDC_INVISIBLE 1028
#define IDC_OFFLINE 1031
#define IDC_REMCHECK 1032