diff options
| author | George Hazan <ghazan@miranda.im> | 2019-06-04 12:42:13 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2019-06-04 12:42:13 +0300 |
| commit | 88d56b4791202034588ff5b10d9c05fff3019934 (patch) | |
| tree | 36641740737a9e3a92adaa75116650373a9a2943 /plugins/BuddyPounce | |
| parent | 4a1f343d8684deaaa67e6ee56f0769b8bab8d6c8 (diff) | |
finally fixes #1963 (Remove Free for Chat, On the Phone and Out of Lunch statuses completely)
Diffstat (limited to 'plugins/BuddyPounce')
| -rw-r--r-- | plugins/BuddyPounce/res/resource.rc | 3 | ||||
| -rw-r--r-- | plugins/BuddyPounce/src/dialog.cpp | 17 | ||||
| -rw-r--r-- | plugins/BuddyPounce/src/resource.h | 3 |
3 files changed, 4 insertions, 19 deletions
diff --git a/plugins/BuddyPounce/res/resource.rc b/plugins/BuddyPounce/res/resource.rc index b1c6310750..444811a285 100644 --- a/plugins/BuddyPounce/res/resource.rc +++ b/plugins/BuddyPounce/res/resource.rc @@ -88,9 +88,6 @@ BEGIN CONTROL "Check1",IDC_CHECK5,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,66,74,10
CONTROL "Check1",IDC_CHECK6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,17,81,10
CONTROL "Check1",IDC_CHECK7,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,30,81,10
- CONTROL "Check1",IDC_CHECK8,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,42,81,10
- CONTROL "Check1",IDC_CHECK9,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,54,81,10
- CONTROL "Check1",IDC_CHECK10,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,93,66,81,10
END
IDD_OPTIONS DIALOGEX 0, 0, 314, 249
diff --git a/plugins/BuddyPounce/src/dialog.cpp b/plugins/BuddyPounce/src/dialog.cpp index 9421b8e51d..db306951f4 100644 --- a/plugins/BuddyPounce/src/dialog.cpp +++ b/plugins/BuddyPounce/src/dialog.cpp @@ -97,10 +97,7 @@ INT_PTR CALLBACK StatusModesDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l | (IsDlgButtonChecked(hwnd, IDC_CHECK4) << 3)
| (IsDlgButtonChecked(hwnd, IDC_CHECK5) << 4)
| (IsDlgButtonChecked(hwnd, IDC_CHECK6) << 5)
- | (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6)
- | (IsDlgButtonChecked(hwnd, IDC_CHECK8) << 7)
- | (IsDlgButtonChecked(hwnd, IDC_CHECK9) << 8)
- | (IsDlgButtonChecked(hwnd, IDC_CHECK10) << 9);
+ | (IsDlgButtonChecked(hwnd, IDC_CHECK7) << 6);
if (!mir_wstrcmp(type, L"Any")) {
if (LOWORD(wParam) == IDOK)
@@ -138,10 +135,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("Not available"));
SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("Occupied"));
SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("Do not disturb"));
- SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Free for chat"));
- SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("Invisible"));
- SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("On the phone"));
- SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("Out to lunch"));
+ SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("Invisible"));
}
}
else {
@@ -159,10 +153,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta SetDlgItemText(hwnd, IDC_CHECK4, TranslateT("To Not available"));
SetDlgItemText(hwnd, IDC_CHECK5, TranslateT("To Occupied"));
SetDlgItemText(hwnd, IDC_CHECK6, TranslateT("To Do not disturb"));
- SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Free for chat"));
- SetDlgItemText(hwnd, IDC_CHECK8, TranslateT("To Invisible"));
- SetDlgItemText(hwnd, IDC_CHECK9, TranslateT("To On the phone"));
- SetDlgItemText(hwnd, IDC_CHECK10, TranslateT("To Out to lunch"));
+ SetDlgItemText(hwnd, IDC_CHECK7, TranslateT("To Invisible"));
}
}
CheckDlgButton(hwnd, IDC_CHECK1, (statusFlag & ANY) ? BST_CHECKED : BST_UNCHECKED);
@@ -171,7 +162,7 @@ void statusModes(windowInfo *wi, int myStatusMode) // myStatusMode=1 sendIfMySta CheckDlgButton(hwnd, IDC_CHECK4, (statusFlag & NA) >> 3 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwnd, IDC_CHECK5, (statusFlag & OCCUPIED) >> 4 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hwnd, IDC_CHECK6, (statusFlag & DND) >> 5 ? BST_CHECKED : BST_UNCHECKED);
- CheckDlgButton(hwnd, IDC_CHECK8, (statusFlag & INVISIBLE) >> 7 ? BST_CHECKED : BST_UNCHECKED);
+ CheckDlgButton(hwnd, IDC_CHECK7, (statusFlag & INVISIBLE) >> 6 ? BST_CHECKED : BST_UNCHECKED);
}
void deletePounce(MCONTACT hContact)
diff --git a/plugins/BuddyPounce/src/resource.h b/plugins/BuddyPounce/src/resource.h index 08ddca83fb..1f826f13f2 100644 --- a/plugins/BuddyPounce/src/resource.h +++ b/plugins/BuddyPounce/src/resource.h @@ -62,9 +62,6 @@ #define IDC_CHECK5 1085
#define IDC_CHECK6 1086
#define IDC_CHECK7 1087
-#define IDC_CHECK8 1088
-#define IDC_CHECK9 1089
-#define IDC_CHECK10 1090
#define IDC_SETTINGMSG2 1095
#define IDC_USEADVANCED 1096
#define IDC_SHOWDELIVERYMSGS 1097
|