Redesigned StandardDialog

2 files changed, 47 insertions, 16 deletions

diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml
index 56ce06e2..44c7c784 100644
--- a/components/StandardDialog.qml
+++ b/components/StandardDialog.qml
@@ -27,7 +27,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import QtQuick 2.0
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.0
 import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.1
 import QtQuick.Controls.Styles 1.4
@@ -76,7 +76,7 @@ Rectangle {
         // Center
         if(!isMobile) {
             root.x = parent.width/2 - root.width/2
-            root.y = screenHeight/2 - root.height/2
+            root.y = 100
         }
         show()
         root.z = 11
@@ -89,13 +89,13 @@ Rectangle {
     }
 
     // TODO: implement without hardcoding sizes
-    width: isMobile ? screenWidth : 480
-    height: isMobile ? screenHeight : 280
+    width: isMobile ? screenWidth : 520
+    height: isMobile ? screenHeight : 380
 
     ColumnLayout {
         id: mainLayout
         spacing: 10
-        anchors { fill: parent; margins: 35 }
+        anchors { fill: parent; margins: 15 }
 
         RowLayout {
             id: column
@@ -117,16 +117,14 @@ Rectangle {
                 id : dialogContent
                 Layout.fillWidth: true
                 Layout.fillHeight: true
-                font.family: "Arial"
+                renderType: Text.QtRendering
+                font.family: Style.fontLight
                 textFormat: TextEdit.AutoText
                 readOnly: true
                 font.pixelSize: 14 * scaleRatio
                 selectByMouse: false
                 wrapMode: TextEdit.Wrap
-                textColor: Style.defaultFontColor
-                style: TextAreaStyle {
-                    backgroundColor: "black"
-                }
+                color: Style.defaultFontColor
 
                 MouseArea {
                     anchors.fill: parent
@@ -172,6 +170,38 @@ Rectangle {
         }
     }
 
+    // window borders
+    Rectangle{
+        width: 1
+        color: Style.grey
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+    }
+
+    Rectangle{
+        width: 1
+        color: Style.grey
+        anchors.right: parent.right
+        anchors.top: parent.top
+        anchors.bottom: parent.bottom
+    }
+
+    Rectangle{
+        height: 1
+        color: Style.grey
+        anchors.left: parent.left
+        anchors.top: parent.top
+        anchors.right: parent.right
+    }
+
+    Rectangle{
+        height: 1
+        color: Style.grey
+        anchors.left: parent.left
+        anchors.bottom: parent.bottom
+        anchors.right: parent.right
+    }
 }
 
 
diff --git a/main.qml b/main.qml
index 943d50f8..b380a99a 100644
--- a/main.qml
+++ b/main.qml
@@ -588,11 +588,7 @@ ApplicationWindow {
                     + ", fee: " + walletManager.displayAmount(transaction.fee));
 
             // here we show confirmation popup;
-
-            transactionConfirmationPopup.title = qsTr("Confirmation") + translationManager.emptyString
-            transactionConfirmationPopup.text  = qsTr("Please confirm transaction:\n");
-            for (var i = 0; i < transaction.subaddrIndices.length; ++i)
-                transactionConfirmationPopup.text += qsTr("\nSpending address index: ") + transaction.subaddrIndices[i]
+            transactionConfirmationPopup.title = qsTr("Please confirm transaction:\n") + translationManager.emptyString;
             transactionConfirmationPopup.text +=
                           (address === "" ? "" : (qsTr("\n\nAddress: ") + address))
                         + (paymentId === "" ? "" : (qsTr("\nPayment ID: ") + paymentId))
@@ -601,7 +597,12 @@ ApplicationWindow {
                         + qsTr("\n\nRingsize: ") + (mixinCount + 1)
                         + qsTr("\n\Number of transactions: ") + transaction.txCount
                         + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription))
-                        + translationManager.emptyString
+
+            for (var i = 0; i < transaction.subaddrIndices.length; ++i){
+                transactionConfirmationPopup.text += qsTr("\nSpending address index: ") + transaction.subaddrIndices[i];
+            }
+
+            transactionConfirmationPopup.text += translationManager.emptyString;
             transactionConfirmationPopup.icon = StandardIcon.Question
             transactionConfirmationPopup.open()
         }