Tox:

- switched to new api
- updated tox core

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

1 files changed, 29 insertions, 35 deletions

diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc
index 1f607c2aae..f6fc1c7c96 100644
--- a/protocols/Tox/res/resource.rc
+++ b/protocols/Tox/res/resource.rc
@@ -79,22 +79,23 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
 // Dialog

 //

 

-IDD_ACCOUNT_MANAGER DIALOGEX 0, 0, 199, 119

+IDD_ACCOUNT_MANAGER DIALOGEX 0, 0, 186, 119

 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU

 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    LTEXT           "Name:",IDC_STATIC,12,24,54,12

-    EDITTEXT        IDC_NAME,66,23,120,12,ES_AUTOHSCROLL

-    LTEXT           "Password:",IDC_STATIC,12,40,54,12

-    EDITTEXT        IDC_TOXID,66,7,100,12,ES_AUTOHSCROLL | ES_READONLY

-    LTEXT           "Default group:",IDC_STATIC,12,56,54,12

-    EDITTEXT        IDC_GROUP,66,54,120,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "C",IDC_CLIPBOARD,170,7,16,13

-    LTEXT           "Tox ID:",IDC_STATIC,12,9,54,8

-    EDITTEXT        IDC_PASSWORD,66,38,120,12,ES_PASSWORD | ES_AUTOHSCROLL

-    PUSHBUTTON      "Import tox profile",IDC_IMPORT_PROFILE,66,72,100,14,WS_DISABLED

-    LTEXT           "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,12,91,174,21

+    LTEXT           "Tox ID:",IDC_STATIC,0,5,49,8

+    EDITTEXT        IDC_PASSWORD,49,52,135,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE | WS_DISABLED

+    PUSHBUTTON      "Create",IDC_PROFILE_NEW,49,19,65,13

+    PUSHBUTTON      "Import",IDC_PROFILE_IMPORT,120,19,65,13

+    PUSHBUTTON      "Copy ID",IDC_CLIPBOARD,49,19,65,13,NOT WS_VISIBLE

+    PUSHBUTTON      "Export",IDC_PROFILE_EXPORT,120,19,65,13,NOT WS_VISIBLE

+    LTEXT           "Name:",IDC_STATIC,0,38,49,12

+    EDITTEXT        IDC_NAME,49,36,135,12,ES_AUTOHSCROLL | WS_DISABLED

+    LTEXT           "Password:",IDC_STATIC,0,54,49,12,NOT WS_VISIBLE

+    EDITTEXT        IDC_TOXID,49,3,135,12,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED

+    LTEXT           "Default group:",IDC_STATIC,0,70,49,12

+    EDITTEXT        IDC_GROUP,49,68,135,12,ES_AUTOHSCROLL

 END

 

 IDD_OPTIONS_MAIN DIALOGEX 0, 0, 310, 230

@@ -102,22 +103,23 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_SYSMENU
 EXSTYLE WS_EX_CONTROLPARENT

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

 BEGIN

-    LTEXT           "Name:",IDC_STATIC,12,33,69,11

-    EDITTEXT        IDC_NAME,81,31,217,12,ES_AUTOHSCROLL

+    GROUPBOX        "Tox",IDC_STATIC,7,7,296,116

     LTEXT           "Tox ID:",IDC_STATIC,12,17,69,11

-    EDITTEXT        IDC_TOXID,81,15,195,12,ES_AUTOHSCROLL | ES_READONLY

+    EDITTEXT        IDC_TOXID,81,15,217,12,ES_AUTOHSCROLL | ES_READONLY | WS_DISABLED

+    LTEXT           "Name:",IDC_STATIC,12,48,69,11

+    EDITTEXT        IDC_NAME,81,46,217,12,ES_AUTOHSCROLL | WS_DISABLED

+    LTEXT           "Password:",IDC_STATIC,12,63,69,8,NOT WS_VISIBLE

+    EDITTEXT        IDC_PASSWORD,81,62,217,12,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE | WS_DISABLED

+    LTEXT           "Default group:",IDC_STATIC,12,80,69,12

+    EDITTEXT        IDC_GROUP,81,78,217,12,ES_AUTOHSCROLL

+    PUSHBUTTON      "Create tox profile",IDC_PROFILE_NEW,81,30,107,13

+    PUSHBUTTON      "Import tox profile",IDC_PROFILE_IMPORT,191,30,107,13

+    PUSHBUTTON      "Copy Tox ID",IDC_CLIPBOARD,81,30,107,13,NOT WS_VISIBLE

+    PUSHBUTTON      "Export tox profile",IDC_PROFILE_EXPORT,191,30,107,13,NOT WS_VISIBLE

     GROUPBOX        "Connection settings",IDC_STATIC,7,123,296,40

-    CONTROL         "Disable UDP (force Tox to use TCP)",IDC_DISABLE_UDP,

+    CONTROL         "Enable UDP (otherwise force Tox to use TCP)",IDC_ENABLE_UDP,

                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,135,286,10

-    CONTROL         "Disable IPv6",IDC_DISABLE_IPV6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,286,10

-    GROUPBOX        "Tox",IDC_STATIC,7,2,296,122

-    LTEXT           "Default group:",IDC_STATIC,12,66,69,12

-    EDITTEXT        IDC_GROUP,81,63,217,12,ES_AUTOHSCROLL

-    PUSHBUTTON      "C",IDC_CLIPBOARD,282,15,16,13

-    LTEXT           "Password:",IDC_STATIC,12,49,69,8

-    EDITTEXT        IDC_PASSWORD,81,47,217,12,ES_PASSWORD | ES_AUTOHSCROLL

-    PUSHBUTTON      "Import tox profile",IDC_IMPORT_PROFILE,81,78,100,14,WS_DISABLED

-    LTEXT           "Tox profile contains your ID and friend list.\r\nYou may import existing profile from other tox client.",IDC_STATIC,81,95,217,25

+    CONTROL         "Enable IPv6",IDC_ENABLE_IPV6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,149,286,10

 END

 

 IDD_SEARCH DIALOGEX 0, 0, 109, 113

@@ -214,15 +216,9 @@ GUIDELINES DESIGNINFO
 BEGIN

     IDD_ACCOUNT_MANAGER, DIALOG

     BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 192

-        VERTGUIDE, 12

-        VERTGUIDE, 66

-        VERTGUIDE, 166

-        VERTGUIDE, 170

-        VERTGUIDE, 186

-        TOPMARGIN, 7

+        VERTGUIDE, 49

         BOTTOMMARGIN, 112

+        HORZGUIDE, 19

     END

 

     IDD_OPTIONS_MAIN, DIALOG

@@ -231,8 +227,6 @@ BEGIN
         RIGHTMARGIN, 303

         VERTGUIDE, 12

         VERTGUIDE, 81

-        VERTGUIDE, 276

-        VERTGUIDE, 282

         VERTGUIDE, 298

         TOPMARGIN, 7

         BOTTOMMARGIN, 228