Commit 5a314fcd authored by Nate Graham's avatar Nate Graham
Browse files

Port to PlasmaExtras version of Highlight

This lets us get rid of some PC2 imports.
parent 0adb7e20
Pipeline #146481 passed with stage
in 1 minute and 29 seconds
......@@ -11,7 +11,7 @@ import QtQuick.Dialogs 1.0 as QtDialogs
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight and ModelContextMenu and deficiencies with PC3 ToolButton+ToolTip (see inline TODOs)
import org.kde.plasma.components 2.0 as PlasmaComponents // for ModelContextMenu and deficiencies with PC3 ToolButton+ToolTip (see inline TODOs)
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
......@@ -258,7 +258,7 @@ Item {
model: plasmoid.configuration.history
highlight: PlasmaComponents.Highlight {}
highlight: PlasmaExtras.Highlight {}
highlightMoveDuration: 0
PlasmaComponents3.Button {
......
......@@ -8,7 +8,6 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
......@@ -75,7 +74,7 @@ Item {
id: listView
model: diskQuota.model
boundsBehavior: Flickable.StopAtBounds
highlight: PlasmaComponents.Highlight { }
highlight: PlasmaExtras.Highlight { }
highlightMoveDuration: 0
highlightResizeDuration: 0
currentIndex: -1
......
......@@ -7,7 +7,6 @@ import QtQuick 2.0
import QtQuick.Layouts 1.1
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
......@@ -152,7 +151,7 @@ FocusScope {
}
}
highlight: PlasmaComponents.Highlight {
highlight: PlasmaExtras.Highlight {
hover: true
}
......
......@@ -7,7 +7,7 @@
import QtQuick 2.2
import QtQuick.Layouts 1.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight and ListItem
import org.kde.plasma.components 2.0 as PlasmaComponents // for ListItem
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.purpose 1.0 as Purpose
......@@ -38,7 +38,7 @@ PlasmaCore.Dialog
pluginType: "Export"
Component {
id: highlightComponent
PlasmaComponents.Highlight {}
PlasmaExtras.Highlight {}
}
Component.onCompleted: {
if (view.hasOwnProperty("highlight")) { //Purpose 1.1 doesn't have highlight
......
......@@ -11,7 +11,6 @@ import QtQuick.Window 2.1
import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.extras 2.0 as PlasmaExtras
import org.kde.kcoreaddons 1.0 as KCoreAddons // kuser
......@@ -121,7 +120,7 @@ Item {
id: sessionsModel
}
PlasmaComponents.Highlight {
PlasmaExtras.Highlight {
id: delegateHighlight
visible: false
z: -1 // otherwise it shows ontop of the icon/label and tints them slightly
......@@ -159,7 +158,7 @@ Item {
id: userList
model: sessionsModel
highlight: PlasmaComponents.Highlight {}
highlight: PlasmaExtras.Highlight {}
highlightMoveDuration: 0
delegate: ListDelegate {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment