options page added

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

8 files changed, 32 insertions, 13 deletions

diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index 8e9ae7568f..ed6b590faa 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -35,6 +35,18 @@ BEGIN
     CONTROL         "Open VK site",IDC_URL,"Hyperlink",WS_TABSTOP,7,49,174,12

 END

 

+IDD_OPT_MAIN DIALOGEX 0, 0, 186, 68

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+EXSTYLE WS_EX_CONTROLPARENT

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

+BEGIN

+    LTEXT           "Your login or phone number:",IDC_STATIC,0,0,53,23

+    EDITTEXT        IDC_LOGIN,54,8,131,12,ES_AUTOHSCROLL

+    LTEXT           "Password:",IDC_STATIC,0,28,53,13

+    EDITTEXT        IDC_PASSWORD,54,27,131,12,ES_PASSWORD | ES_AUTOHSCROLL

+    CONTROL         "Open VK site",IDC_URL,"Hyperlink",WS_TABSTOP,7,49,174,12

+END

+

 IDD_CAPTCHAFORM DIALOGEX 0, 0, 258, 224

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

 EXSTYLE WS_EX_CONTROLPARENT

@@ -74,6 +86,12 @@ BEGIN
         LEFTMARGIN, 7

         TOPMARGIN, 7

     END

+

+	IDD_OPT_MAIN, DIALOG

+    BEGIN

+        LEFTMARGIN, 7

+        TOPMARGIN, 7

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h
index 0c1fe3cc33..4c42557a15 100644
--- a/protocols/VKontakte/src/resource.h
+++ b/protocols/VKontakte/src/resource.h
@@ -4,7 +4,8 @@
 //

 #define IDD_ACCMGRUI                    101

 #define IDD_CAPTCHAFORM                 102

-#define IDI_KEYS                        103

+#define IDD_OPT_MAIN                    103

+#define IDI_KEYS                        203

 #define IDC_LOGIN                       1001

 #define IDC_PASSWORD                    1002

 #define IDC_URL                         1003

diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h
index 6cdcc75c3a..247b6da7f6 100644
--- a/protocols/VKontakte/src/version.h
+++ b/protocols/VKontakte/src/version.h
@@ -4,14 +4,8 @@
 #define __BUILD_NUM              2

 

 #define __FILEVERSION_STRING     __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM

-#define __FILEVERSION_DOTS       __MAJOR_VERSION.__MINOR_VERSION.__RELEASE_NUM.__BUILD_NUM

 

-#define __STRINGIFY_IMPL(x)      #x

-#define __STRINGIFY(x)           __STRINGIFY_IMPL(x)

-#define __VERSION_STRING         __STRINGIFY(__FILEVERSION_DOTS)

-

-#define __PLUGIN_NAME            "VKontakte"

-#define __INTERNAL_NAME          "VKontakte"

+#define __PLUGIN_NAME            "VKontakte protocol"

 #define __FILENAME               "VKontakte.dll"

 #define __DESCRIPTION            "VKontakte protocol support for Miranda NG."

 #define __AUTHOR                 "Miranda NG Team"

diff --git a/protocols/VKontakte/src/vk_options.cpp b/protocols/VKontakte/src/vk_options.cpp
index 27d4a902f4..1027af3508 100644
--- a/protocols/VKontakte/src/vk_options.cpp
+++ b/protocols/VKontakte/src/vk_options.cpp
@@ -109,8 +109,8 @@ int CVkProto::OnOptionsInit(WPARAM wParam, LPARAM lParam)
 	odp.position    = 1;

 	odp.ptszGroup   = LPGENT("Network");

 	odp.ptszTab     = LPGENT("Account");

-	odp.pszTemplate = 0; // MAKEINTRESOURCEA(IDD_OPTIONS);

-	odp.pfnDlgProc  = 0; // OptionsProc;

+	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MAIN);

+	odp.pfnDlgProc  = VKAccountProc;

 	Options_AddPage(wParam, &odp);

 	return 0;

 }

diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp
index 3ae5ff7258..a9d493ccc5 100644
--- a/protocols/VKontakte/src/vk_proto.cpp
+++ b/protocols/VKontakte/src/vk_proto.cpp
@@ -30,6 +30,8 @@ CVkProto::CVkProto(const char *szModuleName, const TCHAR *ptszUserName) :
 	CreateProtoService(PS_GETAVATARINFOT, &CVkProto::SvcGetAvatarInfo);

 	CreateProtoService(PS_GETAVATARCAPS,  &CVkProto::SvcGetAvatarCaps);

 

+	HookProtoEvent(ME_OPT_INITIALISE, &CVkProto::OnOptionsInit);

+

 	TCHAR descr[512];

 	mir_sntprintf(descr, SIZEOF(descr), TranslateT("%s server connection"), m_tszUserName);

 

diff --git a/protocols/VKontakte/vk_10.vcxproj.filters b/protocols/VKontakte/vk_10.vcxproj.filters
index fa0daf6a28..a0612f1dc5 100644
--- a/protocols/VKontakte/vk_10.vcxproj.filters
+++ b/protocols/VKontakte/vk_10.vcxproj.filters
@@ -44,9 +44,6 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="src\resource.h">

-      <Filter>Header Files</Filter>

-    </ClInclude>

     <ClInclude Include="src\version.h">

       <Filter>Header Files</Filter>

     </ClInclude>

@@ -59,6 +56,9 @@
     <ClInclude Include="src\vk_proto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\version.rc">

diff --git a/protocols/VKontakte/vk_11.vcxproj b/protocols/VKontakte/vk_11.vcxproj
index 3929e1d9bd..1c245f8b62 100644
--- a/protocols/VKontakte/vk_11.vcxproj
+++ b/protocols/VKontakte/vk_11.vcxproj
@@ -191,6 +191,7 @@
     <ClCompile Include="src\vk_thread.cpp" />

   </ItemGroup>

   <ItemGroup>

+    <ClInclude Include="src\resource.h" />

     <ClInclude Include="src\stdafx.h" />

     <ClInclude Include="src\version.h" />

     <ClInclude Include="src\vk.h" />

diff --git a/protocols/VKontakte/vk_11.vcxproj.filters b/protocols/VKontakte/vk_11.vcxproj.filters
index 9f8217c6ef..a0612f1dc5 100644
--- a/protocols/VKontakte/vk_11.vcxproj.filters
+++ b/protocols/VKontakte/vk_11.vcxproj.filters
@@ -56,6 +56,9 @@
     <ClInclude Include="src\vk_proto.h">

       <Filter>Header Files</Filter>

     </ClInclude>

+    <ClInclude Include="src\resource.h">

+      <Filter>Header Files</Filter>

+    </ClInclude>

   </ItemGroup>

   <ItemGroup>

     <ResourceCompile Include="res\version.rc">