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/NewXstatusNotify/res/resource.rc | 29 +++++++---------------------- plugins/NewXstatusNotify/src/resource.h | 19 +++++-------------- 2 files changed, 12 insertions(+), 36 deletions(-) (limited to 'plugins/NewXstatusNotify') diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc index 5012458ee7..2055800986 100644 --- a/plugins/NewXstatusNotify/res/resource.rc +++ b/plugins/NewXstatusNotify/res/resource.rc @@ -124,18 +124,9 @@ BEGIN LTEXT "Do not disturb",IDC_STATIC,10,103,56,8 CONTROL "",IDC_DND_BG,"ColourPicker",WS_TABSTOP,73,101,24,12 CONTROL "",IDC_DND_TX,"ColourPicker",WS_TABSTOP,106,101,24,12 - LTEXT "Free for chat",IDC_STATIC,10,118,56,8 - CONTROL "",IDC_FREEFORCHAT_BG,"ColourPicker",WS_TABSTOP,73,116,24,12 - CONTROL "",IDC_FREEFORCHAT_TX,"ColourPicker",WS_TABSTOP,106,116,24,12 - LTEXT "Out to lunch",IDC_STATIC,10,148,56,8 - CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,131,24,12 - CONTROL "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,131,24,12 - LTEXT "Invisible",IDC_STATIC,10,133,56,8 - CONTROL "",IDC_OUTTOLUNCH_BG,"ColourPicker",WS_TABSTOP,73,146,24,12 - CONTROL "",IDC_OUTTOLUNCH_TX,"ColourPicker",WS_TABSTOP,106,146,24,12 - LTEXT "On the phone",IDC_STATIC,10,163,56,8 - CONTROL "",IDC_ONTHEPHONE_BG,"ColourPicker",WS_TABSTOP,73,161,24,12 - CONTROL "",IDC_ONTHEPHONE_TX,"ColourPicker",WS_TABSTOP,106,161,24,12 + LTEXT "Invisible",IDC_STATIC,10,118,56,8 + CONTROL "",IDC_INVISIBLE_BG,"ColourPicker",WS_TABSTOP,73,116,24,12 + CONTROL "",IDC_INVISIBLE_TX,"ColourPicker",WS_TABSTOP,106,116,24,12 LTEXT "Extra status",IDC_STATIC,10,178,56,8 CONTROL "",IDC_XSTATUS_TX,"ColourPicker",WS_TABSTOP,106,176,24,12 CONTROL "",IDC_XSTATUS_BG,"ColourPicker",WS_TABSTOP,73,176,24,12 @@ -215,25 +206,19 @@ BEGIN LTEXT "Disable when my status is:",IDC_STATIC,15,37,116,8 CONTROL "Online",IDC_CHK_ONLINE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,49,116,10 CONTROL "Invisible",IDC_CHK_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,59,116,10 - CONTROL "Free for chat",IDC_CHK_FREECHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,116,10 - CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10 - CONTROL "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10 - CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,99,116,10 - CONTROL "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,109,116,10 - CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,129,116,10 - CONTROL "On the phone",IDC_CHK_ONTHEPHONE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,119,116,10 + CONTROL "Away",IDC_CHK_AWAY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,69,116,10 + CONTROL "Not available",IDC_CHK_NA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,79,116,10 + CONTROL "Occupied",IDC_CHK_OCCUPIED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,89,116,10 + CONTROL "Do not disturb",IDC_CHK_DND,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,99,116,10 GROUPBOX "Sounds",IDC_STATIC,147,8,132,136 CONTROL "Disable globally",IDC_CHK_SGLOBAL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,20,116,10 LTEXT "Disable when my status is:",IDC_STATIC,157,36,116,8 CONTROL "Online",IDC_CHK_ONLINE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,50,116,10 CONTROL "Invisible",IDC_CHK_INVISIBLE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,60,116,10 - CONTROL "Free for chat",IDC_CHK_FREECHAT2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,70,116,10 CONTROL "Away",IDC_CHK_AWAY2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,80,116,10 CONTROL "Not available",IDC_CHK_NA2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,90,116,10 CONTROL "Occupied",IDC_CHK_OCCUPIED2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,100,116,10 CONTROL "Do not disturb",IDC_CHK_DND2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,110,116,10 - CONTROL "Out to lunch",IDC_CHK_OUTTOLUNCH2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,130,116,10 - CONTROL "On the phone",IDC_CHK_ONTHEPHONE2,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,157,120,116,10 CONTROL "Disable only if I change global status",IDC_CHK_ONLYGLOBAL, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,151,258,10 PUSHBUTTON "OK",IDC_OK,90,169,50,14 diff --git a/plugins/NewXstatusNotify/src/resource.h b/plugins/NewXstatusNotify/src/resource.h index 3b10ffedce..3b1f78becf 100644 --- a/plugins/NewXstatusNotify/src/resource.h +++ b/plugins/NewXstatusNotify/src/resource.h @@ -146,10 +146,7 @@ #define IDC_CHK_DND 40074 #define IDC_CHK_NA 40075 #define IDC_CHK_OCCUPIED 40076 -#define IDC_CHK_FREECHAT 40077 -#define IDC_CHK_INVISIBLE 40078 -#define IDC_CHK_ONTHEPHONE 40079 -#define IDC_CHK_OUTTOLUNCH 40080 +#define IDC_CHK_INVISIBLE 40077 #define IDC_CHK_XSTATUS 40081 #define IDC_CHK_STATUS_MESSAGE 40082 #define IDC_CHK_FROMOFFLINE 40083 @@ -176,16 +173,10 @@ #define IDC_CHK_NA2 42075 #define IDC_OCCUPIED_BG 42076 #define IDC_CHK_OCCUPIED2 42076 -#define IDC_FREEFORCHAT_BG 42077 -#define IDC_CHK_FREECHAT2 42077 -#define IDC_INVISIBLE_BG 42078 -#define IDC_CHK_INVISIBLE2 42078 -#define IDC_ONTHEPHONE_BG 42079 -#define IDC_CHK_ONTHEPHONE2 42079 -#define IDC_OUTTOLUNCH_BG 42080 -#define IDC_CHK_OUTTOLUNCH2 42080 -#define IDC_XSTATUS_BG 42081 -#define IDC_STATUSMSG_BG 42082 +#define IDC_INVISIBLE_BG 42077 +#define IDC_CHK_INVISIBLE2 42077 +#define IDC_XSTATUS_BG 42078 +#define IDC_STATUSMSG_BG 42079 // Next default values for new objects // -- cgit v1.2.3