From c8548c468436fc3a2fccc00be9f48e6b7f0a1df2 Mon Sep 17 00:00:00 2001
From: aunsane <aunsane@gmail.com>
Date: Wed, 20 Dec 2017 22:15:46 +0300
Subject: Tox: added ability to encrypt profile

---
 protocols/Tox/res/resource.rc | 61 +++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 31 deletions(-)

(limited to 'protocols/Tox/res/resource.rc')

diff --git a/protocols/Tox/res/resource.rc b/protocols/Tox/res/resource.rc
index 478f13fe9f..3ba18ad5cb 100644
--- a/protocols/Tox/res/resource.rc
+++ b/protocols/Tox/res/resource.rc
@@ -141,17 +141,17 @@ BEGIN
     EDITTEXT        IDC_DNS_ID,2,13,217,14,ES_AUTOHSCROLL
 END
 
-IDD_PASSWORD DIALOGEX 0, 0, 209, 75
+IDD_PASSWORD_ENTER DIALOGEX 0, 0, 211, 76
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
-EXSTYLE WS_EX_TOOLWINDOW | WS_EX_APPWINDOW
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
 CAPTION "Enter password"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    EDITTEXT        IDC_PASSWORD,7,24,197,12,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Save password",IDC_SAVEPERMANENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,40,197,12
-    DEFPUSHBUTTON   "OK",IDOK,101,56,50,14,WS_DISABLED
-    PUSHBUTTON      "Cancel",IDCANCEL,154,56,50,14
-    LTEXT           "Tox profile is encrypted. Enter the password to continue.",IDC_STATIC,7,5,197,18
+    EDITTEXT        IDC_PASSWORD,7,24,199,12,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "Save password",IDC_SAVEPERMANENTLY,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,40,199,12
+    DEFPUSHBUTTON   "OK",IDOK,101,57,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,156,57,50,14
+    LTEXT           "Tox profile is encrypted. Enter the password to continue.",IDC_STATIC,7,5,199,18
 END
 
 IDD_OPTIONS_NODES DIALOGEX 0, 0, 310, 230
@@ -181,18 +181,21 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,156,97,50,14
 END
 
-IDD_OPTIONS_MULTIMEDIA DIALOGEX 0, 0, 310, 230
-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
-EXSTYLE WS_EX_CONTROLPARENT
+IDD_PASSWORD_CHANGE DIALOGEX 0, 0, 209, 112
+STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+EXSTYLE WS_EX_TOPMOST | WS_EX_TOOLWINDOW | WS_EX_CONTROLPARENT | WS_EX_APPWINDOW
+CAPTION "Change password"
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
-    GROUPBOX        "Multimedia",-1,7,7,296,89
-    LTEXT           "Audio input device",-1,12,17,60,8
-    COMBOBOX        IDC_AUDIOINPUT,12,26,286,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Audio output device",-1,12,42,65,8
-    COMBOBOX        IDC_AUDIOOUTPUT,12,52,286,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
-    LTEXT           "Video input device",-1,15,68,59,8,NOT WS_VISIBLE
-    COMBOBOX        IDC_COMBO_VIDEOINPUT,12,78,286,30,CBS_DROPDOWN | CBS_SORT | NOT WS_VISIBLE | WS_VSCROLL | WS_TABSTOP
+    EDITTEXT        IDC_PASSWORD,7,14,197,12,ES_PASSWORD | ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,101,93,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,154,93,50,14
+    EDITTEXT        IDC_PASSWORD_NEW,7,40,197,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Old password:",IDC_STATIC,7,4,197,8
+    LTEXT           "New password:",IDC_STATIC,7,30,197,8
+    EDITTEXT        IDC_PASSWORD_CONFIRM,7,65,197,12,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Confirm password:",IDC_STATIC,7,55,197,8
+    LTEXT           "",IDC_PASSWORD_VALIDATION,7,81,197,8
 END
 
 
@@ -234,11 +237,11 @@ BEGIN
         VERTGUIDE, 219
     END
 
-    IDD_PASSWORD, DIALOG
+    IDD_PASSWORD_ENTER, DIALOG
     BEGIN
-        RIGHTMARGIN, 204
+        RIGHTMARGIN, 206
         VERTGUIDE, 7
-        BOTTOMMARGIN, 70
+        BOTTOMMARGIN, 71
     END
 
     IDD_OPTIONS_NODES, DIALOG
@@ -260,15 +263,11 @@ BEGIN
         HORZGUIDE, 67
     END
 
-    IDD_OPTIONS_MULTIMEDIA, DIALOG
+    IDD_PASSWORD_CHANGE, DIALOG
     BEGIN
-        LEFTMARGIN, 7
-        RIGHTMARGIN, 303
-        VERTGUIDE, 12
-        VERTGUIDE, 81
-        VERTGUIDE, 298
-        TOPMARGIN, 7
-        BOTTOMMARGIN, 228
+        RIGHTMARGIN, 204
+        VERTGUIDE, 7
+        BOTTOMMARGIN, 107
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -279,17 +278,17 @@ END
 // AFX_DIALOG_LAYOUT
 //
 
-IDD_OPTIONS_MULTIMEDIA AFX_DIALOG_LAYOUT
+IDD_OPTIONS_MAIN AFX_DIALOG_LAYOUT
 BEGIN
     0
 END
 
-IDD_OPTIONS_MAIN AFX_DIALOG_LAYOUT
+IDD_PASSWORD_ENTER AFX_DIALOG_LAYOUT
 BEGIN
     0
 END
 
-IDD_PASSWORD AFX_DIALOG_LAYOUT
+IDD_PASSWORD_CHANGE AFX_DIALOG_LAYOUT
 BEGIN
     0
 END
-- 
cgit v1.2.3