From 417f379ff9bb90e918549379c2ddbf06d46ddb1d Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 11 Oct 2013 16:53:31 +0000 Subject: removed obsolete option git-svn-id: http://svn.miranda-ng.org/main/trunk@6444 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/FacebookRM/res/facebook.rc | 28 +++++++++++++--------------- protocols/FacebookRM/src/db.h | 1 - protocols/FacebookRM/src/dialogs.cpp | 2 -- protocols/FacebookRM/src/resource.h | 2 +- 4 files changed, 14 insertions(+), 19 deletions(-) (limited to 'protocols') diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc index f920058aea..365528336a 100644 --- a/protocols/FacebookRM/res/facebook.rc +++ b/protocols/FacebookRM/res/facebook.rc @@ -138,30 +138,28 @@ BEGIN "Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,121,228,8 END -IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 305, 210 +IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 305, 155 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD EXSTYLE WS_EX_CONTROLPARENT FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - GROUPBOX "Advanced Settings",IDC_STATIC,7,7,291,148 - CONTROL "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,32,267,10 - CONTROL "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,17,56,267,10 - CONTROL "Enable logging for debugging purposes",IDC_LOGGING, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,20,267,10 + GROUPBOX "Advanced Settings",IDC_STATIC,7,7,291,137 + CONTROL "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,267,10 + CONTROL "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,17,46,267,10 CONTROL "Use secure connection also for channel requests",IDC_SECURE_CHANNEL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,44,252,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,34,252,10 CONTROL "Also disconnect chat when going to offline",IDC_DISCONNECT_CHAT, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,68,267,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,58,267,10 CONTROL "Map non-standard statuses to Invisible (instead of Online)",IDC_MAP_STATUSES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,81,267,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,71,267,10 CONTROL "Enable support for Custom smileys (EXPERIMENTAL + BUGGY!)",IDC_CUSTOM_SMILEYS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,95,267,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,84,267,10 CONTROL "Use local time for received messages",IDC_USE_LOCAL_TIME, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,108,267,10 - COMBOBOX IDC_URL_SERVER,156,135,96,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - LTEXT "Use this server for opening links:",IDC_STATIC,17,137,135,8 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,98,267,10 + COMBOBOX IDC_URL_SERVER,156,124,96,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "Use this server for opening links:",IDC_STATIC,17,127,135,8 CONTROL "Allow posting statuses to my pages (may slow down login)",IDC_LOAD_PAGES, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,122,267,10 + "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,111,267,10 END @@ -229,7 +227,7 @@ BEGIN VERTGUIDE, 156 VERTGUIDE, 284 TOPMARGIN, 7 - BOTTOMMARGIN, 203 + BOTTOMMARGIN, 148 END END #endif // APSTUDIO_INVOKED diff --git a/protocols/FacebookRM/src/db.h b/protocols/FacebookRM/src/db.h index 65538d2f16..28cb5555d1 100644 --- a/protocols/FacebookRM/src/db.h +++ b/protocols/FacebookRM/src/db.h @@ -39,7 +39,6 @@ along with this program. If not, see . #define FACEBOOK_KEY_FORCE_HTTPS "ForceHTTPS" #define FACEBOOK_KEY_FORCE_HTTPS_CHANNEL "ForceHTTPSChannel" #define FACEBOOK_KEY_SET_MIRANDA_STATUS "SetMirandaStatus" -#define FACEBOOK_KEY_LOGGING_ENABLE "LoggingEnable" #define FACEBOOK_KEY_SYSTRAY_NOTIFY "UseSystrayNotify" #define FACEBOOK_KEY_DISABLE_STATUS_NOTIFY "DisableStatusNotify" #define FACEBOOK_KEY_BIG_AVATARS "UseBigAvatars" diff --git a/protocols/FacebookRM/src/dialogs.cpp b/protocols/FacebookRM/src/dialogs.cpp index 72ed6ecd75..6381f86eb7 100644 --- a/protocols/FacebookRM/src/dialogs.cpp +++ b/protocols/FacebookRM/src/dialogs.cpp @@ -456,7 +456,6 @@ INT_PTR CALLBACK FBOptionsAdvancedProc(HWND hwnd, UINT message, WPARAM wparam, L LoadDBCheckState(proto, hwnd, IDC_SECURE_CHANNEL, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL, DEFAULT_FORCE_HTTPS_CHANNEL); LoadDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT, DEFAULT_DISCONNECT_CHAT); LoadDBCheckState(proto, hwnd, IDC_SET_STATUS, FACEBOOK_KEY_SET_MIRANDA_STATUS, DEFAULT_SET_MIRANDA_STATUS); - LoadDBCheckState(proto, hwnd, IDC_LOGGING, FACEBOOK_KEY_LOGGING_ENABLE, DEFAULT_LOGGING_ENABLE); LoadDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES, DEFAULT_MAP_STATUSES); LoadDBCheckState(proto, hwnd, IDC_CUSTOM_SMILEYS, FACEBOOK_KEY_CUSTOM_SMILEYS, DEFAULT_CUSTOM_SMILEYS); LoadDBCheckState(proto, hwnd, IDC_USE_LOCAL_TIME, FACEBOOK_KEY_LOCAL_TIMESTAMP, DEFAULT_LOCAL_TIME); @@ -486,7 +485,6 @@ INT_PTR CALLBACK FBOptionsAdvancedProc(HWND hwnd, UINT message, WPARAM wparam, L proto->setByte(FACEBOOK_KEY_SERVER_TYPE, SendDlgItemMessage(hwnd, IDC_URL_SERVER, CB_GETCURSEL, 0, 0)); StoreDBCheckState(proto, hwnd, IDC_SECURE, FACEBOOK_KEY_FORCE_HTTPS); - StoreDBCheckState(proto, hwnd, IDC_LOGGING, FACEBOOK_KEY_LOGGING_ENABLE); StoreDBCheckState(proto, hwnd, IDC_SECURE_CHANNEL, FACEBOOK_KEY_FORCE_HTTPS_CHANNEL); StoreDBCheckState(proto, hwnd, IDC_DISCONNECT_CHAT, FACEBOOK_KEY_DISCONNECT_CHAT); StoreDBCheckState(proto, hwnd, IDC_MAP_STATUSES, FACEBOOK_KEY_MAP_STATUSES); diff --git a/protocols/FacebookRM/src/resource.h b/protocols/FacebookRM/src/resource.h index c505455ec7..ff12fa5cd8 100644 --- a/protocols/FacebookRM/src/resource.h +++ b/protocols/FacebookRM/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. -// Used by D:\Development\Miranda NG\protocols\FacebookRM\res\facebook.rc +// Used by ..\res\facebook.rc // #define IDC_EXPAND 3 #define IDI_FACEBOOK 101 -- cgit v1.2.3