Facebook: Rework options; Add new option to disable multi chats support

git-svn-id: http://svn.miranda-ng.org/main/trunk@11182 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 66 insertions, 40 deletions

diff --git a/protocols/FacebookRM/res/facebook.rc b/protocols/FacebookRM/res/facebook.rc
index fdb94969ac..a7eb8de43e 100644
--- a/protocols/FacebookRM/res/facebook.rc
+++ b/protocols/FacebookRM/res/facebook.rc
@@ -101,7 +101,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,110,94,44,15

 END

 

-IDD_OPTIONS DIALOGEX 0, 0, 305, 146

+IDD_OPTIONS DIALOGEX 0, 0, 305, 190

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

@@ -113,12 +113,16 @@ BEGIN
     EDITTEXT        IDC_PW,84,33,123,13,ES_PASSWORD | ES_AUTOHSCROLL

     CONTROL         "Create a new Facebook account",IDC_NEWACCOUNTLINK,

                     "Hyperlink",WS_TABSTOP,84,52,189,10

-    GROUPBOX        "Contacts Settings",IDC_STATIC,7,72,291,60

-    LTEXT           "Default group:",IDC_STATIC,17,85,61,8,0,WS_EX_RIGHT

-    EDITTEXT        IDC_GROUP,84,84,123,13,ES_AUTOHSCROLL

+	GROUPBOX        "Network", IDC_STATIC, 7, 72, 291, 42

+	CONTROL         "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,85,281,10

+    CONTROL         "Use secure connection also for channel requests",IDC_SECURE_CHANNEL,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,31,99,262,10

+    GROUPBOX        "Contacts",IDC_STATIC,7,120,291,60

+    LTEXT           "Default group:",IDC_STATIC,17,133,61,8,0,WS_EX_RIGHT

+    EDITTEXT        IDC_GROUP,84,131,123,13,ES_AUTOHSCROLL

     CONTROL         "Automatically set 'Ignore status change' flag",IDC_SET_IGNORE_STATUS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,101,271,10

-    CONTROL         "Use bigger avatars",IDC_BIGGER_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,114,271,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,149,271,10

+    CONTROL         "Use bigger avatars",IDC_BIGGER_AVATARS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,162,271,10

 END

 

 IDD_OPTIONS_EVENTS DIALOGEX 0, 0, 305, 185

@@ -134,50 +138,29 @@ BEGIN
     COMBOBOX        IDC_FEED_TYPE,150,49,138,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

     CONTROL         "Don't show advertising posts",IDC_FILTER_ADS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,150,67,138,8

     CONTROL         "Other events",IDC_OTHER_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,79,272,8

-    CONTROL         "Client notifications",IDC_CLIENT_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,95,272,8    

+    CONTROL         "Client notifications",IDC_CLIENT_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,95,272,8

     CONTROL         "Use balloon notifications in system tray instead of popups",IDC_SYSTRAY_NOTIFY,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,121,272,8

     CONTROL         "Use logging notifications into special chatroom",IDC_NOTIFICATIONS_CHATROOM,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,138,272,8

-	PUSHBUTTON      "Preview",IDC_PREVIEW,116,156,68,14

+    PUSHBUTTON      "Preview",IDC_PREVIEW,116,156,68,14

 END

 

-IDD_OPTIONS_ADVANCED DIALOGEX 0, 0, 308, 242

+IDD_OPTIONS_STATUSES DIALOGEX 0, 0, 308, 226

 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,294,104

-    CONTROL         "Force secure (HTTPS) connection",IDC_SECURE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,22,281,10

-    CONTROL         "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,13,44,281,10

-    CONTROL         "Use secure connection also for channel requests",IDC_SECURE_CHANNEL,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,32,33,262,10

+    GROUPBOX        "Statuses",IDC_STATIC,7,7,294,91

+    CONTROL         "Post Miranda statuses to Wall",IDC_SET_STATUS,"Button",BS_AUTOCHECKBOX | BS_TOP | WS_TABSTOP,13,21,281,10

     CONTROL         "Turn off chat on Facebook when going to offline in Miranda",IDC_DISCONNECT_CHAT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,55,281,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,34,281,10

     CONTROL         "Map unsupported statuses to Invisible (instead of Online)",IDC_MAP_STATUSES,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,67,281,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,47,281,10

     CONTROL         "Allow posting statuses to my pages (may slow down login)",IDC_LOAD_PAGES,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,79,281,10

-    RTEXT           "Use this server for opening links:",IDC_STATIC,13,94,139,8

-    COMBOBOX        IDC_URL_SERVER,156,91,138,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    CONTROL         "Show stickers as custom smileys (EXPERIMENTAL)",IDC_CUSTOM_SMILEYS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,129,281,10

-    CONTROL         "Use local time for received messages",IDC_USE_LOCAL_TIME,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,142,281,10

