diff options
-rw-r--r-- | qt-mobile/qml/DownloadFromDiveComputer.qml | 2 | ||||
-rw-r--r-- | qt-mobile/qml/Preferences.qml | 110 | ||||
-rw-r--r-- | qt-mobile/qml/ThemeTest.qml | 158 |
3 files changed, 134 insertions, 136 deletions
diff --git a/qt-mobile/qml/DownloadFromDiveComputer.qml b/qt-mobile/qml/DownloadFromDiveComputer.qml index fb2d0085b..67f21345c 100644 --- a/qt-mobile/qml/DownloadFromDiveComputer.qml +++ b/qt-mobile/qml/DownloadFromDiveComputer.qml @@ -8,7 +8,6 @@ import org.subsurfacedivelog.mobile 1.0 import org.kde.plasma.mobilecomponents 0.2 as MobileComponents MobileComponents.Page { -Item { id: diveComputerDownloadWindow anchors.top:parent.top width: parent.width @@ -111,4 +110,3 @@ Item { } } } -} diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml index 3a092f348..ff1fbdf27 100644 --- a/qt-mobile/qml/Preferences.qml +++ b/qt-mobile/qml/Preferences.qml @@ -7,72 +7,72 @@ import org.kde.plasma.mobilecomponents 0.2 as MobileComponents import org.subsurfacedivelog.mobile 1.0 MobileComponents.Page { -GridLayout { + GridLayout { - signal accept + signal accept - columns: 2 - width: parent.width - MobileComponents.Units.gridUnit - anchors { - fill: parent - margins: MobileComponents.Units.gridUnit / 2 - } + columns: 2 + width: parent.width - MobileComponents.Units.gridUnit + anchors { + fill: parent + margins: MobileComponents.Units.gridUnit / 2 + } - MobileComponents.Heading { - text: "Preferences" - Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } + MobileComponents.Heading { + text: "Preferences" + Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } - MobileComponents.Heading { - text: "Subsurface GPS data webservice" - level: 3 - Layout.topMargin: MobileComponents.Units.largeSpacing - Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 - Layout.columnSpan: 2 - } + MobileComponents.Heading { + text: "Subsurface GPS data webservice" + level: 3 + Layout.topMargin: MobileComponents.Units.largeSpacing + Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 + Layout.columnSpan: 2 + } - MobileComponents.Label { - text: "Distance threshold (meters)" - Layout.alignment: Qt.AlignRight - } + MobileComponents.Label { + text: "Distance threshold (meters)" + Layout.alignment: Qt.AlignRight + } - TextField { - id: distanceThreshold - text: manager.distanceThreshold - Layout.fillWidth: true - } + TextField { + id: distanceThreshold + text: manager.distanceThreshold + Layout.fillWidth: true + } - MobileComponents.Label { - text: "Time threshold (minutes)" - Layout.alignment: Qt.AlignRight - } + MobileComponents.Label { + text: "Time threshold (minutes)" + Layout.alignment: Qt.AlignRight + } - TextField { - id: timeThreshold - text: manager.timeThreshold - Layout.fillWidth: true - } + TextField { + id: timeThreshold + text: manager.timeThreshold + Layout.fillWidth: true + } - Item { width: MobileComponents.Units.gridUnit; height: width } - Item { - Layout.preferredHeight: saveButton.height - Layout.preferredWidth: saveButton.width - SubsurfaceButton { - id: saveButton - text: "Save" - anchors.centerIn: parent - onClicked: { - manager.distanceThreshold = distanceThreshold.text - manager.timeThreshold = timeThreshold.text - manager.savePreferences() - stackView.pop() + Item { width: MobileComponents.Units.gridUnit; height: width } + Item { + Layout.preferredHeight: saveButton.height + Layout.preferredWidth: saveButton.width + SubsurfaceButton { + id: saveButton + text: "Save" + anchors.centerIn: parent + onClicked: { + manager.distanceThreshold = distanceThreshold.text + manager.timeThreshold = timeThreshold.text + manager.savePreferences() + stackView.pop() + } } } - } - Item { - Layout.fillHeight: true + Item { + Layout.fillHeight: true + } } } -} diff --git a/qt-mobile/qml/ThemeTest.qml b/qt-mobile/qml/ThemeTest.qml index f3d9d072d..3ca10f0a1 100644 --- a/qt-mobile/qml/ThemeTest.qml +++ b/qt-mobile/qml/ThemeTest.qml @@ -3,97 +3,97 @@ import QtQuick.Layouts 1.1 import org.kde.plasma.mobilecomponents 0.2 as MobileComponents MobileComponents.Page { -GridLayout { - id: themetest - columns: 2 - anchors.margins: MobileComponents.Units.gridUnit / 2 + GridLayout { + id: themetest + columns: 2 + anchors.margins: MobileComponents.Units.gridUnit / 2 - MobileComponents.Heading { - Layout.columnSpan: 2 - text: "Theme Information" - } + MobileComponents.Heading { + Layout.columnSpan: 2 + text: "Theme Information" + } - MobileComponents.Heading { - text: "Screen" - Layout.columnSpan: 2 - level: 3 - } - FontMetrics { - id: fm - } + MobileComponents.Heading { + text: "Screen" + Layout.columnSpan: 2 + level: 3 + } + FontMetrics { + id: fm + } - MobileComponents.Label { - text: "Geometry (pixels):" - } - MobileComponents.Label { - text: rootItem.width + "x" + rootItem.height - } + MobileComponents.Label { + text: "Geometry (pixels):" + } + MobileComponents.Label { + text: rootItem.width + "x" + rootItem.height + } - MobileComponents.Label { - text: "Geometry (gridUnits):" - } - MobileComponents.Label { - text: Math.round(rootItem.width / MobileComponents.Units.gridUnit) + "x" + Math.round(rootItem.height / MobileComponents.Units.gridUnit) - } + MobileComponents.Label { + text: "Geometry (gridUnits):" + } + MobileComponents.Label { + text: Math.round(rootItem.width / MobileComponents.Units.gridUnit) + "x" + Math.round(rootItem.height / MobileComponents.Units.gridUnit) + } - MobileComponents.Label { - text: "Units.gridUnit:" - } - MobileComponents.Label { - text: MobileComponents.Units.gridUnit - } + MobileComponents.Label { + text: "Units.gridUnit:" + } + MobileComponents.Label { + text: MobileComponents.Units.gridUnit + } - MobileComponents.Label { - text: "Units.devicePixelRatio:" - } - MobileComponents.Label { - text: MobileComponents.Units.devicePixelRatio - } + MobileComponents.Label { + text: "Units.devicePixelRatio:" + } + MobileComponents.Label { + text: MobileComponents.Units.devicePixelRatio + } - MobileComponents.Heading { - text: "Font Metrics" - level: 3 - Layout.columnSpan: 2 - } + MobileComponents.Heading { + text: "Font Metrics" + level: 3 + Layout.columnSpan: 2 + } - MobileComponents.Label { - text: "FontMetrics pointSize:" - } - MobileComponents.Label { - text: fm.font.pointSize - } + MobileComponents.Label { + text: "FontMetrics pointSize:" + } + MobileComponents.Label { + text: fm.font.pointSize + } - MobileComponents.Label { - text: "FontMetrics pixelSize:" - } - MobileComponents.Label { - text: fm.height - } + MobileComponents.Label { + text: "FontMetrics pixelSize:" + } + MobileComponents.Label { + text: fm.height + } - MobileComponents.Label { - text: "FontMetrics devicePixelRatio:" - } - MobileComponents.Label { - text: fm.height / fm.font.pointSize - } + MobileComponents.Label { + text: "FontMetrics devicePixelRatio:" + } + MobileComponents.Label { + text: fm.height / fm.font.pointSize + } - MobileComponents.Label { - text: "Text item pixelSize:" - } - Text { - text: font.pixelSize - } + MobileComponents.Label { + text: "Text item pixelSize:" + } + Text { + text: font.pixelSize + } - MobileComponents.Label { - text: "Text item pointSize:" - } - Text { - text: font.pointSize - } + MobileComponents.Label { + text: "Text item pointSize:" + } + Text { + text: font.pointSize + } - MobileComponents.Label { - Layout.columnSpan: 2 - Layout.fillHeight: true + MobileComponents.Label { + Layout.columnSpan: 2 + Layout.fillHeight: true + } } } -} |