From 4ea9a5e493c3c598da152bf2a84cbd793675daf8 Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Sat, 23 May 2020 23:14:17 +0200
Subject: [PATCH] new window for startup encryption process
---
silentdragon-lite.pro | 1 +
src/encryption.ui | 124 +++++++++++++++---------------
src/mainwindow.cpp | 3 +-
src/startupencryption.ui | 158 +++++++++++++++++++++++++++++++++------
4 files changed, 200 insertions(+), 86 deletions(-)
diff --git a/silentdragon-lite.pro b/silentdragon-lite.pro
index 7d3a281..4fe9ad0 100644
--- a/silentdragon-lite.pro
+++ b/silentdragon-lite.pro
@@ -133,6 +133,7 @@ FORMS += \
src/confirm.ui \
src/privkey.ui \
src/memodialog.ui \
+ src/startupencryption.ui \
src/viewalladdresses.ui \
src/connection.ui \
src/addressbook.ui \
diff --git a/src/encryption.ui b/src/encryption.ui
index b4ab606..27c25a0 100644
--- a/src/encryption.ui
+++ b/src/encryption.ui
@@ -13,7 +13,46 @@
Encrypt Your Wallet
-
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
+ -
+
+
+ <html><head/><body><p><span style=" font-size:14pt; color:#ef2929;">WARNING:</span> If you forget your password, the only way to recover the wallet is from the seed phrase. If you dont have Backup your seed phrase, please do it now!</p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 40
+
+
+
+
-
@@ -21,6 +60,19 @@
+ -
+
+
+ color: red;
+
+
+ Passwords don't match
+
+
+ Qt::AlignCenter
+
+
+
-
@@ -28,6 +80,13 @@
+ -
+
+
+ QLineEdit::Password
+
+
+
-
@@ -42,47 +101,14 @@
- -
-
-
- color: red;
-
-
- Passwords don't match
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- QLineEdit::Password
-
-
-
- -
+
-
Qt::Horizontal
- -
-
-
- WARNING: If you forget your password, the only way to recover the wallet is from the seed phrase.
-
-
- Qt::AlignCenter
-
-
- true
-
-
-
- -
+
-
Qt::Horizontal
@@ -95,32 +121,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 88b33dd..8985b3f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -21,6 +21,7 @@
#include "ui_requestContactDialog.h"
#include "chatmodel.h"
#include "requestdialog.h"
+#include "ui_startupencryption.h"
#include "websockets.h"
#include "sodium.h"
#include "sodium/crypto_generichash_blake2b.h"
@@ -359,7 +360,7 @@ void MainWindow::removeWalletEncryption() {
void MainWindow::removeWalletEncryptionStartUp() {
QDialog d(this);
- Ui_encryptionDialog ed;
+ Ui_startup ed;
ed.setupUi(&d);
// Handle edits on the password box
diff --git a/src/startupencryption.ui b/src/startupencryption.ui
index fb923db..6abdad1 100644
--- a/src/startupencryption.ui
+++ b/src/startupencryption.ui
@@ -1,10 +1,8 @@
-
-
-
-
- Dialog
-
-
+
+
+ startup
+
+
0
0
@@ -12,40 +10,155 @@
300
-
- Dialog
+
+ SDL Startup Decryption
-
-
+
+
- 30
- 240
+ 50
+ 260
341
32
-
+
Qt::Horizontal
-
+
QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+ 10
+ 229
+ 127
+ 25
+
+
+
+ Confirm Password:
+
+
+
+
+
+ 10
+ 166
+ 382
+ 3
+
+
+
+ Qt::Horizontal
+
+
+
+
+
+ 162
+ 229
+ 230
+ 25
+
+
+
+ QLineEdit::Password
+
+
+
+
+
+ 10
+ 58
+ 382
+ 56
+
+
+
+ <html><head/><body><p>If you have forgotten your password, restore your wallet with your seed!</p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+
+
+ 10
+ 260
+ 382
+ 3
+
+
+
+ Qt::Horizontal
+
+
+
+
+
+ 10
+ 198
+ 146
+ 25
+
+
+
+ Encryption Password:
+
+
+
+
+
+ 10
+ 175
+ 382
+ 17
+
+
+
+ color: red;
+
+
+ Passwords don't match
+
+
+ Qt::AlignCenter
+
+
+
+
+
+ 162
+ 198
+ 230
+ 25
+
+
+
+ QLineEdit::Password
+
+
-
buttonBox
accepted()
- Dialog
+ startup
accept()
-
+
248
254
-
+
157
274
@@ -54,14 +167,14 @@
buttonBox
rejected()
- Dialog
+ startup
reject()
-
+
316
260
-
+
286
274
@@ -69,4 +182,3 @@
-