From 88ca07977eb507f37bcd87b6c3a324b1c23eeb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20P=C3=B6sel?= Date: Fri, 5 May 2017 23:23:59 +0200 Subject: Facebook: Reverse logic of checkbox Checkboxes should have positive description/meaning. --- protocols/FacebookRM/res/facebook.rc | 30 ++++++++++++++++++++++++++++-- protocols/FacebookRM/src/constants.h | 2 +- protocols/FacebookRM/src/db.h | 2 +- protocols/FacebookRM/src/dialogs.cpp | 4 ++-- protocols/FacebookRM/src/messages.cpp | 4 ++-- protocols/FacebookRM/src/resource.h | 2 +- 6 files changed, 35 insertions(+), 9 deletions(-) (limited to 'protocols/FacebookRM') diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc index 8c2597af6f..7d8b4134d3 100644 --- a/protocols/FacebookRM/res/facebook.rc +++ b/protocols/FacebookRM/res/facebook.rc @@ -53,21 +53,36 @@ END // Icon with lowest ID value placed first to ensure application icon // remains consistent on all systems. IDI_FACEBOOK ICON "facebook.ico" + IDI_MIND ICON "mind.ico" + IDI_POKE ICON "poke.ico" + IDI_NOTIFICATION ICON "notification.ico" + IDI_NEWSFEED ICON "feeds.ico" + IDI_FRIENDS ICON "friends.ico" + IDI_CONVERSATION ICON "conversation.ico" + IDI_READ ICON "read.ico" + IDI_MEMORIES ICON "memories.ico" + IDI_ANGRY ICON "angry.ico" + IDI_HAHA ICON "haha.ico" + IDI_LIKE ICON "like.ico" + IDI_LOVE ICON "love.ico" + IDI_SAD ICON "sad.ico" + IDI_WOW ICON "wow.ico" + ///////////////////////////////////////////////////////////////////////////// // // Dialog @@ -177,9 +192,9 @@ BEGIN CONTROL "Allow posting statuses to my pages (may slow down login)",IDC_LOAD_PAGES, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,61,281,10 GROUPBOX "Advanced",IDC_STATIC,7,85,294,67 - CONTROL "Don't send typing notifications when Invisible",IDC_NO_TYPING_WHEN_INVISIBLE, + CONTROL "Send typing notifications even when Invisible",IDC_TYPING_WHEN_INVISIBLE, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,98,281,10 - LTEXT "Typing is one way how user is determined active. If you don't want to be seen ""active 1 min ago"" on Facebook, enable this and also don't interact with website at all. Sending messages from Miranda should be ok, but don't 100% rely on it.",IDC_STATIC,32,112,262,39 + LTEXT "Typing is one way how user is determined active. If you don't want to be seen ""active 1 min ago"" on Facebook, uncheck this option and also don't interact with website at all. Sending messages from Miranda should be ok, but don't 100% rely on it either.",IDC_STATIC,32,112,262,39 END IDD_CAPTCHAFORM DIALOGEX 0, 0, 258, 224 @@ -339,6 +354,17 @@ END #endif // English (United States) resources ///////////////////////////////////////////////////////////////////////////// +// +// AFX_DIALOG_LAYOUT +// + +IDD_OPTIONS_STATUSES AFX_DIALOG_LAYOUT +BEGIN + 0 +END + +#endif // Angli�tina (Spojen� st�ty) resources +///////////////////////////////////////////////////////////////////////////// diff --git a/protocols/FacebookRM/src/constants.h b/protocols/FacebookRM/src/constants.h index 8c527469ea..565819a539 100644 --- a/protocols/FacebookRM/src/constants.h +++ b/protocols/FacebookRM/src/constants.h @@ -101,7 +101,7 @@ along with this program. If not, see . #define DEFAULT_NAME_AS_NICK 1 #define DEFAULT_LOAD_ALL_CONTACTS 0 #define DEFAULT_PAGES_ALWAYS_ONLINE 1 -#define DEFAULT_NO_TYPING_WHEN_INVISIBLE 0 +#define DEFAULT_TYPING_WHEN_INVISIBLE 1 #define DEFAULT_EVENT_NOTIFICATIONS_ENABLE 1 #define DEFAULT_EVENT_FEEDS_ENABLE 0 diff --git a/protocols/FacebookRM/src/db.h b/protocols/FacebookRM/src/db.h index a7c4034c02..d533ed6048 100644 --- a/protocols/FacebookRM/src/db.h +++ b/protocols/FacebookRM/src/db.h @@ -75,7 +75,7 @@ along with this program. If not, see . #define FACEBOOK_KEY_NAME_AS_NICK "NameAsNick" #define FACEBOOK_KEY_LOAD_ALL_CONTACTS "LoadAllContacts" #define FACEBOOK_KEY_PAGES_ALWAYS_ONLINE "PagesAlwaysOnline" -#define FACEBOOK_KEY_NO_TYPING_WHEN_INVISIBLE "NoTypingWhenInvisible" +#define FACEBOOK_KEY_TYPING_WHEN_INVISIBLE "TypingWhenInvisible" // Account DB keys - notifications #define FACEBOOK_KEY_EVENT_NOTIFICATIONS_ENABLE "EventNotificationsEnable" diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp index b4b12ad06d..8874d141bf 100644 --- a/protocols/FacebookRM/src/dialogs.cpp +++ b/protocols/FacebookRM/src/dialogs.cpp @@ -449,7 +449,7 @@ INT_PTR CALLBACK FBOptionsStatusesProc(HWND hwnd, UINT message, WPARAM, LPARAM l LoadDBCheckState(proto, hwnd, IDC_SET_STATUS, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS); LoadDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES); LoadDBCheckState(proto, hwnd, IDC_LOAD_PAGES, FACEBOOK_KEY_LOAD_PAGES, DEFAULT_LOAD_PAGES); - LoadDBCheckState(proto, hwnd, IDC_NO_TYPING_WHEN_INVISIBLE, FACEBOOK_KEY_NO_TYPING_WHEN_INVISIBLE, DEFAULT_NO_TYPING_WHEN_INVISIBLE); + LoadDBCheckState(proto, hwnd, IDC_TYPING_WHEN_INVISIBLE, FACEBOOK_KEY_TYPING_WHEN_INVISIBLE, DEFAULT_TYPING_WHEN_INVISIBLE); return TRUE; } @@ -469,7 +469,7 @@ INT_PTR CALLBACK FBOptionsStatusesProc(HWND hwnd, UINT message, WPARAM, LPARAM l StoreDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT); StoreDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES); StoreDBCheckState(proto, hwnd, IDC_LOAD_PAGES, FACEBOOK_KEY_LOAD_PAGES); - StoreDBCheckState(proto, hwnd, IDC_NO_TYPING_WHEN_INVISIBLE, FACEBOOK_KEY_NO_TYPING_WHEN_INVISIBLE); + StoreDBCheckState(proto, hwnd, IDC_TYPING_WHEN_INVISIBLE, FACEBOOK_KEY_TYPING_WHEN_INVISIBLE); BOOL setStatus = IsDlgButtonChecked(hwnd, IDC_SET_STATUS); BOOL setStatusOld = proto->getByte(FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS); diff --git a/protocols/FacebookRM/src/messages.cpp b/protocols/FacebookRM/src/messages.cpp index 8fa798548d..8e100eb870 100644 --- a/protocols/FacebookRM/src/messages.cpp +++ b/protocols/FacebookRM/src/messages.cpp @@ -137,8 +137,8 @@ void FacebookProto::SendTypingWorker(void *p) send_typing *typing = static_cast(p); // Don't send typing notifications when we are invisible and user don't want that - bool noTypingWhenInvisible = getBool(FACEBOOK_KEY_NO_TYPING_WHEN_INVISIBLE, DEFAULT_NO_TYPING_WHEN_INVISIBLE); - if (noTypingWhenInvisible && isInvisible()) { + bool typingWhenInvisible = getBool(FACEBOOK_KEY_TYPING_WHEN_INVISIBLE, DEFAULT_TYPING_WHEN_INVISIBLE); + if (isInvisible() && !typingWhenInvisible) { delete typing; return; } diff --git a/protocols/FacebookRM/src/resource.h b/protocols/FacebookRM/src/resource.h index 8a5cd10fe1..f898412dfa 100644 --- a/protocols/FacebookRM/src/resource.h +++ b/protocols/FacebookRM/src/resource.h @@ -42,7 +42,7 @@ #define IDC_PAGES_ALWAYS_ONLINE 1035 #define IDC_LOAD_PAGES 1036 #define IDC_KEEP_UNREAD 1037 -#define IDC_NO_TYPING_WHEN_INVISIBLE 1038 +#define IDC_TYPING_WHEN_INVISIBLE 1038 #define IDC_MESSAGES_ON_OPEN 1039 #define IDC_HIDE_CHATS 1040 #define IDC_NOTIFICATIONS_ENABLE 1041 -- cgit v1.2.3