From 501c0e1dbdcf7f7f1b52168439658ecfe500ed14 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Sun, 5 Oct 2014 16:08:00 +0000 Subject: Tox: worked profile encryption git-svn-id: http://svn.miranda-ng.org/main/trunk@10702 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- protocols/Tox/res/resource.rc | 37 ++++++++++++++++++------------------- protocols/Tox/src/tox_options.cpp | 4 ++-- 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc index b1628090db..a01dba23c3 100644 --- a/protocols/Tox/res/resource.rc +++ b/protocols/Tox/res/resource.rc @@ -84,15 +84,15 @@ 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,8,54,12 - EDITTEXT IDC_NAME,66,7,120,12,ES_AUTOHSCROLL - LTEXT "Tox ID:",IDC_STATIC,12,24,54,12 - EDITTEXT IDC_TOXID,66,23,100,12,ES_AUTOHSCROLL | ES_READONLY - LTEXT "Default group:",IDC_STATIC,12,40,54,12 - EDITTEXT IDC_GROUP,66,39,120,12,ES_AUTOHSCROLL - PUSHBUTTON "C",IDC_CLIPBOARD,170,22,16,13 - LTEXT "Password:",IDC_STATIC,12,56,35,8,NOT WS_VISIBLE - EDITTEXT IDC_PASSWORD,67,54,119,14,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE + 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 END IDD_OPTIONS_MAIN DIALOGEX 0, 0, 312, 234 @@ -100,20 +100,20 @@ 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,20,61,12 - EDITTEXT IDC_NAME,81,19,219,12,ES_AUTOHSCROLL - LTEXT "Tox ID:",IDC_STATIC,12,36,61,12 - EDITTEXT IDC_TOXID,81,35,199,12,ES_AUTOHSCROLL | ES_READONLY + LTEXT "Name:",IDC_STATIC,12,35,69,11 + EDITTEXT IDC_NAME,81,33,219,12,ES_AUTOHSCROLL + LTEXT "Tox ID:",IDC_STATIC,12,19,69,11 + EDITTEXT IDC_TOXID,81,17,199,12,ES_AUTOHSCROLL | ES_READONLY GROUPBOX "Connection settings",IDC_STATIC,7,89,298,45 CONTROL "Disable UDP (force Tox to use TCP)",IDC_DISABLE_UDP, "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,101,288,10 CONTROL "Disable IPv6",IDC_DISABLE_IPV6,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,116,288,10 GROUPBOX "Tox",IDC_STATIC,7,7,298,77 - LTEXT "Default group:",IDC_STATIC,12,53,60,12 - EDITTEXT IDC_GROUP,81,51,219,12,ES_AUTOHSCROLL - PUSHBUTTON "C",IDC_CLIPBOARD,284,35,16,13 - LTEXT "Password:",IDC_STATIC,12,68,35,8,NOT WS_VISIBLE - EDITTEXT IDC_PASSWORD,81,66,219,14,ES_PASSWORD | ES_AUTOHSCROLL | NOT WS_VISIBLE + LTEXT "Default group:",IDC_STATIC,12,68,69,12 + EDITTEXT IDC_GROUP,81,65,219,12,ES_AUTOHSCROLL + PUSHBUTTON "C",IDC_CLIPBOARD,284,17,16,13 + LTEXT "Password:",IDC_STATIC,12,51,69,8 + EDITTEXT IDC_PASSWORD,81,49,219,12,ES_PASSWORD | ES_AUTOHSCROLL END IDD_PROFILE_IMPORT DIALOGEX 0, 0, 239, 87 @@ -174,7 +174,6 @@ BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 305 VERTGUIDE, 12 - VERTGUIDE, 73 VERTGUIDE, 81 VERTGUIDE, 280 VERTGUIDE, 284 diff --git a/protocols/Tox/src/tox_options.cpp b/protocols/Tox/src/tox_options.cpp index 934f0b9ba1..0cc3f16297 100644 --- a/protocols/Tox/src/tox_options.cpp +++ b/protocols/Tox/src/tox_options.cpp @@ -28,8 +28,8 @@ INT_PTR CToxProto::MainOptionsProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM l SetDlgItemText(hwnd, IDC_GROUP, group); SendDlgItemMessage(hwnd, IDC_GROUP, EM_LIMITTEXT, 64, 0); - CheckDlgButton(hwnd, IDC_DISABLE_UDP, proto->getByte("DisableUDP", 0)); - CheckDlgButton(hwnd, IDC_DISABLE_IPV6, proto->getByte("DisableIPv6", 1)); + CheckDlgButton(hwnd, IDC_DISABLE_UDP, proto->getBool("DisableUDP", 0)); + CheckDlgButton(hwnd, IDC_DISABLE_IPV6, proto->getBool("DisableIPv6", 0)); } return TRUE; -- cgit v1.2.3