diff options
author | Dirk Hohndel <dirk@hohndel.org> | 2016-04-01 20:28:58 -0500 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2016-04-01 20:28:58 -0500 |
commit | 3aa219c689a1e1abc1a21e81af2764134b1c2c89 (patch) | |
tree | 538d3baf405f384f6d6ddad61143981f350e16b1 /qt-mobile/qml/TopBar.qml | |
parent | a554c66fa39912ac82253741880a83a22bf574b4 (diff) | |
parent | cace666741ead8a26b71e0cd073382cd94a227f7 (diff) | |
download | subsurface-3aa219c689a1e1abc1a21e81af2764134b1c2c89.tar.gz |
Merge branch 'mergeKirigamiPort'
Diffstat (limited to 'qt-mobile/qml/TopBar.qml')
-rw-r--r-- | qt-mobile/qml/TopBar.qml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml index 964e9b8a4..024b818b0 100644 --- a/qt-mobile/qml/TopBar.qml +++ b/qt-mobile/qml/TopBar.qml @@ -5,21 +5,21 @@ import QtQuick.Window 2.2 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import org.kde.plasma.mobilecomponents 0.2 as MobileComponents +import org.kde.kirigami 1.0 as Kirigami import org.subsurfacedivelog.mobile 1.0 Rectangle { id: topPart color: subsurfaceTheme.accentColor - Layout.minimumHeight: Math.round(MobileComponents.Units.gridUnit * 1.5) + Layout.minimumHeight: Math.round(Kirigami.Units.gridUnit * 1.5) Layout.fillWidth: true Layout.margins: 0 RowLayout { anchors.verticalCenter: topPart.verticalCenter Item { Layout.preferredHeight: subsurfaceLogo.height - Layout.leftMargin: MobileComponents.Units.gridUnit / 4 + Layout.leftMargin: Kirigami.Units.gridUnit / 4 Image { id: subsurfaceLogo source: "qrc:/qml/subsurface-mobile-icon.png" @@ -27,16 +27,16 @@ Rectangle { verticalCenter: parent.Center left: parent.left } - width: Math.round(MobileComponents.Units.gridUnit) + width: Math.round(Kirigami.Units.gridUnit) height: width } - MobileComponents.Label { + Kirigami.Label { text: qsTr("Subsurface-mobile") - font.pointSize: Math.round(MobileComponents.Theme.defaultFont.pointSize) + font.pointSize: Math.round(Kirigami.Theme.defaultFont.pointSize) height: subsurfaceLogo.height anchors { left: subsurfaceLogo.right - leftMargin: Math.round(MobileComponents.Units.gridUnit / 2) + leftMargin: Math.round(Kirigami.Units.gridUnit / 2) } font.weight: Font.Light verticalAlignment: Text.AlignVCenter |