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

port these as well to mobilecomponents

Browse source 
Signed-off-by: Sebastian Kügler <sebas@kde.org>
This commit is contained in:
Sebastian Kügler 2015-11-29 17:30:41 +01:00
parent 2668da3f60
commit 3c1d7c0074
3 changed files with 51 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
qt-mobile/qml/DiveList.qml
View file

@ -1,9 +1,10 @@
import QtQuick 2.3 import QtQuick 2.4
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtQuick.Layouts 1.2
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import org.subsurfacedivelog.mobile 1.0 import org.subsurfacedivelog.mobile 1.0
import QtQuick.Layouts 1.0
Rectangle { Rectangle {
id: page id: page
@ -16,7 +17,7 @@ Rectangle {
property real detailsOpacity : 0 property real detailsOpacity : 0
width: diveListView.width - units.smallSpacing width: diveListView.width - MobileComponents.Units.smallSpacing
height: childrenRect.height height: childrenRect.height
//Mouse region: When clicked, the mode changes to details view //Mouse region: When clicked, the mode changes to details view
@ -41,17 +42,17 @@ Rectangle {
//Layout of the page: (mini profile, dive no, date at the top //Layout of the page: (mini profile, dive no, date at the top
//And other details at the bottom. //And other details at the bottom.
Item { Item {
x: units.smallSpacing x: MobileComponents.Units.smallSpacing
width: parent.width - units.smallSpacing * 2 width: parent.width - MobileComponents.Units.smallSpacing * 2
height: childrenRect.height + units.smallSpacing * 2 height: childrenRect.height + MobileComponents.Units.smallSpacing * 2
//spacing: units.smallSpacing / 2 //spacing: MobileComponents.Units.smallSpacing / 2
anchors.margins: units.smallSpacing anchors.margins: MobileComponents.Units.smallSpacing
Text { Text {
id: locationText id: locationText
text: location text: location
color: theme.textColor color: MobileComponents.Theme.textColor
//font.pointSize: Math.round(units.fontMetrics.pointSize * 1.2) // why this doesn't work is a mystery to me, so ... //font.pointSize: Math.round(MobileComponents.Units.fontMetrics.pointSize * 1.2) // why this doesn't work is a mystery to me, so ...
scale: 1.2 // Let's see how this works, otherwise, we'll need the default point size somewhere scale: 1.2 // Let's see how this works, otherwise, we'll need the default point size somewhere
transformOrigin: Item.TopLeft transformOrigin: Item.TopLeft
elide: Text.ElideRight elide: Text.ElideRight
@ -66,12 +67,12 @@ Rectangle {
id: dateLabel id: dateLabel
text: date text: date
opacity: 0.6 opacity: 0.6
color: theme.textColor color: MobileComponents.Theme.textColor
font.pointSize: units.smallPointSize font.pointSize: smallPointSize
anchors { anchors {
right: parent.right right: parent.right
top: parent.top top: parent.top
bottomMargin: units.smallSpacing / 2 bottomMargin: MobileComponents.Units.smallSpacing / 2
} }
} }
Row { Row {
@ -84,41 +85,41 @@ Rectangle {
Text { Text {
text: 'Depth: ' text: 'Depth: '
opacity: 0.6 opacity: 0.6
color: theme.textColor color: MobileComponents.Theme.textColor
} }
Text { Text {
text: depth text: depth
width: Math.max(units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview width: Math.max(MobileComponents.Units.gridUnit * 3, paintedWidth) // helps vertical alignment throughout listview
color: theme.textColor color: MobileComponents.Theme.textColor
} }
Text { Text {
text: 'Duration: ' text: 'Duration: '
opacity: 0.6 opacity: 0.6
color: theme.textColor color: MobileComponents.Theme.textColor
} }
Text { Text {
text: duration text: duration
color: theme.textColor color: MobileComponents.Theme.textColor
} }
} }
Text { Text {
id: numberText id: numberText
text: "#" + diveNumber text: "#" + diveNumber
color: theme.textColor color: MobileComponents.Theme.textColor
scale: 1.2 scale: 1.2
transformOrigin: Item.BottomRight transformOrigin: Item.BottomRight
opacity: 0.4 opacity: 0.4
anchors { anchors {
right: parent.right right: parent.right
topMargin: units.smallSpacing topMargin: MobileComponents.Units.smallSpacing
top: locationText.bottom top: locationText.bottom
} }
} }
//Text { text: location; width: parent.width } //Text { text: location; width: parent.width }
Rectangle { Rectangle {
color: theme.textColor color: MobileComponents.Theme.textColor
opacity: .2 opacity: .2
height: Math.max(1, units.gridUnit / 24) // we really want a thin line height: Math.max(1, MobileComponents.Units.gridUnit / 24) // we really want a thin line
anchors { anchors {
left: parent.left left: parent.left
right: parent.right right: parent.right
@ -132,8 +133,8 @@ Rectangle {
Component { Component {
id: tripHeading id: tripHeading
Item { Item {
width: page.width - units.smallSpacing * 2 width: page.width - MobileComponents.Units.smallSpacing * 2
height: childrenRect.height + units.smallSpacing * 2 height: childrenRect.height + MobileComponents.Units.smallSpacing * 2
Text { Text {
id: sectionText id: sectionText
@ -141,21 +142,21 @@ Rectangle {
anchors { anchors {
top: parent.top top: parent.top
left: parent.left left: parent.left
leftMargin: units.smallSpacing leftMargin: MobileComponents.Units.smallSpacing
right: parent.right right: parent.right
} }
color: theme.textColor color: MobileComponents.Theme.textColor
font.pointSize: 16 font.pointSize: 16
} }
Rectangle { Rectangle {
height: Math.max(2, units.gridUnit / 12) // we want a thicker line height: Math.max(2, MobileComponents.Units.gridUnit / 12) // we want a thicker line
anchors { anchors {
top: sectionText.bottom top: sectionText.bottom
left: parent.left left: parent.left
leftMargin: units.smallSpacing leftMargin: MobileComponents.Units.smallSpacing
right: parent.right right: parent.right
} }
color: theme.accentColor color: MobileComponents.Theme.accentColor
} }
} }
} }
@ -166,7 +167,7 @@ Rectangle {
model: diveModel model: diveModel
delegate: diveDelegate delegate: diveDelegate
boundsBehavior: Flickable.StopAtBounds boundsBehavior: Flickable.StopAtBounds
//highlight: Rectangle { color: theme.highlightColor; width: units.smallSpacing } //highlight: Rectangle { color: MobileComponents.Theme.highlightColor; width: MobileComponents.Units.smallSpacing }
focus: true focus: true
clip: true clip: true
section.property: "trip" section.property: "trip"
@ -177,7 +178,7 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
opacity: (diveListView.count == 0) ? 1.0 : 0 opacity: (diveListView.count == 0) ? 1.0 : 0
visible: opacity > 0 visible: opacity > 0
Behavior on opacity { NumberAnimation { duration: units.shortDuration } } Behavior on opacity { NumberAnimation { duration: MobileComponents.Units.shortDuration } }
Component.onCompleted: { Component.onCompleted: {
print("diveListView.count " + diveListView.count); print("diveListView.count " + diveListView.count);
} }

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

@ -1,11 +1,12 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
GridLayout { GridLayout {
id: themetest id: themetest
columns: 2 columns: 2
Label { MobileComponents.Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillHeight: true Layout.fillHeight: true
text: "Theme Information" text: "Theme Information"
@ -15,39 +16,39 @@ GridLayout {
id: fm id: fm
} }
Label { MobileComponents.Label {
text: "units.gridUnit:" text: "MobileComponents.Units.gridUnit:"
} }
Label { MobileComponents.Label {
text: units.gridUnit text: MobileComponents.Units.gridUnit
} }
Label { MobileComponents.Label {
text: "units.devicePixelRatio:" text: "MobileComponents.Units.devicePixelRatio:"
} }
Label { MobileComponents.Label {
text: units.devicePixelRatio text: MobileComponents.Units.devicePixelRatio
} }
Label { MobileComponents.Label {
text: "FontMetrics pointSize:" text: "FontMetrics pointSize:"
} }
Label { MobileComponents.Label {
text: fm.font.pointSize text: fm.font.pointSize
} }
Label { MobileComponents.Label {
text: "FontMetrics pixelSize:" text: "FontMetrics pixelSize:"
} }
Label { MobileComponents.Label {
text: fm.height text: fm.height
} }
Label { MobileComponents.Label {
text: "hand-computed devicePixelRatio:" text: "hand-computed devicePixelRatio:"
} }
Label { MobileComponents.Label {
text: fm.height / fm.font.pointSize text: fm.height / fm.font.pointSize
} }
@ -65,7 +66,7 @@ GridLayout {
text: font.pointSize text: font.pointSize
} }
Label { MobileComponents.Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillHeight: true Layout.fillHeight: true
} }

7
qt-mobile/qml/components/Label.qml
View file

@ -1,9 +1,6 @@
import QtQuick 2.5 import QtQuick 2.5
//import QtQuick.Controls 1.2 as QuickControls import org.kde.plasma.mobilecomponents 0.2 as MobileComponents
import QtQuick.Window 2.2
import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
Text { Text {
color: theme.textColor color: MobileComponents.Theme.textColor
} }