mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Indentation fix after the last commit

Browse source 
For the ThemeTest we could simply drop the item, for the GPS preferences
and the DowbloadFromDiveComputer page everything got indented by one
level.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-02-10 15:11:04 -08:00
parent ab36a3dad1
commit 6829d10086
3 changed files with 134 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

2
qt-mobile/qml/DownloadFromDiveComputer.qml
View file

@ -8,7 +8,6 @@ import org.subsurfacedivelog.mobile 1.0
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
MobileComponents.Page { MobileComponents.Page {
Item {
id: diveComputerDownloadWindow id: diveComputerDownloadWindow
anchors.top:parent.top anchors.top:parent.top
width: parent.width width: parent.width
@ -111,4 +110,3 @@ Item {
} }
} }
} }
}

110
qt-mobile/qml/Preferences.qml
View file

@ -7,72 +7,72 @@ import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
MobileComponents.Page { MobileComponents.Page {
GridLayout { GridLayout {
signal accept signal accept
columns: 2 columns: 2
width: parent.width - MobileComponents.Units.gridUnit width: parent.width - MobileComponents.Units.gridUnit
anchors { anchors {
fill: parent fill: parent
margins: MobileComponents.Units.gridUnit / 2 margins: MobileComponents.Units.gridUnit / 2
} }
MobileComponents.Heading { MobileComponents.Heading {
text: "Preferences" text: "Preferences"
Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
MobileComponents.Heading { MobileComponents.Heading {
text: "Subsurface GPS data webservice" text: "Subsurface GPS data webservice"
level: 3 level: 3
Layout.topMargin: MobileComponents.Units.largeSpacing Layout.topMargin: MobileComponents.Units.largeSpacing
Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2 Layout.bottomMargin: MobileComponents.Units.largeSpacing / 2
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
MobileComponents.Label { MobileComponents.Label {
text: "Distance threshold (meters)" text: "Distance threshold (meters)"
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
} }
TextField { TextField {
id: distanceThreshold id: distanceThreshold
text: manager.distanceThreshold text: manager.distanceThreshold
Layout.fillWidth: true Layout.fillWidth: true
} }
MobileComponents.Label { MobileComponents.Label {
text: "Time threshold (minutes)" text: "Time threshold (minutes)"
Layout.alignment: Qt.AlignRight Layout.alignment: Qt.AlignRight
} }
TextField { TextField {
id: timeThreshold id: timeThreshold
text: manager.timeThreshold text: manager.timeThreshold
Layout.fillWidth: true Layout.fillWidth: true
} }
Item { width: MobileComponents.Units.gridUnit; height: width } Item { width: MobileComponents.Units.gridUnit; height: width }
Item { Item {
Layout.preferredHeight: saveButton.height Layout.preferredHeight: saveButton.height
Layout.preferredWidth: saveButton.width Layout.preferredWidth: saveButton.width
SubsurfaceButton { SubsurfaceButton {
id: saveButton id: saveButton
text: "Save" text: "Save"
anchors.centerIn: parent anchors.centerIn: parent
onClicked: { onClicked: {
manager.distanceThreshold = distanceThreshold.text manager.distanceThreshold = distanceThreshold.text
manager.timeThreshold = timeThreshold.text manager.timeThreshold = timeThreshold.text
manager.savePreferences() manager.savePreferences()
stackView.pop() stackView.pop()
}
} }
} }
}
Item { Item {
Layout.fillHeight: true Layout.fillHeight: true
}
} }
} }
}

158
qt-mobile/qml/ThemeTest.qml
View file

@ -3,97 +3,97 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
MobileComponents.Page { MobileComponents.Page {
GridLayout { GridLayout {
id: themetest id: themetest
columns: 2 columns: 2
anchors.margins: MobileComponents.Units.gridUnit / 2 anchors.margins: MobileComponents.Units.gridUnit / 2
MobileComponents.Heading { MobileComponents.Heading {
Layout.columnSpan: 2 Layout.columnSpan: 2
text: "Theme Information" text: "Theme Information"
} }
MobileComponents.Heading { MobileComponents.Heading {
text: "Screen" text: "Screen"
Layout.columnSpan: 2 Layout.columnSpan: 2
level: 3 level: 3
} }
FontMetrics { FontMetrics {
id: fm id: fm
} }
MobileComponents.Label { MobileComponents.Label {
text: "Geometry (pixels):" text: "Geometry (pixels):"
} }
MobileComponents.Label { MobileComponents.Label {
text: rootItem.width + "x" + rootItem.height text: rootItem.width + "x" + rootItem.height
} }
MobileComponents.Label { MobileComponents.Label {
text: "Geometry (gridUnits):" text: "Geometry (gridUnits):"
} }
MobileComponents.Label { MobileComponents.Label {
text: Math.round(rootItem.width / MobileComponents.Units.gridUnit) + "x" + Math.round(rootItem.height / MobileComponents.Units.gridUnit) text: Math.round(rootItem.width / MobileComponents.Units.gridUnit) + "x" + Math.round(rootItem.height / MobileComponents.Units.gridUnit)
} }
MobileComponents.Label { MobileComponents.Label {
text: "Units.gridUnit:" text: "Units.gridUnit:"
} }
MobileComponents.Label { MobileComponents.Label {
text: MobileComponents.Units.gridUnit text: MobileComponents.Units.gridUnit
} }
MobileComponents.Label { MobileComponents.Label {
text: "Units.devicePixelRatio:" text: "Units.devicePixelRatio:"
} }
MobileComponents.Label { MobileComponents.Label {
text: MobileComponents.Units.devicePixelRatio text: MobileComponents.Units.devicePixelRatio
} }
MobileComponents.Heading { MobileComponents.Heading {
text: "Font Metrics" text: "Font Metrics"
level: 3 level: 3
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
MobileComponents.Label { MobileComponents.Label {
text: "FontMetrics pointSize:" text: "FontMetrics pointSize:"
} }
MobileComponents.Label { MobileComponents.Label {
text: fm.font.pointSize text: fm.font.pointSize
} }
MobileComponents.Label { MobileComponents.Label {
text: "FontMetrics pixelSize:" text: "FontMetrics pixelSize:"
} }
MobileComponents.Label { MobileComponents.Label {
text: fm.height text: fm.height
} }
MobileComponents.Label { MobileComponents.Label {
text: "FontMetrics devicePixelRatio:" text: "FontMetrics devicePixelRatio:"
} }
MobileComponents.Label { MobileComponents.Label {
text: fm.height / fm.font.pointSize text: fm.height / fm.font.pointSize
} }
MobileComponents.Label { MobileComponents.Label {
text: "Text item pixelSize:" text: "Text item pixelSize:"
} }
Text { Text {
text: font.pixelSize text: font.pixelSize
} }
MobileComponents.Label { MobileComponents.Label {
text: "Text item pointSize:" text: "Text item pointSize:"
} }
Text { Text {
text: font.pointSize text: font.pointSize
} }
MobileComponents.Label { MobileComponents.Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillHeight: true Layout.fillHeight: true
}
} }
} }
}