diff options
| -rw-r--r-- | qt-mobile/qml/Preferences.qml | 7 | ||||
| -rw-r--r-- | qt-mobile/qml/TopBar.qml | 44 |
2 files changed, 34 insertions, 17 deletions
diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml index 36da051e6..8b3ae2bd3 100644 --- a/qt-mobile/qml/Preferences.qml +++ b/qt-mobile/qml/Preferences.qml @@ -20,14 +20,15 @@ Item { anchors.margins: units.gridUnit Label { - text: "Enter your Subsurface cloud credentials" + text: "Cloud credentials" Layout.bottomMargin: units.largeSpacing font.pointSize: units.titlePointSize Layout.columnSpan: 2 } Label { - text: "Email Address:" + text: "Email Address" + Layout.alignment: Qt.AlignRight } TextField { @@ -38,6 +39,7 @@ Item { Label { text: "Password" + Layout.alignment: Qt.AlignRight } TextField { @@ -49,6 +51,7 @@ Item { Label { text: "Show password" + Layout.alignment: Qt.AlignRight } CheckBox { diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml index eb7403f9b..624002242 100644 --- a/qt-mobile/qml/TopBar.qml +++ b/qt-mobile/qml/TopBar.qml @@ -13,27 +13,41 @@ Rectangle { property bool goBack: (stackView.depth > 1) color: theme.accentColor - Layout.minimumHeight: units.gridUnit * 2 + units.smallSpacing * 2 + Layout.minimumHeight: units.gridUnit * 2 + units.largeSpacing Layout.fillWidth: true Layout.margins: 0 RowLayout { anchors.bottom: topPart.bottom - anchors.bottomMargin: units.smallSpacing + anchors.bottomMargin: units.largeSpacing / 2 anchors.left: topPart.left - anchors.leftMargin: units.smallSpacing + anchors.leftMargin: units.largeSpacing / 2 anchors.right: topPart.right - anchors.rightMargin: units.smallSpacing - Image { - source: "qrc:/qml/subsurface-mobile-icon.png" - Layout.maximumWidth: units.gridUnit * 2 - Layout.preferredWidth: units.gridUnit * 2 - Layout.preferredHeight: units.gridUnit * 2 - } - Text { - text: qsTr("Subsurface") - font.pointSize: units.fontMetrics.font.pointSize * 2 - Layout.fillWidth: false - color: theme.accentTextColor + anchors.rightMargin: units.largeSpacing / 2 + Item { + Layout.preferredHeight: subsurfaceLogo.height + Image { + id: subsurfaceLogo + source: "qrc:/qml/subsurface-mobile-icon.png" + anchors { + top: parent.top + left: parent.left + } + width: units.gridUnit * 2 + height: width + } + Text { + text: qsTr("Subsurface") + height: subsurfaceLogo.height + anchors { + left: subsurfaceLogo.right + bottom: subsurfaceLogo.bottom + leftMargin: units.gridUnit / 2 + } + font.pointSize: units.fontMetrics.font.pointSize * 1.5 + verticalAlignment: Text.AlignBottom + Layout.fillWidth: false + color: theme.accentTextColor + } } Item { Layout.fillWidth: true |