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

1 files changed, 7 insertions, 22 deletions

diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp
index d2eb116c6e..3bcb6c722e 100644
--- a/plugins/Popup/src/opt_class.cpp
+++ b/plugins/Popup/src/opt_class.cpp
@@ -71,10 +71,7 @@ static ctrlsAll[] = {
 	{ IDC_SNA, 0, 1, 0 },

 	{ IDC_SOCCUPIED, 0, 1, 0 },

 	{ IDC_SDND, 0, 1, 0 },

-	{ IDC_SFREE4CHAT, 0, 1, 0 },

 	{ IDC_SINVISIBLE, 0, 1, 0 },

-	{ IDC_SPHONE, 0, 1, 0 },

-	{ IDC_SLUNCH, 0, 1, 0 },

 

 	{ IDC_TXT_TITLE4, 0, 0, 0 },

 	{ IDC_SOFFLINE2, 0, 0, 0 },

@@ -83,10 +80,7 @@ static ctrlsAll[] = {
 	{ IDC_SNA2, 0, 0, 0 },

 	{ IDC_SOCCUPIED2, 0, 0, 0 },

 	{ IDC_SDND2, 0, 0, 0 },

-	{ IDC_SFREE4CHAT2, 0, 0, 0 },

 	{ IDC_SINVISIBLE2, 0, 0, 0 },

-	{ IDC_SPHONE2, 0, 0, 0 },

-	{ IDC_SLUNCH2, 0, 0, 0 },

 

 	{ IDC_ICO_INFO, 0, 1, 1 },

 	{ IDC_TXT_COLORS, 0, 1, 1 },

@@ -110,23 +104,20 @@ static UINT ctrlsEnable[] = {
 	IDC_TXT_TIMEOUT_SEC, IDC_TXT_TIMEOUT_DEFAULT, IDC_TXT_TIMEOUT_INFINITE,

 	IDC_TXT_LACTION, IDC_LACTION,

 	IDC_TXT_RACTION, IDC_RACTION,

-	/*IDC_CHECKWINDOW,*/ IDC_TXT_TITLE3, IDC_TXT_TITLE4,

+	IDC_TXT_TITLE3, IDC_TXT_TITLE4,

 	IDC_ICO_INFO, IDC_TXT_COLORS, IDC_MORE,

 

 	IDC_SOFFLINE, IDC_SONLINE, IDC_SAWAY, IDC_SNA,

-	IDC_SOCCUPIED, IDC_SDND, IDC_SFREE4CHAT,

-	IDC_SINVISIBLE, IDC_SPHONE, IDC_SLUNCH,

+	IDC_SOCCUPIED, IDC_SDND, IDC_SINVISIBLE,

 

 	IDC_SOFFLINE2, IDC_SONLINE2, IDC_SAWAY2, IDC_SNA2,

-	IDC_SOCCUPIED2, IDC_SDND2, IDC_SFREE4CHAT2,

-	IDC_SINVISIBLE2, IDC_SPHONE2, IDC_SLUNCH2,

+	IDC_SOCCUPIED2, IDC_SDND2, IDC_SINVISIBLE2,

 };

 

 static UINT ctrlsContact[] = {

-	/*IDC_CHECKWINDOW,*/ IDC_TXT_TITLE4,

+	IDC_TXT_TITLE4,

 	IDC_SOFFLINE2, IDC_SONLINE2, IDC_SAWAY2, IDC_SNA2,

-	IDC_SOCCUPIED2, IDC_SDND2, IDC_SFREE4CHAT2,

-	IDC_SINVISIBLE2, IDC_SPHONE2, IDC_SLUNCH2,

+	IDC_SOCCUPIED2, IDC_SDND2, IDC_SINVISIBLE2,

 };

 

 static int titleIds[] = {

@@ -149,10 +140,7 @@ static statusButtons[] = {
 	{ IDC_SNA, SKINICON_STATUS_NA, "Not available", PF2_LONGAWAY, PF2_LONGAWAY },

 	{ IDC_SOCCUPIED, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND },

 	{ IDC_SDND, SKINICON_STATUS_DND, "Do not disturb", PF2_HEAVYDND, PF2_HEAVYDND },

-	{ IDC_SFREE4CHAT, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT },

 	{ IDC_SINVISIBLE, SKINICON_STATUS_INVISIBLE, "Invisible", PF2_INVISIBLE, PF2_INVISIBLE },

-	{ IDC_SPHONE, SKINICON_STATUS_ONTHEPHONE, "On the phone", PF2_ONTHEPHONE, PF2_ONTHEPHONE },

-	{ IDC_SLUNCH, SKINICON_STATUS_OUTTOLUNCH, "Out to lunch", PF2_OUTTOLUNCH, PF2_OUTTOLUNCH },

 

 	{ IDC_SOFFLINE2, SKINICON_STATUS_OFFLINE, "Offline", PF2_IDLE, PF2_IDLE << 16 },

 	{ IDC_SONLINE2, SKINICON_STATUS_ONLINE, "Online", PF2_ONLINE, PF2_ONLINE << 16 },

@@ -160,10 +148,7 @@ static statusButtons[] = {
 	{ IDC_SNA2, SKINICON_STATUS_NA, "Not available", PF2_LONGAWAY, PF2_LONGAWAY << 16 },

 	{ IDC_SOCCUPIED2, SKINICON_STATUS_OCCUPIED, "Occupied", PF2_LIGHTDND, PF2_LIGHTDND << 16 },

 	{ IDC_SDND2, SKINICON_STATUS_DND, "Do not disturb", PF2_HEAVYDND, PF2_HEAVYDND << 16 },

-	{ IDC_SFREE4CHAT2, SKINICON_STATUS_FREE4CHAT, "Free for chat", PF2_FREECHAT, PF2_FREECHAT << 16 },

 	{ IDC_SINVISIBLE2, SKINICON_STATUS_INVISIBLE, "Invisible", PF2_INVISIBLE, PF2_INVISIBLE << 16 },

-	{ IDC_SPHONE2, SKINICON_STATUS_ONTHEPHONE, "On the phone", PF2_ONTHEPHONE, PF2_ONTHEPHONE << 16 },

-	{ IDC_SLUNCH2, SKINICON_STATUS_OUTTOLUNCH, "Out to lunch", PF2_OUTTOLUNCH, PF2_OUTTOLUNCH << 16 },

 };

 

 INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

@@ -372,9 +357,9 @@ INT_PTR CALLBACK DlgProcOptsClasses(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 					break;

 

 				case IDC_SOFFLINE:  case IDC_SONLINE:     case IDC_SAWAY:       case IDC_SNA:     case IDC_SOCCUPIED:

-				case IDC_SDND:	     case IDC_SFREE4CHAT:  case IDC_SINVISIBLE:  case IDC_SPHONE:  case IDC_SLUNCH:

+				case IDC_SDND:	     case IDC_SINVISIBLE:  

 				case IDC_SOFFLINE2: case IDC_SONLINE2:    case IDC_SAWAY2:      case IDC_SNA2:    case IDC_SOCCUPIED2:

-				case IDC_SDND2:     case IDC_SFREE4CHAT2: case IDC_SINVISIBLE2: case IDC_SPHONE2: case IDC_SLUNCH2:

+				case IDC_SDND2:     case IDC_SINVISIBLE2:

 					ptd->disableWhen = 0;

 					for (auto &it : statusButtons) {

 						if (IsDlgButtonChecked(hwnd, it.idCtrl))