From b078dfb78c89aea87cd422eae52694738e473cf3 Mon Sep 17 00:00:00 2001 From: dartraiden Date: Sun, 21 Jul 2019 19:59:18 +0300 Subject: Restore "Free for chat" status support (fixes #1963) --- plugins/BASS_interface/res/Bass.rc | 3 ++- plugins/BASS_interface/src/Main.cpp | 8 +++++--- plugins/BASS_interface/src/Resource.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'plugins/BASS_interface') diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc index d703bc910e..c45058741e 100644 --- a/plugins/BASS_interface/res/Bass.rc +++ b/plugins/BASS_interface/res/Bass.rc @@ -63,7 +63,8 @@ BEGIN AUTOCHECKBOX "Not available", IDC_CHECKBOX4, 240, 50, 65, 8 AUTOCHECKBOX "Occupied", IDC_CHECKBOX5, 240, 60, 65, 8 AUTOCHECKBOX "Do not disturb", IDC_CHECKBOX6, 240, 70, 65, 8 - AUTOCHECKBOX "Invisible", IDC_CHECKBOX7, 240, 80, 65, 8 + AUTOCHECKBOX "Free for chat", IDC_CHECKBOX7, 240, 80, 65, 8 + AUTOCHECKBOX "Invisible", IDC_CHECKBOX8, 240, 90, 65, 8 AUTOCHECKBOX "Preview", IDC_PREVIEW, 200, 165, 90, 8, BS_RIGHT, WS_EX_RIGHT END diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index b402c4c583..51d0489a95 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -82,6 +82,7 @@ static int OnPlaySnd(WPARAM wParam, LPARAM lParam) WORD currstat = 1; switch (CallService(MS_CLIST_GETSTATUSMODE, 0, 0)) { case ID_STATUS_INVISIBLE: currstat <<= 1; + case ID_STATUS_FREECHAT: currstat <<= 1; case ID_STATUS_DND: currstat <<= 1; case ID_STATUS_OCCUPIED: currstat <<= 1; case ID_STATUS_NA: currstat <<= 1; @@ -159,7 +160,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara CheckDlgButton(hwndDlg, IDC_PREVIEW, EnPreview ? BST_CHECKED : BST_UNCHECKED); - for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX7; i++) + for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX8; i++) if (StatMask & (1 << (i - IDC_CHECKBOX1))) CheckDlgButton(hwndDlg, i, BST_CHECKED); @@ -176,7 +177,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara EnableWindow(GetDlgItem(hwndDlg, IDC_QUIETTIME), FALSE); EnableWindow(GetDlgItem(hwndDlg, IDC_PREVIEW), FALSE); - for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX7; i++) + for (int i = IDC_CHECKBOX1; i <= IDC_CHECKBOX8; i++) EnableWindow(GetDlgItem(hwndDlg, i), FALSE); } else { @@ -243,7 +244,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara g_plugin.setByte(OPT_PREVIEW, EnPreview); StatMask = 0; - for (int i = IDC_CHECKBOX7; i >= IDC_CHECKBOX1; i--) { + for (int i = IDC_CHECKBOX8; i >= IDC_CHECKBOX1; i--) { StatMask <<= 1; if (IsDlgButtonChecked(hwndDlg, i) == BST_CHECKED) StatMask |= 1; @@ -287,6 +288,7 @@ INT_PTR CALLBACK OptionsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara case IDC_CHECKBOX5: case IDC_CHECKBOX6: case IDC_CHECKBOX7: + case IDC_CHECKBOX8: case IDC_PREVIEW: SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; diff --git a/plugins/BASS_interface/src/Resource.h b/plugins/BASS_interface/src/Resource.h index fd38b008df..75c22636ac 100644 --- a/plugins/BASS_interface/src/Resource.h +++ b/plugins/BASS_interface/src/Resource.h @@ -19,6 +19,7 @@ #define IDC_CHECKBOX5 1104 #define IDC_CHECKBOX6 1105 #define IDC_CHECKBOX7 1106 +#define IDC_CHECKBOX8 1107 #define IDC_PREVIEW 1110 #define IDI_BASSSoundOn 1111 #define IDI_BASSSoundOff 1112 -- cgit v1.2.3