VKontakte:

move GetAttachmentDescr to misc.cpp
add ‘View settings’ option page and more options for view attachments, news and notification in message log 
code cleanup and reorganization
version bump 


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

1 files changed, 43 insertions, 21 deletions

diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index 876a6666dd..892a0f6997 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -44,6 +44,14 @@ IDI_BROADCAST           ICON                    "broadcast.ico"
 #ifdef APSTUDIO_INVOKED

 GUIDELINES DESIGNINFO

 BEGIN

+    IDD_OPT_VIEW, DIALOG

+    BEGIN

+        LEFTMARGIN, 4

+        RIGHTMARGIN, 298

+        TOPMARGIN, 7

+        BOTTOMMARGIN, 124

+    END

+

     IDD_OPT_FEEDS, DIALOG

     BEGIN

         LEFTMARGIN, 4

@@ -63,7 +71,7 @@ BEGIN
         LEFTMARGIN, 4

         RIGHTMARGIN, 297

         TOPMARGIN, 7

-        BOTTOMMARGIN, 181

+        BOTTOMMARGIN, 157

     END

 

     IDD_OPT_MAIN, DIALOG

@@ -104,7 +112,27 @@ END
 // Dialog

 //

 

-IDD_OPT_FEEDS DIALOGEX 0, 0, 309, 122

+IDD_OPT_VIEW DIALOGEX 0, 0, 304, 131

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

+    GROUPBOX        "[img] BBCode support for image ",IDC_STATIC,4,8,293,39

+    CONTROL         "off",IDC_IMG_OFF,"Button",BS_AUTORADIOBUTTON,12,19,129,10

+    CONTROL         "for original size images",IDC_IMG_FULLSIZE,"Button",BS_AUTORADIOBUTTON,12,30,129,10

+    CONTROL         "for preview max 130px*130px",IDC_IMG_130,"Button",BS_AUTORADIOBUTTON,154,19,129,10

+    CONTROL         "for preview max 604px*604px",IDC_IMG_604,"Button",BS_AUTORADIOBUTTON,154,30,129,10

+    GROUPBOX        "BBCode support on news and event notifications",IDC_STATIC,4,50,294,38

+    CONTROL         "off",IDC_NEWSBBC_OFF,"Button",BS_AUTORADIOBUTTON,12,61,129,10

+    CONTROL         "basic ([b], [i], [u], [s]) ",IDC_NEWSBBC_BASIC,"Button",BS_AUTORADIOBUTTON,12,72,129,10

+    CONTROL         "advanced (+[url], [size], [color])",IDC_NEWSBBC_ADV,

+                    "Button",BS_AUTORADIOBUTTON,154,61,129,10

+    GROUPBOX        "Other",IDC_STATIC,4,90,293,26

+    CONTROL         "Process stickers as smileys",IDC_STICKERS_AS_SMYLES,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,101,278,10

+END

+

+IDD_OPT_FEEDS DIALOGEX 0, 0, 304, 122

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

@@ -121,8 +149,6 @@ BEGIN
     CONTROL         "",IDC_SPIN_INT_NOTIF,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,230,67,14,14

     CONTROL         "Special contact always enabled",IDC_SPEC_CONT_ENBL,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,81,278,10

-    CONTROL         "BBCode support on news and event notifications",IDC_BBC_NEWS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,92,278,10

 END

 

 IDD_ACCMGRUI DIALOGEX 0, 0, 186, 68

@@ -137,33 +163,29 @@ BEGIN
     CONTROL         "Open VKontakte site",IDC_URL,"Hyperlink",WS_TABSTOP,0,49,174,12

 END

 

-IDD_OPT_ADV DIALOGEX 0, 0, 304, 191

+IDD_OPT_ADV DIALOGEX 0, 0, 304, 167

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "Advanced",IDC_STATIC,4,8,293,69

+    GROUPBOX        "Advanced",IDC_STATIC,4,8,293,48

     CONTROL         "Hide chats on startup",IDC_HIDECHATS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,19,278,10

     CONTROL         "Always notify as unread for all incoming message",IDC_MESASUREAD,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,30,278,10

-    CONTROL         "Add [img] BBCode for graphical attachments",IDC_ADD_IMG_BBC,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,41,278,10

-    CONTROL         "Process stickers as smileys",IDC_STICKERS_AS_SMYLES,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,52,278,10

     CONTROL         "Force online status upon user activity",IDC_FORCE_ONLINE_ON_ACT,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,63,278,10

-    GROUPBOX        "When I ban user...",IDC_STATIC,4,80,293,33

-    CONTROL         "Report abuse",IDC_REPORT_ABUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,90,129,10

-    CONTROL         "Clear server history",IDC_CLEAR_SERVER_HISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,101,129,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,41,278,10

+    GROUPBOX        "When I ban user...",IDC_STATIC,4,58,293,33

+    CONTROL         "Report abuse",IDC_REPORT_ABUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,68,129,10

+    CONTROL         "Clear server history",IDC_CLEAR_SERVER_HISTORY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,79,129,10

     CONTROL         "Remove from friend list",IDC_REMOVE_FROM_FRENDLIST,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,90,141,10

-    CONTROL         "Remove from contact list",IDC_REMOVE_FROM_CLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,101,141,10

-    GROUPBOX        "Broadcast music...",IDC_STATIC_SEND_MUSIC_METOD,4,116,293,58,WS_GROUP

-    CONTROL         "off",IDC_SEND_MUSIC_NONE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,127,278,10

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,68,141,10

+    CONTROL         "Remove from contact list",IDC_REMOVE_FROM_CLIST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,79,141,10

+    GROUPBOX        "Broadcast music...",IDC_STATIC_SEND_MUSIC_METOD,4,94,293,58,WS_GROUP

+    CONTROL         "off",IDC_SEND_MUSIC_NONE,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,105,278,10

     CONTROL         "as regular status for unknown music and audio status otherwise",IDC_SEND_MUSIC_BROADCAST_AND_STATUS,

-                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,138,278,11

-    CONTROL         "as audio status only",IDC_SEND_MUSIC_BROADCAST,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,149,278,10

-    CONTROL         "as regular status only",IDC_SEND_MUSIC_STATUS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,160,278,10

+                    "Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,116,278,11

+    CONTROL         "as audio status only",IDC_SEND_MUSIC_BROADCAST,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,127,278,10

+    CONTROL         "as regular status only",IDC_SEND_MUSIC_STATUS,"Button",BS_AUTORADIOBUTTON | WS_TABSTOP,12,138,278,10

 END

 

 IDD_OPT_MAIN DIALOGEX 0, 0, 304, 213