Skip to content

Commit 397793c

Browse files
committed
Merge #201: Remove extra layout properties
4d94378 qml: remove extra Layout properties (Johnny Carlson) Pull request description: After consolidation of the Onboarding pages, there are some leftover Layout properties that are no longer needed. [![Windows](https://img.shields.io/badge/OS-Windows-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/win64/insecure_win_gui.zip?branch=pull/201) [![Intel macOS](https://img.shields.io/badge/OS-Intel%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos/insecure_mac_gui.zip?branch=pull/201) [![Apple Silicon macOS](https://img.shields.io/badge/OS-Apple%20Silicon%20macOS-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/macos_arm64/insecure_mac_arm64_gui.zip?branch=pull/201) [![ARM64 Android](https://img.shields.io/badge/OS-Android-green)](https://api.cirrus-ci.com/v1/artifact/github/bitcoin-core/gui-qml/android/insecure_android_apk.zip?branch=pull/201) ACKs for top commit: hebasto: ACK 4d94378, I have reviewed the code and it looks OK, I agree it can be merged. Tree-SHA512: 82a978b9bfdf4fc3d54c91c65e0b362d38cce8b55c36d4c524aa96a92e3b35268d4a86be568f7b88f9c2828522db73db6303299ed3034801dda4ef486e0b8f8d
2 parents 98038bb + 4d94378 commit 397793c

File tree

10 files changed

+0
-13
lines changed

10 files changed

+0
-13
lines changed

src/qml/pages/onboarding/onboarding01.qml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import "../settings"
1111

1212
Page {
1313
background: null
14-
Layout.fillWidth: true
1514
clip: true
1615
SwipeView {
1716
id: introductions
1817
anchors.fill: parent
1918
interactive: false
2019
orientation: Qt.Horizontal
2120
InformationPage {
22-
Layout.fillWidth: true
2321
navRightDetail: NavButton {
2422
iconSource: "image://images/info"
2523
iconHeight: 24

src/qml/pages/onboarding/onboarding02.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
88
import "../../controls"
99

1010
InformationPage {
11-
Layout.fillWidth: true
1211
navLeftDetail: NavButton {
1312
iconSource: "image://images/caret-left"
1413
text: qsTr("Back")

src/qml/pages/onboarding/onboarding03.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.15
88
import "../../controls"
99

1010
InformationPage {
11-
Layout.fillWidth: true
1211
navLeftDetail: NavButton {
1312
iconSource: "image://images/caret-left"
1413
text: qsTr("Back")

src/qml/pages/onboarding/onboarding04.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import "../../controls"
1010
import "../../components"
1111

1212
InformationPage {
13-
Layout.fillWidth: true
1413
navLeftDetail: NavButton {
1514
iconSource: "image://images/caret-left"
1615
text: qsTr("Back")

src/qml/pages/onboarding/onboarding05.qml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import "../settings"
1111

1212
Page {
1313
background: null
14-
Layout.fillWidth: true
1514
clip: true
1615
SwipeView {
1716
id: storages
1817
anchors.fill: parent
1918
interactive: false
2019
orientation: Qt.Vertical
2120
InformationPage {
22-
Layout.fillWidth: true
2321
navLeftDetail: NavButton {
2422
iconSource: "image://images/caret-left"
2523
text: qsTr("Back")

src/qml/pages/onboarding/onboarding06.qml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,13 @@ import "../settings"
1111

1212
Page {
1313
background: null
14-
Layout.fillWidth: true
1514
clip: true
1615
SwipeView {
1716
id: connections
1817
anchors.fill: parent
1918
interactive: false
2019
orientation: Qt.Vertical
2120
InformationPage {
22-
Layout.fillWidth: true
2321
navLeftDetail: NavButton {
2422
iconSource: "image://images/caret-left"
2523
text: qsTr("Back")

src/qml/pages/settings/SettingsAbout.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import "../../controls"
99
import "../../components"
1010

1111
InformationPage {
12-
Layout.fillWidth: true
1312
bannerActive: false
1413
bold: true
1514
headerText: qsTr("About")

src/qml/pages/settings/SettingsConnection.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import "../../components"
1010

1111
InformationPage {
1212
background: null
13-
Layout.fillWidth: true
1413
clip: true
1514
bannerActive: false
1615
bold: true

src/qml/pages/settings/SettingsDeveloper.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import "../../controls"
99
import "../../components"
1010

1111
InformationPage {
12-
Layout.fillWidth: true
1312
bannerActive: false
1413
bold: true
1514
headerText: qsTr("Developer options")

src/qml/pages/settings/SettingsStorage.qml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import "../../controls"
99
import "../../components"
1010

1111
InformationPage {
12-
Layout.fillWidth: true
1312
bannerActive: false
1413
bold: true
1514
headerText: qsTr("Storage settings")

0 commit comments

Comments
 (0)