-    GROUPBOX        "Message sessions",IDC_STATIC,7,114,294,126

-    CONTROL         "Keep messages as unread on server (don't send ""seen"" info)",IDC_KEEP_UNREAD,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,155,281,10

-    CONTROL         "Receive messages from ""inbox"" folder only",IDC_INBOX_ONLY,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,168,281,10

-    CONTROL         "Load last messages on opening message window (EXPERIMENTAL)",IDC_MESSAGES_ON_OPEN,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,181,281,10

-    RTEXT           "Number of messages to load:",IDC_STATIC,13,195,231,8

-    EDITTEXT        IDC_MESSAGES_COUNT,249,192,34,14,ES_AUTOHSCROLL

-    CONTROL         "",IDC_MESSAGES_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,283,192,11,14

-    CONTROL         "Do not open chat windows on creation",IDC_HIDE_CHATS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,225,281,10

-    CONTROL         "Synchronize last 24 hours on login",IDC_LOGIN_SYNC,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,212,281,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,61,281,10

+    RTEXT           "Use this server for opening links:",IDC_STATIC,13,77,139,8

+    COMBOBOX        IDC_URL_SERVER,156,74,138,59,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

 END

 

 IDD_CAPTCHAFORM DIALOGEX 0, 0, 258, 224

@@ -196,6 +179,35 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,200,203,50,14

 END

 

+IDD_OPTIONS_MESSAGING DIALOGEX 0, 0, 308, 226

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

+FONT 8, "MS Shell Dlg", 400, 0, 0x1

+BEGIN

+    GROUPBOX        "Messages",IDC_STATIC,7,7,294,70

+	CONTROL         "Receive messages from ""inbox"" folder only",IDC_INBOX_ONLY,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,19,281,10

+	CONTROL         "Use local time for received messages", IDC_USE_LOCAL_TIME,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 33, 281, 10

+    CONTROL         "Keep messages as unread on server (don't send ""seen"" info)",IDC_KEEP_UNREAD,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,47,281,10

+	CONTROL         "Show stickers as custom smileys (EXPERIMENTAL)", IDC_CUSTOM_SMILEYS,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 61, 281, 10

+	GROUPBOX        "Multi user chats", IDC_STATIC, 7, 83, 294, 43

+	CONTROL         "Enable multi user chats support", IDC_ENABLE_CHATS,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 96, 281, 10

+	CONTROL         "Do not open chat windows on creation", IDC_HIDE_CHATS,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 110, 281, 10

+	GROUPBOX        "History synchronization", IDC_STATIC, 7, 134, 294, 59

+	CONTROL         "Load last messages (24 hours old) on login (EXPERIMENTAL)", IDC_LOGIN_SYNC,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 148, 281, 10

+	CONTROL         "Load last messages on opening message window (EXPERIMENTAL)", IDC_MESSAGES_ON_OPEN,

+					"Button", BS_AUTOCHECKBOX | WS_TABSTOP, 13, 162, 281, 10

+	RTEXT           "Number of messages to load:", IDC_STATIC, 13, 176, 231, 8

+    EDITTEXT        IDC_MESSAGES_COUNT,249,173,34,14,ES_AUTOHSCROLL

+    CONTROL         "",IDC_MESSAGES_COUNT_SPIN,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,283,173,11,14

+END

+

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -237,13 +249,14 @@ BEGIN
     BEGIN

         LEFTMARGIN, 7

         VERTGUIDE, 17

+        VERTGUIDE, 31

         VERTGUIDE, 78

         VERTGUIDE, 84

         VERTGUIDE, 207

         VERTGUIDE, 288

         VERTGUIDE, 298

         TOPMARGIN, 7

-        BOTTOMMARGIN, 139

+        BOTTOMMARGIN, 183

     END

 

     IDD_OPTIONS_EVENTS, DIALOG

@@ -257,7 +270,20 @@ BEGIN
         BOTTOMMARGIN, 177

     END

 

-    IDD_OPTIONS_ADVANCED, DIALOG

+    IDD_OPTIONS_STATUSES, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        RIGHTMARGIN, 301

+        VERTGUIDE, 13

+        VERTGUIDE, 32

+        VERTGUIDE, 152

+        VERTGUIDE, 156

+        VERTGUIDE, 294

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 224

+    END

+

+    IDD_OPTIONS_MESSAGING, DIALOG

     BEGIN

         LEFTMARGIN, 7

         RIGHTMARGIN, 301

@@ -267,7 +293,7 @@ BEGIN
         VERTGUIDE, 156

         VERTGUIDE, 294

         TOPMARGIN, 7

-        BOTTOMMARGIN, 240

+        BOTTOMMARGIN, 224

     END

 END

 #endif    // APSTUDIO_INVOKED