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

Fix reference errors caused by moving properties around

Browse source 
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>
This commit is contained in:
Sebastian Kügler 2015-11-29 19:21:27 +01:00
parent 8fad349c82
commit 6580f078d0
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ Item {
Label { Label {
text: "Cloud credentials" text: "Cloud credentials"
Layout.bottomMargin: MobileComponents.Units.largeSpacing Layout.bottomMargin: MobileComponents.Units.largeSpacing
font.pointSize: MobileComponents.Units.titlePointSize font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2 Layout.columnSpan: 2
} }

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

@ -44,7 +44,7 @@ Item {
Label { Label {
Layout.columnSpan: 2 Layout.columnSpan: 2
font.pointSize: MobileComponents.Units.titlePointSize font.pointSize: subsurfaceTheme.titlePointSize
text: "Dive " + number + " (" + date + ")" text: "Dive " + number + " (" + date + ")"
} }

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

@ -68,7 +68,7 @@ Rectangle {
text: date text: date
opacity: 0.6 opacity: 0.6
color: MobileComponents.Theme.textColor color: MobileComponents.Theme.textColor
font.pointSize: smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
anchors { anchors {
right: parent.right right: parent.right
top: parent.top top: parent.top
@ -156,7 +156,7 @@ Rectangle {
leftMargin: MobileComponents.Units.smallSpacing leftMargin: MobileComponents.Units.smallSpacing
right: parent.right right: parent.right
} }
color: MobileComponents.Theme.accentColor color: subsurfaceTheme.accentColor
} }
} }
} }

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

@ -23,7 +23,7 @@ Item {
Label { Label {
text: "Cloud credentials" text: "Cloud credentials"
Layout.bottomMargin: MobileComponents.Units.largeSpacing Layout.bottomMargin: MobileComponents.Units.largeSpacing
font.pointSize: MobileComponents.Units.titlePointSize font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2 Layout.columnSpan: 2
} }
@ -76,7 +76,7 @@ Item {
Label { Label {
text: "Subsurface GPS data webservice" text: "Subsurface GPS data webservice"
Layout.bottomMargin: MobileComponents.Units.largeSpacing Layout.bottomMargin: MobileComponents.Units.largeSpacing
font.pointSize: MobileComponents.Units.titlePointSize font.pointSize: subsurfaceTheme.titlePointSize
Layout.columnSpan: 2 Layout.columnSpan: 2
} }

8
qt-mobile/qml/TopBar.qml
View file

@ -13,7 +13,7 @@ Rectangle {
property bool goBack: (stackView.depth > 1) property bool goBack: (stackView.depth > 1)
color: MobileComponents.Theme.accentColor color: subsurfaceTheme.accentColor
Layout.minimumHeight: MobileComponents.Units.gridUnit * 2 + MobileComponents.Units.largeSpacing Layout.minimumHeight: MobileComponents.Units.gridUnit * 2 + MobileComponents.Units.largeSpacing
Layout.fillWidth: true Layout.fillWidth: true
Layout.margins: 0 Layout.margins: 0
@ -47,7 +47,7 @@ Rectangle {
font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 1.5 font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 1.5
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
Layout.fillWidth: false Layout.fillWidth: false
color: MobileComponents.Theme.accentTextColor color: subsurfaceTheme.accentTextColor
} }
} }
Item { Item {
@ -63,11 +63,11 @@ Rectangle {
style: ButtonStyle { style: ButtonStyle {
background: Rectangle { background: Rectangle {
implicitWidth: MobileComponents.Units.gridUnit * 2 implicitWidth: MobileComponents.Units.gridUnit * 2
color: MobileComponents.Theme.accentColor color: subsurfaceTheme.accentColor
} }
label: Text { label: Text {
id: txt id: txt
color: MobileComponents.Theme.accentTextColor color: subsurfaceTheme.accentTextColor
font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 2 font.pointSize: MobileComponents.Units.fontMetrics.font.pointSize * 2
font.bold: true font.bold: true
text: control.text text: control.text

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

@ -250,7 +250,7 @@ MobileComponents.ApplicationWindow {
color: MobileComponents.Theme.textColor color: MobileComponents.Theme.textColor
wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere wrapMode: TextEdit.WrapAtWordBoundaryOrAnywhere
styleColor: MobileComponents.Theme.textColor styleColor: MobileComponents.Theme.textColor
font.pointSize: MobileComponents.Units.smallPointSize font.pointSize: subsurfaceTheme.smallPointSize
} }
} }
} }