request dialog improve, icons

electrum/gui/qml/components/RequestDialog.qml

@@ -34,19 +34,18 @@ Dialog {
             font.bold: true
             font.pixelSize: 16
         }
-        ToolButton {
-            Layout.alignment: Qt.AlignBaseline
-            icon.source: '../../icons/closebutton.png'
-            icon.color: 'transparent'
-            icon.width: 32
-            icon.height: 32
-            onClicked: dialog.close()
-            visible: false
-        }
     }
+
+    Flickable {
+        anchors.fill: parent
+        contentHeight: rootLayout.height
+        clip:true
+        interactive: height < contentHeight
+
         GridLayout {
+            id: rootLayout
             width: parent.width
-        rowSpacing: constants.paddingXLarge
+            rowSpacing: constants.paddingMedium
             columns: 3
 
             Rectangle {
@@ -59,6 +58,9 @@ Dialog {
             Image {
                 Layout.columnSpan: 3
                 Layout.alignment: Qt.AlignHCenter
+                Layout.topMargin: constants.paddingSmall
+                Layout.bottomMargin: constants.paddingSmall
+
                 source: 'image://qrgen/' + modelItem.address
 
                 Rectangle {
@@ -87,6 +89,29 @@ Dialog {
                 color: Material.accentColor
             }
 
+            RowLayout {
+                Layout.columnSpan: 3
+                Layout.alignment: Qt.AlignHCenter
+                Button {
+                    icon.source: '../../icons/delete.png'
+                    text: qsTr('Delete')
+                    onClicked: {
+                        Daemon.currentWallet.delete_request(modelItem.key)
+                        dialog.close()
+                    }
+                }
+                Button {
+                    icon.source: '../../icons/copy_bw.png'
+                    icon.color: 'transparent'
+                    text: 'Copy'
+                    enabled: false
+                }
+                Button {
+                    icon.source: '../../icons/share.png'
+                    text: 'Share'
+                    enabled: false
+                }
+            }
             Label {
                 visible: modelItem.message != ''
                 text: qsTr('Description')
@@ -129,8 +154,7 @@ Dialog {
                 text: modelItem.address
             }
             ToolButton {
-            icon.source: '../../icons/copy.png'
-            icon.color: 'transparent'
+                icon.source: '../../icons/copy_bw.png'
                 onClicked: {
                     AppController.textToClipboard(modelItem.address)
                 }
@@ -146,25 +170,6 @@ Dialog {
                 text: modelItem.status
             }
 
-        RowLayout {
-            Layout.columnSpan: 3
-            Layout.fillHeight: true
-            Layout.alignment: Qt.AlignHCenter
-            Button {
-                text: 'Delete'
-                onClicked: {
-                    Daemon.currentWallet.delete_request(modelItem.key)
-                    dialog.close()
-                }
-            }
-            Button {
-                text: 'Copy'
-                enabled: false
-            }
-            Button {
-                text: 'Share'
-                enabled: false
-            }
         }
     }