diff --git a/components/mobilehomescreencomponents/qml/AppDrawer.qml b/components/mobilehomescreencomponents/qml/AppDrawer.qml index 16c28a57..b524e0c3 100644 --- a/components/mobilehomescreencomponents/qml/AppDrawer.qml +++ b/components/mobilehomescreencomponents/qml/AppDrawer.qml @@ -123,7 +123,7 @@ Item { id: metrics text: "M\nM" visible: false - font.pointSize: theme.defaultFont.pointSize * 0.9 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9 } OpenDrawerButton { diff --git a/components/mobilehomescreencomponents/qml/DrawerDelegate.qml b/components/mobilehomescreencomponents/qml/DrawerDelegate.qml index 28d897aa..e85fa193 100644 --- a/components/mobilehomescreencomponents/qml/DrawerDelegate.qml +++ b/components/mobilehomescreencomponents/qml/DrawerDelegate.qml @@ -74,7 +74,7 @@ MouseArea { radius: width width: units.smallSpacing height: width - color: theme.highlightColor + color: PlasmaCore.Theme.highlightColor } } @@ -95,7 +95,7 @@ MouseArea { text: model.applicationName //FIXME: export smallestReadableFont - font.pointSize: theme.defaultFont.pointSize * 0.9 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9 color: "white" } } diff --git a/components/mobilehomescreencomponents/qml/HomeDelegate.qml b/components/mobilehomescreencomponents/qml/HomeDelegate.qml index 58e8b575..328686cd 100644 --- a/components/mobilehomescreencomponents/qml/HomeDelegate.qml +++ b/components/mobilehomescreencomponents/qml/HomeDelegate.qml @@ -129,7 +129,7 @@ ContainmentLayoutManager.ItemContainer { radius: width width: PlasmaCore.Units.smallSpacing height: width - color: theme.highlightColor + color: PlasmaCore.Theme.highlightColor } //TODO: in loader? Private.DelegateRemoveButton { @@ -155,8 +155,8 @@ ContainmentLayoutManager.ItemContainer { text: model.applicationName //FIXME: export smallestReadableFont - font.pointSize: theme.defaultFont.pointSize * 0.9 - color: "white"//model.applicationLocation == HomeScreenComponents.ApplicationListModel.Desktop ? "white" : theme.textColor + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9 + color: "white"//model.applicationLocation == HomeScreenComponents.ApplicationListModel.Desktop ? "white" : PlasmaCore.Theme.textColor layer.enabled: true//model.applicationLocation == HomeScreenComponents.ApplicationListModel.Desktop layer.effect: DropShadow { diff --git a/components/mobilehomescreencomponents/qml/HomeScreenContents.qml b/components/mobilehomescreencomponents/qml/HomeScreenContents.qml index 77f29579..424b9246 100644 --- a/components/mobilehomescreencomponents/qml/HomeScreenContents.qml +++ b/components/mobilehomescreencomponents/qml/HomeScreenContents.qml @@ -203,7 +203,7 @@ DragDrop.DropArea { id: metrics text: "M\nM" visible: false - font.pointSize: theme.defaultFont.pointSize * 0.9 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9 } LauncherRepeater { id: launcherRepeater diff --git a/components/mobilehomescreencomponents/qml/LauncherContainer.qml b/components/mobilehomescreencomponents/qml/LauncherContainer.qml index 656ff1a0..b1b55f90 100644 --- a/components/mobilehomescreencomponents/qml/LauncherContainer.qml +++ b/components/mobilehomescreencomponents/qml/LauncherContainer.qml @@ -35,7 +35,7 @@ Item { id: metrics text: "M\nM" visible: false - font.pointSize: theme.defaultFont.pointSize * 0.9 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize * 0.9 } Item { diff --git a/components/mobilehomescreencomponents/qml/private/ActionButton.qml b/components/mobilehomescreencomponents/qml/private/ActionButton.qml index 9f0629e1..bc0595eb 100644 --- a/components/mobilehomescreencomponents/qml/private/ActionButton.qml +++ b/components/mobilehomescreencomponents/qml/private/ActionButton.qml @@ -93,7 +93,7 @@ PlasmaCore.ToolTipArea { id: actionText text: button.text style: Text.Outline - color: theme.textColor + color: PlasmaCore.Theme.textColor styleColor: Qt.rgba(1,1,1,0.4) anchors.verticalCenter: parent.verticalCenter } diff --git a/components/mobilehomescreencomponents/qml/private/OpenDrawerButton.qml b/components/mobilehomescreencomponents/qml/private/OpenDrawerButton.qml index 9f1e6b54..198a5843 100644 --- a/components/mobilehomescreencomponents/qml/private/OpenDrawerButton.qml +++ b/components/mobilehomescreencomponents/qml/private/OpenDrawerButton.qml @@ -51,7 +51,7 @@ MouseArea { left: parent.left verticalCenterOffset: -arrowUpIcon.height/4 + (arrowUpIcon.height/4) * arrowUpIcon.factor } - color: PlasmaCore.Theme.complementaryBackgroundColor + color: PlasmaCore.Theme.backgroundColor transformOrigin: Item.Right rotation: -45 + 90 * arrowUpIcon.factor antialiasing: true @@ -64,7 +64,7 @@ MouseArea { right: parent.right verticalCenterOffset: -arrowUpIcon.height/4 + (arrowUpIcon.height/4) * arrowUpIcon.factor } - color: PlasmaCore.Theme.complementaryBackgroundColor + color: PlasmaCore.Theme.backgroundColor transformOrigin: Item.Left rotation: 45 - 90 * arrowUpIcon.factor antialiasing: true diff --git a/containments/panel/package/contents/ui/quicksettings/Delegate.qml b/containments/panel/package/contents/ui/quicksettings/Delegate.qml index df359793..76023231 100644 --- a/containments/panel/package/contents/ui/quicksettings/Delegate.qml +++ b/containments/panel/package/contents/ui/quicksettings/Delegate.qml @@ -104,7 +104,7 @@ ColumnLayout { text: delegateRoot.text bottomPadding: units.smallSpacing * 2 horizontalAlignment: Text.AlignHCenter - font.pixelSize: theme.defaultFont.pixelSize * 0.8 + font.pixelSize: PlasmaCore.Theme.defaultFont.pixelSize * 0.8 elide: Text.ElideRight verticalAlignment: Text.AlignVCenter diff --git a/containments/taskpanel/package/contents/ui/Task.qml b/containments/taskpanel/package/contents/ui/Task.qml index 0e5bece8..6eb52884 100644 --- a/containments/taskpanel/package/contents/ui/Task.qml +++ b/containments/taskpanel/package/contents/ui/Task.qml @@ -78,7 +78,7 @@ Item { width: parent.width height: parent.height radius: units.smallSpacing - color: theme.backgroundColor + color: PlasmaCore.Theme.backgroundColor opacity: 1 * (1-Math.abs(x)/width) MouseArea { @@ -126,7 +126,7 @@ Item { horizontalAlignment: Text.AlignHCenter elide: Text.ElideRight text: model.AppName - color: theme.textColor + color: PlasmaCore.Theme.textColor } PlasmaComponents.ToolButton { z: 99 diff --git a/look-and-feel/contents/components/ActionButton.qml b/look-and-feel/contents/components/ActionButton.qml index 2f5b7450..b47b034f 100644 --- a/look-and-feel/contents/components/ActionButton.qml +++ b/look-and-feel/contents/components/ActionButton.qml @@ -83,7 +83,7 @@ Item { PlasmaComponents3.Label { id: label - font.pointSize: Math.max(fontSize + 1,theme.defaultFont.pointSize + 1) + font.pointSize: Math.max(fontSize + 1,PlasmaCore.Theme.defaultFont.pointSize + 1) anchors { top: icon.bottom topMargin: (softwareRendering ? 1.5 : 1) * units.smallSpacing diff --git a/look-and-feel/contents/components/UserDelegate.qml b/look-and-feel/contents/components/UserDelegate.qml index 985568f5..1af13f95 100644 --- a/look-and-feel/contents/components/UserDelegate.qml +++ b/look-and-feel/contents/components/UserDelegate.qml @@ -149,7 +149,7 @@ Item { PlasmaComponents.Label { id: usernameDelegate - font.pointSize: Math.max(fontSize + 2,theme.defaultFont.pointSize + 2) + font.pointSize: Math.max(fontSize + 2, PlasmaCore.Theme.defaultFont.pointSize + 2) anchors { bottom: parent.bottom horizontalCenter: parent.horizontalCenter diff --git a/look-and-feel/contents/lockscreen/MediaControls.qml b/look-and-feel/contents/lockscreen/MediaControls.qml index 4ac18b18..b6f54b0c 100644 --- a/look-and-feel/contents/lockscreen/MediaControls.qml +++ b/look-and-feel/contents/lockscreen/MediaControls.qml @@ -108,7 +108,7 @@ Item { elide: Text.ElideRight text: mpris2Source.track || i18nd("plasma_lookandfeel_org.kde.lookandfeel", "No media playing") textFormat: Text.PlainText - font.pointSize: theme.defaultFont.pointSize + 1 + font.pointSize: PlasmaCore.Theme.defaultFont.pointSize + 1 maximumLineCount: 1 } @@ -119,7 +119,7 @@ Item { // if no artist is given, show player name instead text: mpris2Source.artist || mpris2Source.identity || "" textFormat: Text.PlainText - font.pointSize: theme.smallestFont.pointSize + 1 + font.pointSize: PlasmaCore.Theme.smallestFont.pointSize + 1 maximumLineCount: 1 } } diff --git a/look-and-feel/contents/lockscreen/OsdItem.qml b/look-and-feel/contents/lockscreen/OsdItem.qml index bc2ec71d..a11cfacf 100644 --- a/look-and-feel/contents/lockscreen/OsdItem.qml +++ b/look-and-feel/contents/lockscreen/OsdItem.qml @@ -80,11 +80,11 @@ RowLayout { // and plasma-pa:VolumeSlider.qml color: { if (progressBar.value <= 100) { - return theme.textColor + return PlasmaCore.Theme.textColor } else if (progressBar.value > 100 && progressBar.value <= 125) { - return theme.neutralTextColor + return PlasmaCore.Theme.neutralTextColor } else { - return theme.negativeTextColor + return PlasmaCore.Theme.negativeTextColor } } } diff --git a/shell/contents/views/Desktop.qml b/shell/contents/views/Desktop.qml index 2796366b..79b14791 100644 --- a/shell/contents/views/Desktop.qml +++ b/shell/contents/views/Desktop.qml @@ -23,7 +23,7 @@ Rectangle { visible: false //adjust borders is run during setup. We want to avoid painting till completed property Item containment - color: (containment && containment.backgroundHints == PlasmaCore.Types.NoBackground) ? "transparent" : theme.textColor + color: (containment && containment.backgroundHints == PlasmaCore.Types.NoBackground) ? "transparent" : PlasmaCore.Theme.textColor function toggleWidgetExplorer(containment) { console.log("Widget Explorer toggled"); diff --git a/shell/contents/views/Panel.qml b/shell/contents/views/Panel.qml index acda1847..b37d86b2 100644 --- a/shell/contents/views/Panel.qml +++ b/shell/contents/views/Panel.qml @@ -15,7 +15,7 @@ Rectangle { visible: false //adjust borders is run during setup. We want to avoid painting till completed property Item containment - color: !containment || containment.backgroundHints == PlasmaCore.Types.NoBackground ? "transparent" : theme.textColor + color: !containment || containment.backgroundHints == PlasmaCore.Types.NoBackground ? "transparent" : PlasmaCore.Theme.textColor onContainmentChanged: { containment.parent = root;