From e105cee439e6bf35be294e830ff94e95eb1cb63e Mon Sep 17 00:00:00 2001
From: DenioD <41270280+DenioD@users.noreply.github.com>
Date: Wed, 3 Jun 2020 09:52:55 +0200
Subject: [PATCH] rename password to passphrase
---
src/chatmodel.cpp | 2 +-
src/mainwindow.ui | 2 +-
src/removeencryption.ui | 2 +-
src/startupencryption.ui | 142 +++++++++++++++------------------------
4 files changed, 57 insertions(+), 91 deletions(-)
diff --git a/src/chatmodel.cpp b/src/chatmodel.cpp
index 09e54f3..3d26cd1 100644
--- a/src/chatmodel.cpp
+++ b/src/chatmodel.cpp
@@ -516,7 +516,7 @@ void MainWindow::sendChat() {
QString Name = ui->contactNameMemo->text();
int sizename = Name.size();
qDebug()<< sizename;
- if (ui->contactNameMemo->text().trimmed().isEmpty() || ui->memoTxtChat->toPlainText().trimmed().isEmpty()) {
+ if ((sizename < 1) || (ui->memoTxtChat->toPlainText().trimmed().isEmpty())) {
QMessageBox msg(QMessageBox::Critical, tr("You have to select a contact and insert a Memo"),
tr("You have selected no Contact from Contactlist,\n") + tr("\nor your Memo is empty"),
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 33e2b16..10a2018 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1442,7 +1442,7 @@
460
20
- 161
+ 291
20
diff --git a/src/removeencryption.ui b/src/removeencryption.ui
index 77d7239..c29db42 100644
--- a/src/removeencryption.ui
+++ b/src/removeencryption.ui
@@ -91,7 +91,7 @@
- <html><head/><body><p><span style=" font-size:14pt; color:#ef2929;">WARNING:</span> If yo remove your encryption, all your Data is Plaintext on your Disk!</p></body></html>
+ <html><head/><body><p><span style=" font-size:14pt; color:#ef2929;">WARNING:</span> If you remove your encryption, all your transactions and Contacts are plaintext on disk! Messages are still encrypt.</p></body></html>
Qt::AlignCenter
diff --git a/src/startupencryption.ui b/src/startupencryption.ui
index 819a698..6b8d1ac 100644
--- a/src/startupencryption.ui
+++ b/src/startupencryption.ui
@@ -7,99 +7,65 @@
0
0
400
- 300
+ 177
SDL Startup Decryption
-
-
-
- 50
- 260
- 341
- 32
-
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
- 10
- 166
- 382
- 3
-
-
-
- Qt::Horizontal
-
-
-
-
-
- 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:
-
-
-
-
-
- 162
- 198
- 230
- 25
-
-
-
- QLineEdit::Password
-
-
+
+ -
+
+
+ <html><head/><body><p>If you have forgotten your passphrase restore your wallet with your seed!</p></body></html>
+
+
+ Qt::AlignCenter
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Encryption Passphrase:
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+
+
+
+