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

Merge branch 'kirigamiPort' of https://github.com/sebasje/subsurface into mergeKirigamiPort

Browse source 
This merge was a bit more challenging given how far things had diverged,
but I hope I got it mostly right.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-03-31 21:57:12 -05:00
commit 2efa047999
17 changed files with 436 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

93
qt-mobile/qml/About.qml
View file

@ -1,60 +1,59 @@
import QtQuick 2.3
import QtQuick.Controls 1.2
import QtQuick.Layouts 1.1
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import org.kde.kirigami 1.0 as Kirigami
import org.subsurfacedivelog.mobile 1.0
MobileComponents.Page {
Kirigami.ScrollablePage {
id: aboutPage
property int pageWidth: subsurfaceTheme.columnWidth - MobileComponents.Units.smallSpacing
property int pageWidth: subsurfaceTheme.columnWidth - Kirigami.Units.smallSpacing
title: "About Subsurface-mobile"
ScrollView {
anchors.fill: parent
ColumnLayout {
spacing: Kirigami.Units.largeSpacing
width: aboutPage.width
Layout.margins: Kirigami.Units.gridUnit / 2
ColumnLayout {
spacing: MobileComponents.Units.largeSpacing
width: aboutPage.width
Layout.margins: MobileComponents.Units.gridUnit / 2
MobileComponents.Heading {
text: "About Subsurface-mobile"
Layout.alignment: Qt.AlignHCenter
Layout.maximumWidth: pageWidth
Layout.topMargin: MobileComponents.Units.gridUnit
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
}
Image {
id: image
source: "qrc:/qml/subsurface-mobile-icon.png"
width: pageWidth / 2
height: width
fillMode: Image.Stretch
Layout.alignment: Qt.AlignCenter
horizontalAlignment: Image.AlignHCenter
}
MobileComponents.Heading {
text: "A mobile version of the free Subsurface divelog software.\n" +
"View your dive logs while on the go."
level: 4
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: MobileComponents.Units.largeSpacing * 3
Layout.maximumWidth: pageWidth
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
anchors.horizontalCenter: parent.Center
horizontalAlignment: Text.AlignHCenter
}
Kirigami.Heading {
text: "About Subsurface-mobile"
Layout.topMargin: Kirigami.Units.gridUnit
Layout.alignment: Qt.AlignHCenter
Layout.maximumWidth: pageWidth
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
}
Image {
id: image
source: "qrc:/qml/subsurface-mobile-icon.png"
width: pageWidth / 2
height: width
fillMode: Image.Stretch
Layout.alignment: Qt.AlignCenter
horizontalAlignment: Image.AlignHCenter
}
MobileComponents.Heading {
text: "Version: " + manager.getVersion() + "\n\n© Subsurface developer team\n2011-2016"
level: 5
font.pointSize: subsurfaceTheme.smallPointSize + 1
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: MobileComponents.Units.largeSpacing
Layout.maximumWidth: pageWidth
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
anchors.horizontalCenter: parent.Center
horizontalAlignment: Text.AlignHCenter
}
Kirigami.Heading {
text: "A mobile version of the free Subsurface divelog software.\n" +
"View your dive logs while on the go."
level: 4
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Kirigami.Units.largeSpacing * 3
Layout.maximumWidth: pageWidth
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
anchors.horizontalCenter: parent.Center
horizontalAlignment: Text.AlignHCenter
}
Kirigami.Heading {
text: "Version: " + manager.getVersion() + "\n\n© Subsurface developer team\n2011-2016"
level: 5
font.pointSize: subsurfaceTheme.smallPointSize + 1
Layout.alignment: Qt.AlignHCenter
Layout.topMargin: Kirigami.Units.largeSpacing
Layout.maximumWidth: pageWidth
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
anchors.horizontalCenter: parent.Center
horizontalAlignment: Text.AlignHCenter
}
}
}