aboutsummaryrefslogtreecommitdiffstats
path: root/qt-mobile/qml
diff options
context:
space:
mode:
authorGravatar Sebastian Kügler <sebas@kde.org>2015-11-29 19:21:27 +0100
committerGravatar Sebastian Kügler <sebas@kde.org>2015-11-29 19:22:10 +0100
commit6580f078d0ae1d912d9a6b12e2769060b4c77f4b (patch)
tree9906d50affe244b938b45f395076d8ba19325a2b /qt-mobile/qml
parent8fad349c82b0f681d6daa95bcfe843e806b48dd7 (diff)
downloadsubsurface-6580f078d0ae1d912d9a6b12e2769060b4c77f4b.tar.gz
Fix reference errors caused by moving properties around
This makes things like accent(Text)Color and our two custom point sizes for fonts resolve correctly again. Signed-off-by: Sebastian Kügler <sebas@kde.org>
Diffstat (limited to 'qt-mobile/qml')
-rw-r--r--qt-mobile/qml/CloudStorage.qml2
-rw-r--r--qt-mobile/qml/DiveDetails.qml2
-rw-r--r--qt-mobile/qml/DiveList.qml4
-rw-r--r--qt-mobile/qml/Preferences.qml4
-rw-r--r--qt-mobile/qml/TopBar.qml8
-rw-r--r--qt-mobile/qml/main.qml2
6 files changed, 11 insertions, 11 deletions
diff --git a/qt-mobile/qml/CloudStorage.qml b/qt-mobile/qml/CloudStorage.qml
index 3b94aa5e6..897ebfcee 100644
--- a/qt-mobile/qml/CloudStorage.qml
+++ b/qt-mobile/qml/CloudStorage.qml
@@ -22,7 +22,7 @@ Item {
Label {
text: "Cloud credentials"
Layout.bottomMargin: MobileComponents.Units.largeSpacing
- font.pointSize: MobileComponents.Units.titlePointSize
+ font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2
}
diff --git a/qt-mobile/qml/DiveDetails.qml b/qt-mobile/qml/DiveDetails.qml
index 5b597a0df..401921c9f 100644
--- a/qt-mobile/qml/DiveDetails.qml
+++ b/qt-mobile/qml/DiveDetails.qml
@@ -44,7 +44,7 @@ Item {
Label {
Layout.columnSpan: 2
- font.pointSize: MobileComponents.Units.titlePointSize
+ font.pointSize: subsurfaceTheme.titlePointSize
text: "Dive " + number + " (" + date + ")"
}
diff --git a/qt-mobile/qml/DiveList.qml b/qt-mobile/qml/DiveList.qml
index 2a9c53de6..e0c8f4251 100644
--- a/qt-mobile/qml/DiveList.qml
+++ b/qt-mobile/qml/DiveList.qml
@@ -68,7 +68,7 @@ Rectangle {
text: date
opacity: 0.6
color: MobileComponents.Theme.textColor
- font.pointSize: smallPointSize
+ font.pointSize: subsurfaceTheme.smallPointSize
anchors {
right: parent.right
top: parent.top
@@ -156,7 +156,7 @@ Rectangle {
leftMargin: MobileComponents.Units.smallSpacing
right: parent.right
}
- color: MobileComponents.Theme.accentColor
+ color: subsurfaceTheme.accentColor
}
}
}
diff --git a/qt-mobile/qml/Preferences.qml b/qt-mobile/qml/Preferences.qml
index 1e1274e21..8cae95ff0 100644
--- a/qt-mobile/qml/Preferences.qml
+++ b/qt-mobile/qml/Preferences.qml
@@ -23,7 +23,7 @@ Item {
Label {
text: "Cloud credentials"
Layout.bottomMargin: MobileComponents.Units.largeSpacing
- font.pointSize: MobileComponents.Units.titlePointSize
+ font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2
}
@@ -76,7 +76,7 @@ Item {
Label {
text: "Subsurface GPS data webservice"
Layout.bottomMargin: MobileComponents.Units.largeSpacing
- font.pointSize: MobileComponents.Units.titlePointSize
+ font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2
}
diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml
index 43a5ad6af..f07a88e47 100644
--- a/qt-mobile/qml/TopBar.qml
+++ b/qt-mobile/qml/TopBar.qml
@@ -13,7 +13,7 @@ Rectangle {
property bool goBack: (stackView.depth > 1)
- color: MobileComponents.Theme.accentColor
+ color: subsurfaceTheme.accentColor
Layout.minimumHeight: MobileComponents.Units.gridUnit * 2 + MobileComponents.Units.largeSpacing
Layout.fillWidth: true
Layout.margins: 0
@@ -47,7 +47,7 @@ Rectangle {
font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 1.5
verticalAlignment: Text.AlignBottom
Layout.fillWidth: false
- color: MobileComponents.Theme.accentTextColor
+ color: subsurfaceTheme.accentTextColor
}
}
Item {
@@ -63,11 +63,11 @@ Rectangle {
style: ButtonStyle {
background: Rectangle {
implicitWidth: MobileComponents.Units.gridUnit * 2
- color: MobileComponents.Theme.accentColor
+ color: subsurfaceTheme.accentColor
}
label: Text {
id: txt
- color: MobileComponents.Theme.accentTextColor
+ color: subsurfaceTheme.accentTextColor
font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 2
font.bold: true
text: control.text
diff --git a/qt-mobile/qml/main.qml b/qt-mobile/qml/main.qml
index 5f4cdd352..ac2e3eefd 100644
--- a/qt-mobile/qml/main.qml
+++ b/qt-mobile/qml/main.qml
@@ -250,7 +250,7 @@ MobileComponents.ApplicationWindow {
color: MobileComponents.Theme.textColor
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
styleColor: MobileComponents.Theme.textColor
- font.pointSize: MobileComponents.Units.smallPointSize
+ font.pointSize: subsurfaceTheme.smallPointSize
}
}
}