qml: small form-factor fixes

electrum/gui/qml/components/WalletDetails.qml

@@ -252,12 +252,13 @@ Pane {
                     columns: 2
                     Label {
                         text: qsTr('Derivation prefix')
-                        visible: Daemon.currentWallet.isDeterministic
+                        visible: Daemon.currentWallet.derivationPrefix
                         color: Material.accentColor
                     }
                     Label {
+                        Layout.fillWidth: true
                         text: Daemon.currentWallet.derivationPrefix
-                        visible: Daemon.currentWallet.isDeterministic
+                        visible: Daemon.currentWallet.derivationPrefix
                     }
 
                     Label {

electrum/gui/qml/components/wizard/WCConfirmSeed.qml

@@ -22,10 +22,9 @@ WizardComponent {
         clip:true
         interactive: height < contentHeight
 
-        GridLayout {
+        ColumnLayout {
             id: mainLayout
             width: parent.width
-            columns: 1
 
             InfoTextArea {
                 Layout.fillWidth: true
@@ -33,21 +32,22 @@ WizardComponent {
                     qsTr('If you lose your seed, your money will be permanently lost.') + ' ' +
                     qsTr('To make sure that you have properly saved your seed, please retype it here.')
             }
-            Label { text: qsTr('Confirm your seed (re-enter)') }
+
+            Label {
+                text: qsTr('Confirm your seed (re-enter)')
+            }
+
             SeedTextArea {
                 id: confirm
                 Layout.fillWidth: true
-                onTextChanged: {
+                onTextChanged: checkValid()
-                    checkValid()
-                }
             }
+
             TextField {
                 id: customwordstext
                 Layout.fillWidth: true
                 placeholderText: qsTr('Enter your custom word(s)')
-                onTextChanged: {
+                onTextChanged: checkValid()
-                    checkValid()
-                }
             }
         }
     }

electrum/gui/qml/components/wizard/WCMultisig.qml

@@ -29,70 +29,78 @@ WizardComponent {
         wizard_data['multisig_cosigner_data'] = {}
     }
 
-    ColumnLayout {
+    Flickable {
-        width: parent.width
+        anchors.fill: parent
+        contentHeight: rootLayout.height
+        clip:true
+        interactive: height < contentHeight
 
-        Label { text: qsTr('Multisig wallet') }
+        ColumnLayout {
+            id: rootLayout
+            width: parent.width
 
-        InfoTextArea {
+            Label { text: qsTr('Multisig wallet') }
-            Layout.preferredWidth: parent.width
+
-            text: qsTr('Choose the number of participants, and the number of signatures needed to unlock funds in your wallet.')
+            InfoTextArea {
-        }
+                Layout.preferredWidth: parent.width
+                text: qsTr('Choose the number of participants, and the number of signatures needed to unlock funds in your wallet.')
+            }
 
-        Piechart {
+            Piechart {
-            id: piechart
+                id: piechart
-            Layout.preferredWidth: parent.width * 1/2
+                Layout.preferredWidth: parent.width * 1/2
-            Layout.alignment: Qt.AlignHCenter
+                Layout.alignment: Qt.AlignHCenter
-            Layout.preferredHeight: 200 // TODO
+                Layout.preferredHeight: 200 // TODO
-            showLegend: false
+                showLegend: false
-            innerOffset: 3
+                innerOffset: 3
-            function updateSlices() {
+                function updateSlices() {
-                var s = []
+                    var s = []
-                for (let i=0; i < participants; i++) {
+                    for (let i=0; i < participants; i++) {
-                    var item = {
+                        var item = {
-                        v: (1/participants),
+                            v: (1/participants),
-                        color: i < signatures ? constants.colorPiechartSignature : constants.colorPiechartParticipant
+                            color: i < signatures ? constants.colorPiechartSignature : constants.colorPiechartParticipant
+                        }
+                        s.push(item)
                     }
-                    s.push(item)
+                    piechart.slices = s
                 }
-                piechart.slices = s
             }
-        }
 
-        Label {
+            Label {
-            text: qsTr('Number of cosigners: %1').arg(participants)
+                text: qsTr('Number of cosigners: %1').arg(participants)
-        }
+            }
 
-        Slider {
+            Slider {
-            id: participants_slider
+                id: participants_slider
-            Layout.preferredWidth: parent.width * 4/5
+                Layout.preferredWidth: parent.width * 4/5
-            Layout.alignment: Qt.AlignHCenter
+                Layout.alignment: Qt.AlignHCenter
-            snapMode: Slider.SnapAlways
+                snapMode: Slider.SnapAlways
-            stepSize: 1
+                stepSize: 1
-            from: 2
+                from: 2
-            to: 15
+                to: 15
-            onValueChanged: {
+                onValueChanged: {
-                if (activeFocus)
+                    if (activeFocus)
-                    participants = value
+                        participants = value
+                }
             }
-        }
 
-        Label {
+            Label {
-            text: qsTr('Number of signatures: %1').arg(signatures)
+                text: qsTr('Number of signatures: %1').arg(signatures)
-        }
+            }
 
-        Slider {
+            Slider {
-            id: signatures_slider
+                id: signatures_slider
-            Layout.preferredWidth: parent.width * 4/5
+                Layout.preferredWidth: parent.width * 4/5
-            Layout.alignment: Qt.AlignHCenter
+                Layout.alignment: Qt.AlignHCenter
-            snapMode: Slider.SnapAlways
+                snapMode: Slider.SnapAlways
-            stepSize: 1
+                stepSize: 1
-            from: 1
+                from: 1
-            to: participants
+                to: participants
-            value: signatures
+                value: signatures
-            onValueChanged: {
+                onValueChanged: {
-                if (activeFocus)
+                    if (activeFocus)
-                    signatures = value
+                        signatures = value
+                }
             }
         }
     }