diff options
Diffstat (limited to 'plugins/Popup/src')
| -rw-r--r-- | plugins/Popup/src/opt_class.cpp | 29 | ||||
| -rw-r--r-- | plugins/Popup/src/opt_gen.cpp | 9 | ||||
| -rw-r--r-- | plugins/Popup/src/resource.h | 6 |
3 files changed, 7 insertions, 37 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))
diff --git a/plugins/Popup/src/opt_gen.cpp b/plugins/Popup/src/opt_gen.cpp index 6503332b2c..1938b05e6e 100644 --- a/plugins/Popup/src/opt_gen.cpp +++ b/plugins/Popup/src/opt_gen.cpp @@ -35,9 +35,6 @@ static int CountStatusModes(DWORD flags) if (flags & PF2_LONGAWAY) ++res;
if (flags & PF2_LIGHTDND) ++res;
if (flags & PF2_HEAVYDND) ++res;
- if (flags & PF2_FREECHAT) ++res;
- if (flags & PF2_OUTTOLUNCH) ++res;
- if (flags & PF2_ONTHEPHONE) ++res;
if (res) ++res; // Offline
return res;
}
@@ -62,9 +59,6 @@ int AddStatusMode(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flag) case PF2_LONGAWAY: mir_wstrcat(options[pos].pszOptionName, LPGENW("Not available")); break;
case PF2_LIGHTDND: mir_wstrcat(options[pos].pszOptionName, LPGENW("Occupied")); break;
case PF2_HEAVYDND: mir_wstrcat(options[pos].pszOptionName, LPGENW("Do not disturb")); break;
- case PF2_FREECHAT: mir_wstrcat(options[pos].pszOptionName, LPGENW("Free for chat")); break;
- case PF2_OUTTOLUNCH: mir_wstrcat(options[pos].pszOptionName, LPGENW("Out to lunch")); break;
- case PF2_ONTHEPHONE: mir_wstrcat(options[pos].pszOptionName, LPGENW("On the phone")); break;
}
return pos + 1;
}
@@ -78,9 +72,6 @@ int AddStatusModes(OPTTREE_OPTION *options, int pos, LPTSTR prefix, DWORD flags) pos = AddStatusMode(options, pos, prefix, flags & PF2_LONGAWAY);
pos = AddStatusMode(options, pos, prefix, flags & PF2_LIGHTDND);
pos = AddStatusMode(options, pos, prefix, flags & PF2_HEAVYDND);
- pos = AddStatusMode(options, pos, prefix, flags & PF2_FREECHAT);
- pos = AddStatusMode(options, pos, prefix, flags & PF2_OUTTOLUNCH);
- pos = AddStatusMode(options, pos, prefix, flags & PF2_ONTHEPHONE);
return pos;
}
diff --git a/plugins/Popup/src/resource.h b/plugins/Popup/src/resource.h index 9609d49527..8dd0e96ff2 100644 --- a/plugins/Popup/src/resource.h +++ b/plugins/Popup/src/resource.h @@ -76,10 +76,7 @@ #define IDC_SNA 1102
#define IDC_SOCCUPIED 1103
#define IDC_SDND 1104
-#define IDC_SFREE4CHAT 1105
#define IDC_SINVISIBLE 1106
-#define IDC_SPHONE 1107
-#define IDC_SLUNCH 1108
#define IDC_TIMEOUT 1110
#define IDC_SOFFLINE2 1111
#define IDC_SONLINE2 1112
@@ -90,12 +87,9 @@ #define IDC_TREE1 1117
#define IDC_SKINLIST 1118
#define IDC_SINVISIBLE2 1119
-#define IDC_SPHONE2 1120
-#define IDC_SLUNCH2 1121
#define IDC_TXT_TIMEOUT_SEC 1122
#define IDC_PREVIEWBOX 1123
#define IDC_TXT_TIMEOUT_INFINITE 1124
-#define IDC_SFREE4CHAT2 1125
#define IDC_TXT_TIMEOUT_DEFAULT 1126
#define IDC_POPUP_LIST 1134
#define IDC_SHOWHISTORY 1135
|