From 65379b8c063c7ff6c5e8bc84045859a7bb9ebe41 Mon Sep 17 00:00:00 2001
From: Charles <18726788+csharpee@users.noreply.github.com>
Date: Wed, 10 Jun 2020 02:17:08 -0400
Subject: [PATCH] Updated window titles, fixed addressbook layout issues with
Avatar & Nickname, spellings.
---
src/addressbook.ui | 49 ++++++-
src/connection.ui | 14 +-
src/contactrequest.ui | 284 ++++++++++++++++++------------------
src/hushrequest.ui | 2 +-
src/mainwindow.cpp | 2 +-
src/mobileappconnector.ui | 2 +-
src/newwallet.ui | 136 +++++++++--------
src/recurringdialog.ui | 2 +-
src/recurringmultiple.ui | 2 +-
src/recurringpayments.ui | 2 +-
src/requestContactDialog.ui | 2 +-
src/restoreseed.ui | 2 +-
12 files changed, 281 insertions(+), 218 deletions(-)
diff --git a/src/addressbook.ui b/src/addressbook.ui
index 08b2356..80b3a80 100644
--- a/src/addressbook.ui
+++ b/src/addressbook.ui
@@ -67,15 +67,28 @@
-
- <html><head/><body><p align="right">Nickname :</p></body></html>
+ <html><head/><body><p>Nickname :</p></body></html>
-
-
+
+
+
+ 0
+ 25
+
+
+
-
+
+
+ 0
+ 25
+
+
25
@@ -89,7 +102,14 @@
-
-
+
+
+
+ 0
+ 25
+
+
+
-
@@ -99,10 +119,23 @@
-
-
+
+
+
+ 0
+ 25
+
+
+
-
+
+
+ 0
+ 25
+
+
Add to Address Book
@@ -245,12 +278,18 @@
-
- <html><head/><body><p align="right">Avatar :</p></body></html>
+ <html><head/><body><p>Avatar :</p></body></html>
-
+
+
+ 0
+ 25
+
+
Create a new HushChat zaddr
diff --git a/src/connection.ui b/src/connection.ui
index 69c6a7c..8c950bd 100644
--- a/src/connection.ui
+++ b/src/connection.ui
@@ -10,9 +10,21 @@
0
0
512
- 513
+ 512
+
+
+ 512
+ 512
+
+
+
+
+ 512
+ 512
+
+
SilentDragonLite
diff --git a/src/contactrequest.ui b/src/contactrequest.ui
index 1b9bd7d..d187eb1 100644
--- a/src/contactrequest.ui
+++ b/src/contactrequest.ui
@@ -29,9 +29,71 @@
- Send a contact request
+ Send Contact Request
+
-
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert a nickname for your contact:</span></p></body></html>
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Choose an avatar for your contact:</span></p></body></html>
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
@@ -39,6 +101,58 @@
+ -
+
+
+ 6
+
+
+ QLayout::SetMaximumSize
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Your HushChat Address:</span></p></body></html>
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Create New Address
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+
-
@@ -55,6 +169,13 @@
+ -
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert the address of your contact:</span></p></body></html>
+
+
+
-
@@ -272,6 +393,26 @@
+ -
+
+
+
+ 0
+ 0
+
+
+
+ 0/512
+
+
+
+ -
+
+
+ Add a memo to your request
+
+
+
-
@@ -310,147 +451,6 @@
- -
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert the address of your contact:</span></p></body></html>
-
-
-
- -
-
-
- 6
-
-
- QLayout::SetMaximumSize
-
-
-
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Your HushChat Address:</span></p></body></html>
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Create New Address
-
-
- false
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- QLayout::SetMaximumSize
-
-
-
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert a nickname for your contact:</span></p></body></html>
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Choose an avatar for your contact:</span></p></body></html>
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Add a memo to your request
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- 0/512
-
-
-
diff --git a/src/hushrequest.ui b/src/hushrequest.ui
index d0b0ca7..f51aebd 100644
--- a/src/hushrequest.ui
+++ b/src/hushrequest.ui
@@ -11,7 +11,7 @@
- Dialog
+ Request Payment
-
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3e9d2a0..441126e 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -612,7 +612,7 @@ void MainWindow::removeWalletEncryptionStartUp() {
{
- QMessageBox::information(this, tr("You have still Plaintextdata on your disk!"),
+ QMessageBox::information(this, tr("You still have plaintext data on your disk!"),
QString("WARNING: Delete it only if you have a backup of your Wallet Seed."),
QMessageBox::Ok
);
diff --git a/src/mobileappconnector.ui b/src/mobileappconnector.ui
index 9412c37..823a497 100644
--- a/src/mobileappconnector.ui
+++ b/src/mobileappconnector.ui
@@ -11,7 +11,7 @@
- Connect Mobile App
+ Mobile Connector App
-
diff --git a/src/newwallet.ui b/src/newwallet.ui
index ac2a5af..9f1e76c 100644
--- a/src/newwallet.ui
+++ b/src/newwallet.ui
@@ -11,9 +11,62 @@
- Form
+ Create New SDL Wallet
+
-
+
+
+ Confirm Passphrase:
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
+
+
-
+
+
+ Restore wallet from seed
+
+
+
+ -
+
+
+ Restore an existing wallet, using the 24-word seed.
+
+
+ true
+
+
+
+
+
+
+ -
+
+
+ QLineEdit::Password
+
+
+
-
@@ -29,7 +82,7 @@
-
- Create a new Wallet
+ Create a new wallet
@@ -53,84 +106,43 @@
- -
-
-
- color: red;
-
-
- Passphrase don't match
-
-
- Qt::AlignCenter
-
-
-
- -
-
-
- <html><head/><body><p>16 letters minimum</p></body></html>
-
-
-
- -
+
-
Encryption Passphrase:
- -
-
-
- QLineEdit::Password
+
-
+
+
+
+ 0
+ 0
+
+
+
+ color: red;
-
-
- -
-
- Confirm Passphrase:
+ <html><head/><body><p><span style=" font-style:italic;">Passphrase don't match</span></p></body></html>
-
-
- -
-
-
- QLineEdit::Password
+
+ Qt::AlignCenter
- -
-
+
-
+
-
+
0
0
-
-
+
+ <html><head/><body><p><span style=" font-style:italic;">16 letters minimum</span></p></body></html>
-
-
-
-
-
- Restore wallet from seed
-
-
-
- -
-
-
- Restore an existing wallet, using the 24-word seed.
-
-
- true
-
-
-
-
diff --git a/src/recurringdialog.ui b/src/recurringdialog.ui
index fbe26e6..6e53279 100644
--- a/src/recurringdialog.ui
+++ b/src/recurringdialog.ui
@@ -11,7 +11,7 @@
- Dialog
+ Reccuring Dialog
-
diff --git a/src/recurringmultiple.ui b/src/recurringmultiple.ui
index b895ecb..e7a41ca 100644
--- a/src/recurringmultiple.ui
+++ b/src/recurringmultiple.ui
@@ -11,7 +11,7 @@
- Dialog
+ Recurring Multiple Payments
-
diff --git a/src/recurringpayments.ui b/src/recurringpayments.ui
index 3874370..839fe73 100644
--- a/src/recurringpayments.ui
+++ b/src/recurringpayments.ui
@@ -11,7 +11,7 @@
- Payments
+ Reocurring Payments
-
diff --git a/src/requestContactDialog.ui b/src/requestContactDialog.ui
index 237f206..76e904a 100644
--- a/src/requestContactDialog.ui
+++ b/src/requestContactDialog.ui
@@ -23,7 +23,7 @@
- Incoming contact request
+ Incoming Contact Request
-
diff --git a/src/restoreseed.ui b/src/restoreseed.ui
index 9cc2b3f..64bd43f 100644
--- a/src/restoreseed.ui
+++ b/src/restoreseed.ui
@@ -11,7 +11,7 @@
- Form
+ Restore Wallet Seed
-