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

mobile-widget/qml/Settings.qml: correct theme switches

Browse source 
Replace subsurfaceTheme with ThemeNew, since there are still 2 objects
subsurfaceTheme in main.qml and ThemeNew in themeinterface.*

Replace theme color references with ThemeNew, as they are no longer available
in main.qml (subsurfaceTheme).

Signed-off-by: jan Iversen <jan@casacondor.com>
This commit is contained in:
jan Iversen 2020-01-28 15:25:52 +01:00 • committed by Dirk Hohndel
parent 1d35942249
commit f424f9292e
1 changed files with 21 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
mobile-widgets/qml/Settings.qml
View file

@ -156,7 +156,7 @@ Kirigami.ScrollablePage {
Layout.preferredWidth: gridWidth * 0.6 Layout.preferredWidth: gridWidth * 0.6
Rectangle { Rectangle {
id: blueRect id: blueRect
color: subsurfaceTheme.blueBackgroundColor color: ThemeNew.blueBackgroundColor
border.color: "black" border.color: "black"
width: sampleRegularBlue.width + Kirigami.Units.gridUnit width: sampleRegularBlue.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -164,7 +164,7 @@ Kirigami.ScrollablePage {
id: sampleRegularBlue id: sampleRegularBlue
text: qsTr("regular text") text: qsTr("regular text")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.blueTextColor color: ThemeNew.blueTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -172,7 +172,7 @@ Kirigami.ScrollablePage {
} }
} }
Rectangle { Rectangle {
color: subsurfaceTheme.bluePrimaryColor color: ThemeNew.bluePrimaryColor
border.color: "black" border.color: "black"
width: sampleHighlightBlue.width + Kirigami.Units.gridUnit width: sampleHighlightBlue.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -180,7 +180,7 @@ Kirigami.ScrollablePage {
id: sampleHighlightBlue id: sampleHighlightBlue
text: qsTr("Highlight") text: qsTr("Highlight")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.bluePrimaryTextColor color: ThemeNew.bluePrimaryTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -191,11 +191,10 @@ Kirigami.ScrollablePage {
SsrfSwitch { SsrfSwitch {
id: blueButton id: blueButton
Layout.preferredWidth: gridWidth * 0.25 Layout.preferredWidth: gridWidth * 0.25
checked: subsurfaceTheme.currentTheme === "Blue" checked: ThemeNew.currentTheme === "Blue"
enabled: subsurfaceTheme.currentTheme !== "Blue" enabled: ThemeNew.currentTheme !== "Blue"
onClicked: { onClicked: {
blueTheme() ThemeNew.currentTheme = "Blue"
PrefDisplay.theme = subsurfaceTheme.currentTheme
} }
} }
@ -209,7 +208,7 @@ Kirigami.ScrollablePage {
Layout.preferredWidth: gridWidth * 0.6 Layout.preferredWidth: gridWidth * 0.6
Rectangle { Rectangle {
id: pinkRect id: pinkRect
color: subsurfaceTheme.pinkBackgroundColor color: ThemeNew.pinkBackgroundColor
border.color: "black" border.color: "black"
width: sampleRegularPink.width + Kirigami.Units.gridUnit width: sampleRegularPink.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -217,7 +216,7 @@ Kirigami.ScrollablePage {
id: sampleRegularPink id: sampleRegularPink
text: qsTr("regular text") text: qsTr("regular text")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.pinkTextColor color: ThemeNew.pinkTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -225,7 +224,7 @@ Kirigami.ScrollablePage {
} }
} }
Rectangle { Rectangle {
color: subsurfaceTheme.pinkPrimaryColor color: ThemeNew.pinkPrimaryColor
border.color: "black" border.color: "black"
width: sampleHighlightPink.width + Kirigami.Units.gridUnit width: sampleHighlightPink.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -233,7 +232,7 @@ Kirigami.ScrollablePage {
id: sampleHighlightPink id: sampleHighlightPink
text: qsTr("Highlight") text: qsTr("Highlight")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.pinkPrimaryTextColor color: ThemeNew.pinkPrimaryTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -245,11 +244,10 @@ Kirigami.ScrollablePage {
SsrfSwitch { SsrfSwitch {
id: pinkButton id: pinkButton
Layout.preferredWidth: gridWidth * 0.25 Layout.preferredWidth: gridWidth * 0.25
checked: subsurfaceTheme.currentTheme === "Pink" checked: ThemeNew.currentTheme === "Pink"
enabled: subsurfaceTheme.currentTheme !== "Pink" enabled: ThemeNew.currentTheme !== "Pink"
onClicked: { onClicked: {
pinkTheme() ThemeNew.currentTheme = "Pink"
PrefDisplay.theme = subsurfaceTheme.currentTheme
} }
} }
@ -262,7 +260,7 @@ Kirigami.ScrollablePage {
Layout.preferredWidth: gridWidth * 0.6 Layout.preferredWidth: gridWidth * 0.6
Rectangle { Rectangle {
id: blackRect id: blackRect
color: subsurfaceTheme.darkBackgroundColor color: ThemeNew.darkBackgroundColor
border.color: "black" border.color: "black"
width: sampleRegularDark.width + Kirigami.Units.gridUnit width: sampleRegularDark.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -270,7 +268,7 @@ Kirigami.ScrollablePage {
id: sampleRegularDark id: sampleRegularDark
text: qsTr("regular text") text: qsTr("regular text")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.darkTextColor color: ThemeNew.darkTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -278,7 +276,7 @@ Kirigami.ScrollablePage {
} }
} }
Rectangle { Rectangle {
color: subsurfaceTheme.darkPrimaryColor color: ThemeNew.darkPrimaryColor
border.color: "black" border.color: "black"
width: sampleHighlightDark.width + Kirigami.Units.gridUnit width: sampleHighlightDark.width + Kirigami.Units.gridUnit
height: Kirigami.Units.gridUnit * 2 height: Kirigami.Units.gridUnit * 2
@ -286,7 +284,7 @@ Kirigami.ScrollablePage {
id: sampleHighlightDark id: sampleHighlightDark
text: qsTr("Highlight") text: qsTr("Highlight")
font.pointSize: subsurfaceTheme.regularPointSize font.pointSize: subsurfaceTheme.regularPointSize
color: subsurfaceTheme.darkPrimaryTextColor color: ThemeNew.darkPrimaryTextColor
anchors { anchors {
horizontalCenter: parent.horizontalCenter horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter verticalCenter: parent.verticalCenter
@ -297,11 +295,10 @@ Kirigami.ScrollablePage {
SsrfSwitch { SsrfSwitch {
id: darkButton id: darkButton
Layout.preferredWidth: gridWidth * 0.25 Layout.preferredWidth: gridWidth * 0.25
checked: subsurfaceTheme.currentTheme === "Dark" checked: ThemeNew.currentTheme === "Dark"
enabled: subsurfaceTheme.currentTheme !== "Dark" enabled: ThemeNew.currentTheme !== "Dark"
onClicked: { onClicked: {
darkTheme() ThemeNew.currentTheme = "Dark"
PrefDisplay.theme = subsurfaceTheme.currentTheme
} }
} }
TemplateLabel { TemplateLabel {