From 3dc04ed47fa0bf1d02bf9d8e9314ca4225ad757e Mon Sep 17 00:00:00 2001
From: Charles <18726788+csharpee@users.noreply.github.com>
Date: Mon, 8 Jun 2020 00:31:56 -0400
Subject: [PATCH 1/2] display bug issue #92, plus typos and alignment of
dropdown logo and titles
---
src/requestContactDialog.ui | 256 ++++++++++++++++++++++--------------
1 file changed, 158 insertions(+), 98 deletions(-)
diff --git a/src/requestContactDialog.ui b/src/requestContactDialog.ui
index 27e6650..237f206 100644
--- a/src/requestContactDialog.ui
+++ b/src/requestContactDialog.ui
@@ -10,9 +10,15 @@
495
+
+
+ 0
+ 0
+
+
- 812
+ 850
495
@@ -20,39 +26,10 @@
Incoming contact request
- -
-
-
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html>
-
-
-
- -
+
-
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Memo of the request</span></p></body></html>
-
-
-
- -
-
-
-
- 256
- 231
-
-
-
- true
-
-
- QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
-
-
- false
-
-
- QAbstractItemView::SingleSelection
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Memo of the request</span></p></body></html>
@@ -60,7 +37,7 @@
- 521
+ 500
231
@@ -90,18 +67,24 @@
- -
-
+
-
+
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html>
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Open requests</span></p></body></html>
-
+
+
+ 0
+ 0
+
+
- 256
+ 225
190
@@ -119,20 +102,6 @@
- -
-
-
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html>
-
-
-
- -
-
-
- Request from :
-
-
-
-
@@ -149,51 +118,121 @@
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
- My Zaddr :
+ Request from:
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
- 351
+ 0
25
-
-
- 351
- 25
-
+
+ 25
- -
-
+
-
+
- Give a Nickname:
+
- -
-
-
- 25
+
-
+
+
+ Add New Contact
+
+
+ false
- -
+
-
+
+
+
+
+
+
+ -
+
+
+ 0
+ 0
+
+
- <html><head/><body><p align="right">Choose a avatar for your contact :</p></body></html>
+ <html><head/><body><p>Choose an avatar for your contact:</p></body></html>
- -
+
-
+
+
+
+ 0
+ 0
+
+
+
+ My Zaddr:
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 100
+ 0
+
+
+
+ Cancel
+
+
+ false
+
+
+ false
+
+
+
+ -
@@ -339,53 +378,74 @@
- -
-
-
+
-
+
+
- 100
- 0
+ 225
+ 231
-
- Cancel
+
+ true
-
- false
+
+ QAbstractItemView::EditKeyPressed|QAbstractItemView::SelectedClicked
-
+
false
+
+ QAbstractItemView::SingleSelection
+
- -
-
+
-
+
- Add this new Contact
-
-
- false
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Recently closed requests</span></p></body></html>
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
-
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Details of the request</span></p></body></html>
- -
-
+
-
+
+
+
+ 0
+ 0
+
+
-
+ Give a Nickname:
- -
-
-
-
+
-
+
+
+
+ 351
+ 25
+
+
+
+
+ 351
+ 25
+
From 7aa03560fb7bedfb129dd613dab42a2b96da5c05 Mon Sep 17 00:00:00 2001
From: Charles <18726788+csharpee@users.noreply.github.com>
Date: Mon, 8 Jun 2020 01:39:17 -0400
Subject: [PATCH 2/2] Updated layout issues with contactrequest.ui, typography,
and button alignments, including inputbox fixes for midnight theme
---
src/contactrequest.ui | 569 +++++++++++++++++++++++++-----------------
1 file changed, 343 insertions(+), 226 deletions(-)
diff --git a/src/contactrequest.ui b/src/contactrequest.ui
index eb231ee..286dbdb 100644
--- a/src/contactrequest.ui
+++ b/src/contactrequest.ui
@@ -10,6 +10,12 @@
427
+
+
+ 0
+ 0
+
+
780
@@ -20,35 +26,41 @@
Send a contact request
- -
-
-
- <html><head/><body><p align="right"><span style=" font-weight:600; text-decoration: underline;">Choose a avatar for your contact :</span></p></body></html>
+
-
+
+
+
+ 500
+ 71
+
-
-
- -
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Please insert a Nickname for your contact :</span></p></body></html>
+
+ Qt::NoContextMenu
+
+
+ false
+
+
+ Qt::ImhSensitiveData
-
-
- -
-
- 25
+ 512
-
-
- -
-
-
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Please insert the Address of your contact :</span></p></body></html>
+
+ Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
+
+
+ false
+
+
+ Add a memo to your request
+
+
+ true
- -
+
-
@@ -64,14 +76,20 @@
- -
-
+
-
+
- <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Your HushChat Address :</span></p></body></html>
+ Add Contact and Send Request
+
+
+ false
+
+
+ false
- -
+
-
@@ -90,68 +108,14 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 148
-
-
-
-
- -
-
-
- <html><head/><body><p align="center"><span style=" font-weight:600; text-decoration: underline;">Insert a memo for your request</span></p></body></html>
-
-
-
- -
-
-
-
- 500
- 71
-
-
-
-
- 500
- 71
-
-
-
- Qt::NoContextMenu
-
-
- false
-
-
- Qt::ImhSensitiveData
-
-
- 512
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- false
-
-
- Add some memo to your request
-
-
- true
-
-
-
- -
+
-
+
+
+ 0
+ 0
+
+
100
@@ -169,172 +133,325 @@
- -
-
-
- Qt::Horizontal
-
-
-
- 278
- 20
-
+
-
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert a memo for your request:</span></p></body></html>
-
+
- -
-
+
-
+
- Add Contact and send request
-
-
- false
-
-
- false
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert the address of your contact:</span></p></body></html>
- -
-
-
-
-
- SDLogo
-
-
-
- :/icons/res/SDLogo.png
-
-
-
- -
-
- Duke
-
-
-
- :/icons/res/Duke.png
-
-
-
+ -
+
+
+ 12
+
+
+ QLayout::SetDefaultConstraint
+
-
-
- Denio
-
-
-
- :/icons/res/Denio.png
-
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Your HushChat Address:</span></p></body></html>
+
+
-
-
- Berg
-
-
-
- :/icons/res/Berg.png
-
-
+
+
+
+ 0
+ 0
+
+
+
+ Create New Address
+
+
+ false
+
+
-
-
- Stag
-
-
-
- :/icons/res/Stag.png
-
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+
+ -
+
-
-
- Sharpee
-
-
-
- :/icons/res/Sharpee.png
-
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 250
+ 25
+
+
+
+ 25
+
+
-
-
- Elsa
-
-
-
- :/icons/res/Elsa.png
-
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
-
-
- Yoda
-
-
-
- :/icons/res/Yoda.png
-
-
+
+
+
+ 0
+ 25
+
+
+
-
+
+ SDLogo
+
+
+
+ :/icons/res/SDLogo.png
+
+
+
+ -
+
+ Duke
+
+
+
+ :/icons/res/Duke.png
+
+
+
+ -
+
+ Denio
+
+
+
+ :/icons/res/Denio.png
+
+
+
+ -
+
+ Berg
+
+
+
+ :/icons/res/Berg.png
+
+
+
+ -
+
+ Stag
+
+
+
+ :/icons/res/Stag.png
+
+
+
+ -
+
+ Sharpee
+
+
+
+ :/icons/res/Sharpee.png
+
+
+
+ -
+
+ Elsa
+
+
+
+ :/icons/res/Elsa.png
+
+
+
+ -
+
+ Yoda
+
+
+
+ :/icons/res/Yoda.png
+
+
+
+ -
+
+ Garfield
+
+
+
+ :/icons/res/Garfield.png
+
+
+
+ -
+
+ Snoopy
+
+
+
+ :/icons/res/Snoopy.png
+
+
+
+ -
+
+ Popey
+
+
+
+ :/icons/res/Popey.png
+
+
+
+ -
+
+ Pinguin
+
+
+
+ :/icons/res/Pinguin.png
+
+
+
+ -
+
+ Mickey
+
+
+
+ :/icons/res/Mickey.png
+
+
+
+
-
-
- Garfield
-
-
-
- :/icons/res/Garfield.png
-
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Expanding
+
+
+
+ 40
+ 20
+
+
+
- -
-
- Snoopy
-
-
-
- :/icons/res/Snoopy.png
-
-
+
+
+ -
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Insert a nickname for your contact:</span></p></body></html>
+
+
-
-
- Popey
-
-
-
- :/icons/res/Popey.png
-
-
+
+
+ Qt::Horizontal
+
+
+ QSizePolicy::Fixed
+
+
+
+ 40
+ 20
+
+
+
-
-
- Pinguin
-
-
-
- :/icons/res/Pinguin.png
-
-
+
+
+
+ 0
+ 0
+
+
+
+ <html><head/><body><p><span style=" font-weight:600; text-decoration: underline;">Choose an avatar for your contact:</span></p></body></html>
+
+
-
-
- Mickey
-
-
-
- :/icons/res/Mickey.png
-
-
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
-
-
- -
-
-
- Create new Hushchat address
-
-
+