qml: remove extra ColumnLayouts

Github-Pull: #210
Rebased-From: 4dc32c4

Author: Johnny Carlson

src/qml/BitcoinApp/Controls/InformationPage.qml

@@ -30,6 +30,8 @@ Page {
     property string subtext: ""
     property int subtextMargin: 30
     property int subtextSize: 15
+    property real maximumWidth: 600
+    property real detailMaximumWidth: 450
 
     background: null
     clip: true
@@ -40,7 +42,7 @@ Page {
 
     ColumnLayout {
         id: information
-        width: Math.min(parent.width, 600)
+        width: Math.min(parent.width, maximumWidth)
         anchors.horizontalCenter: parent.horizontalCenter
         spacing: 0
         Loader {
@@ -71,10 +73,12 @@ Page {
             id: detail_loader
             active: root.detailActive
             visible: active
-            Layout.fillWidth: true
+            Layout.alignment: Qt.AlignCenter
             Layout.topMargin: 30
             Layout.leftMargin: 20
             Layout.rightMargin: 20
+            Layout.fillWidth: true
+            Layout.maximumWidth: detailMaximumWidth
             sourceComponent: root.detailItem
         }
     }

src/qml/BitcoinApp/NodeRunner.qml

@@ -16,28 +16,24 @@ Page {
         id: navbar
     }
     ColumnLayout {
+        width: 600
         spacing: 0
-        anchors.fill: parent
-        ColumnLayout {
-            width: 600
-            spacing: 0
-            anchors.centerIn: parent
-            Component.onCompleted: nodeModel.startNodeInitializionThread();
-            Image {
-                Layout.alignment: Qt.AlignCenter
-                source: "image://images/app"
-                sourceSize.width: 64
-                sourceSize.height: 64
-            }
-            BlockCounter {
-                Layout.alignment: Qt.AlignCenter
-                blockHeight: nodeModel.blockTipHeight
-            }
-            ProgressIndicator {
-                width: 200
-                Layout.alignment: Qt.AlignCenter
-                progress: nodeModel.verificationProgress
-            }
+        anchors.centerIn: parent
+        Component.onCompleted: nodeModel.startNodeInitializionThread();
+        Image {
+            Layout.alignment: Qt.AlignCenter
+            source: "image://images/app"
+            sourceSize.width: 64
+            sourceSize.height: 64
+        }
+        BlockCounter {
+            Layout.alignment: Qt.AlignCenter
+            blockHeight: nodeModel.blockTipHeight
+        }
+        ProgressIndicator {
+            width: 200
+            Layout.alignment: Qt.AlignCenter
+            progress: nodeModel.verificationProgress
         }
     }
 }

src/qml/BitcoinApp/NodeSettings.qml

@@ -12,73 +12,73 @@ Item {
     id: nodeSettings
     property alias navMiddleDetail: nodeSettingsView.navMiddleDetail
     property alias navRightDetail: nodeSettingsView.navRightDetail
+
     StackView {
         id: nodeSettingsView
         property alias navMiddleDetail: node_settings.navMiddleDetail
         property alias navRightDetail: node_settings.navRightDetail
+        anchors.fill: parent
+
         initialItem: Page {
             id: node_settings
             property alias navMiddleDetail: navbar.middleDetail
             property alias navRightDetail: navbar.rightDetail
             background: null
+            implicitWidth: 450
+            leftPadding: 20
+            rightPadding: 20
+            topPadding: 30
+
             header: NavigationBar {
                 id: navbar
             }
             ColumnLayout {
-                spacing: 0
-                width: parent.width
-                ColumnLayout {
-                    spacing: 20
-                    Layout.maximumWidth: 450
-                    Layout.topMargin: 30
-                    Layout.leftMargin: 20
-                    Layout.rightMargin: 20
-                    Layout.alignment: Qt.AlignCenter
-                    Setting {
-                        Layout.fillWidth: true
-                        header: qsTr("Dark Mode")
-                        actionItem: OptionSwitch {
-                            checked: Theme.dark
-                            onToggled: Theme.toggleDark()
-                        }
+                spacing: 20
+                width: Math.min(parent.width, 450)
+                anchors.horizontalCenter: parent.horizontalCenter
+                Setting {
+                    Layout.fillWidth: true
+                    header: qsTr("Dark Mode")
+                    actionItem: OptionSwitch {
+                        checked: Theme.dark
+                        onToggled: Theme.toggleDark()
                     }
-                    Setting {
-                        Layout.fillWidth: true
-                        header: qsTr("About")
-                        actionItem: NavButton {
-                            iconSource: "image://images/caret-right"
-                            background: null
-                            onClicked: {
-                                nodeSettingsView.push(about_page)
-                            }
+                }
+                Setting {
+                    Layout.fillWidth: true
+                    header: qsTr("About")
+                    actionItem: NavButton {
+                        iconSource: "image://images/caret-right"
+                        background: null
+                        onClicked: {
+                            nodeSettingsView.push(about_page)
                         }
                     }
-                    Setting {
-                        Layout.fillWidth: true
-                        header: qsTr("Storage")
-                        actionItem: NavButton {
-                            iconSource: "image://images/caret-right"
-                            background: null
-                            onClicked: {
-                                nodeSettingsView.push(storage_page)
-                            }
+                }
+                Setting {
+                    Layout.fillWidth: true
+                    header: qsTr("Storage")
+                    actionItem: NavButton {
+                        iconSource: "image://images/caret-right"
+                        background: null
+                        onClicked: {
+                            nodeSettingsView.push(storage_page)
                         }
                     }
-                    Setting {
-                        Layout.fillWidth: true
-                        header: qsTr("Connection")
-                        actionItem: NavButton {
-                            iconSource: "image://images/caret-right"
-                            background: null
-                            onClicked: {
-                                nodeSettingsView.push(connection_page)
-                            }
+                }
+                Setting {
+                    Layout.fillWidth: true
+                    header: qsTr("Connection")
+                    actionItem: NavButton {
+                        iconSource: "image://images/caret-right"
+                        background: null
+                        onClicked: {
+                            nodeSettingsView.push(connection_page)
                         }
                     }
                 }
             }
         }
-        anchors.fill: parent
     }
     Component {
         id: about_page

src/qml/BitcoinApp/OnboardingStorageLocation.qml

@@ -22,12 +22,6 @@ InformationPage {
     description: qsTr("Where do you want to store the downloaded block data?")
     descriptionMargin: 20
     detailActive: true
-    detailItem: ColumnLayout {
-        spacing: 0
-        StorageLocations {
-            Layout.maximumWidth: 450
-            Layout.alignment: Qt.AlignCenter
-        }
-    }
+    detailItem: StorageLocations {}
     buttonText: qsTr("Next")
 }

src/qml/BitcoinApp/SettingsAbout.qml

@@ -26,13 +26,7 @@ Item {
             description: qsTr("Bitcoin Core is an open source project.\nIf you find it useful, please contribute.\n\n This is experimental software.")
             descriptionMargin: 20
             detailActive: true
-            detailItem: ColumnLayout {
-                spacing: 0
-                AboutOptions {
-                    Layout.maximumWidth: 450
-                    Layout.alignment: Qt.AlignCenter
-                }
-            }
+            detailItem: AboutOptions {}
         }
         SettingsDeveloper {
             navLeftDetail: NavButton {

src/qml/BitcoinApp/SettingsConnection.qml

@@ -16,11 +16,5 @@ InformationPage {
     headerText: qsTr("Connection settings")
     headerMargin: 0
     detailActive: true
-    detailItem: ColumnLayout {
-        spacing: 0
-        ConnectionSettings {
-            Layout.maximumWidth: 450
-            Layout.alignment: Qt.AlignCenter
-        }
-    }
+    detailItem: ConnectionSettings {}
 }

src/qml/BitcoinApp/SettingsDeveloper.qml

@@ -14,11 +14,5 @@ InformationPage {
     headerText: qsTr("Developer options")
     headerMargin: 0
     detailActive: true
-    detailItem: ColumnLayout {
-        spacing: 0
-        DeveloperOptions {
-            Layout.maximumWidth: 450
-            Layout.alignment: Qt.AlignCenter
-        }
-    }
+    detailItem: DeveloperOptions {}
 }

src/qml/BitcoinApp/SettingsStorage.qml

@@ -14,11 +14,5 @@ InformationPage {
     headerText: qsTr("Storage settings")
     headerMargin: 0
     detailActive: true
-    detailItem: ColumnLayout {
-        spacing: 0
-        StorageSettings {
-            Layout.maximumWidth: 450
-            Layout.alignment: Qt.AlignCenter
-        }
-    }
+    detailItem: StorageSettings {}
 }

src/qml/BitcoinApp/main.qml

@@ -27,7 +27,6 @@ ApplicationWindow {
         SwipeView {
             id: swipeView
             property bool finished: false
-            anchors.fill: parent
             interactive: false
 
             OnboardingCover {}
@@ -45,7 +44,6 @@ ApplicationWindow {
         id: node
         SwipeView {
             id: node_swipe
-            anchors.fill: parent
             interactive: false
             orientation: Qt.Vertical
             NodeRunner {