VKontakte:

add ‘Mark notification as viewed on receive’ option 
version bump


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

1 files changed, 24 insertions, 23 deletions

diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index a883513268..ad446b8f81 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -59,7 +59,7 @@ BEGIN
         LEFTMARGIN, 4

         RIGHTMARGIN, 297

         TOPMARGIN, 7

-        BOTTOMMARGIN, 222

+        BOTTOMMARGIN, 227

     END

 

     IDD_ACCMGRUI, DIALOG

@@ -149,12 +149,12 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,278,10

 END

 

-IDD_OPT_FEEDS DIALOGEX 0, 0, 304, 230

+IDD_OPT_FEEDS DIALOGEX 0, 0, 304, 235

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    GROUPBOX        "News and event notifications",IDC_STATIC,4,8,293,90

+    GROUPBOX        "News and event notifications",IDC_STATIC,4,8,293,98

     CTEXT           "WARNING: Causes excessive network traffic!!!",IDC_STATIC,12,18,278,8

     CONTROL         "Enable news feeds",IDC_NEWS_ENBL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,29,169,10

     LTEXT           "Interval for news updates (min):",IDC_STATIC,16,40,169,8

@@ -164,27 +164,29 @@ BEGIN
     LTEXT           "Interval for notification updates (min):",IDC_STATIC,16,62,169,8

     EDITTEXT        IDC_ED_INT_NOTIF,190,57,40,14,ES_RIGHT | ES_AUTOHSCROLL | ES_NUMBER

     CONTROL         "",IDC_SPIN_INT_NOTIF,"msctls_updown32",UDS_SETBUDDYINT | UDS_ALIGNRIGHT | UDS_AUTOBUDDY | UDS_ARROWKEYS,230,57,14,14

+    CONTROL         "Mark notification as viewed on receive",IDC_NOTIF_MARK_VIEWED,

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

     CONTROL         "Special contact always enabled",IDC_SPEC_CONT_ENBL,

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

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

     CONTROL         "Autoclear news and notification history",IDC_NEWSAUTOCLEAR,

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

-    GROUPBOX        "News types",IDC_STATIC,4,98,293,35

-    CONTROL         "Wall posts",IDC_F_POSTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,109,129,10

-    CONTROL         "Photos",IDC_F_PHOTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,120,129,10

-    CONTROL         "Photos tags",IDC_F_TAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,109,129,10

-    CONTROL         "Wall photos",IDC_F_WALLPHOTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,120,129,10

-    GROUPBOX        "News sources",IDC_STATIC,4,134,293,46

-    CONTROL         "Friends",IDC_S_FRIENDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,145,129,10

-    CONTROL         "Groups",IDC_S_GROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,156,129,10

-    CONTROL         "Include banned sources",IDC_S_BANNED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,167,129,10

-    CONTROL         "Pages",IDC_S_PAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,145,129,10

-    CONTROL         "Subscriptions to users",IDC_S_FOLLOWING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,156,129,10

-    CONTROL         "No reposts",IDC_S_NOREPOSTES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,167,129,10

-    GROUPBOX        "Notifications types",IDC_STATIC,4,181,293,36

-    CONTROL         "Comments",IDC_N_COMMENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,192,129,10

-    CONTROL         "Likes",IDC_N_LIKES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,203,129,10

-    CONTROL         "Reposts",IDC_N_REPOSTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,192,129,10

-    CONTROL         "Mentions in comments",IDC_N_MENTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,203,129,10

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

+    GROUPBOX        "News types",IDC_STATIC,4,106,293,35

+    CONTROL         "Wall posts",IDC_F_POSTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,117,129,10

+    CONTROL         "Photos",IDC_F_PHOTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,128,129,10

+    CONTROL         "Photos tags",IDC_F_TAGS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,117,129,10

+    CONTROL         "Wall photos",IDC_F_WALLPHOTOS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,128,129,10

+    GROUPBOX        "News sources",IDC_STATIC,4,142,293,46

+    CONTROL         "Friends",IDC_S_FRIENDS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,153,129,10

+    CONTROL         "Groups",IDC_S_GROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,166,129,10

+    CONTROL         "Include banned sources",IDC_S_BANNED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,175,129,10

+    CONTROL         "Pages",IDC_S_PAGES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,153,129,10

+    CONTROL         "Subscriptions to users",IDC_S_FOLLOWING,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,164,129,10

+    CONTROL         "No reposts",IDC_S_NOREPOSTES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,175,129,10

+    GROUPBOX        "Notifications types",IDC_STATIC,4,189,293,36

+    CONTROL         "Comments",IDC_N_COMMENTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,200,129,10

+    CONTROL         "Likes",IDC_N_LIKES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,211,129,10

+    CONTROL         "Reposts",IDC_N_REPOSTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,200,129,10

+    CONTROL         "Mentions in comments",IDC_N_MENTIONS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,154,211,129,10

 END

 

 IDD_ACCMGRUI DIALOGEX 0, 0, 186, 68

@@ -302,7 +304,6 @@ END
 

 IDD_WALLPOST DIALOGEX 0, 0, 316, 144

 STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION ""

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

 BEGIN

     DEFPUSHBUTTON   "Share",IDOK,205,123,50,14