From 10ae2a245e5e83b0850d3d6d88284a6fb1dfebba Mon Sep 17 00:00:00 2001 From: Janet Blackquill Date: Mon, 7 Mar 2022 13:30:14 -0500 Subject: [PATCH] Port to PlasmaExtras.Highlight Done automatically w/ qml-refactor-fairy --- applets/clipboard/contents/ui/Menu.qml | 3 +-- .../package/contents/ui/FullRepresentation.qml | 5 ++--- applets/systemtray/package/contents/ui/HiddenItemsView.qml | 4 ++-- lookandfeel/contents/runcommand/RunCommand.qml | 3 +-- lookandfeel/contents/windowswitcher/WindowSwitcher.qml | 3 +-- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/applets/clipboard/contents/ui/Menu.qml b/applets/clipboard/contents/ui/Menu.qml index 3e7056dbb..a40b9db72 100644 --- a/applets/clipboard/contents/ui/Menu.qml +++ b/applets/clipboard/contents/ui/Menu.qml @@ -8,7 +8,6 @@ import QtQuick 2.15 import QtQml 2.15 import org.kde.plasma.extras 2.0 as PlasmaExtras 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.kirigami 2.12 as Kirigami @@ -37,7 +36,7 @@ PlasmaComponents3.ScrollView { id: menuListView focus: true - highlight: PlasmaComponents.Highlight { } + highlight: PlasmaExtras.Highlight { } highlightMoveDuration: 0 highlightResizeDuration: 0 currentIndex: -1 diff --git a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml index 1c13a025a..56567d6bf 100644 --- a/applets/devicenotifier/package/contents/ui/FullRepresentation.qml +++ b/applets/devicenotifier/package/contents/ui/FullRepresentation.qml @@ -13,7 +13,6 @@ import QtQuick.Window 2.2 import QtQuick.Layouts 1.1 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 @@ -70,7 +69,7 @@ PlasmaExtras.Representation { // this item is reparented to a delegate that is showing a message to draw focus to it - PlasmaComponents.Highlight { + PlasmaExtras.Highlight { id: messageHighlight visible: false @@ -131,7 +130,7 @@ PlasmaExtras.Representation { delegate: DeviceItem { udi: DataEngineSource } - highlight: PlasmaComponents.Highlight { } + highlight: PlasmaExtras.Highlight { } highlightMoveDuration: 0 highlightResizeDuration: 0 diff --git a/applets/systemtray/package/contents/ui/HiddenItemsView.qml b/applets/systemtray/package/contents/ui/HiddenItemsView.qml index a5c322daf..6165f6522 100644 --- a/applets/systemtray/package/contents/ui/HiddenItemsView.qml +++ b/applets/systemtray/package/contents/ui/HiddenItemsView.qml @@ -9,10 +9,10 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.1 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents // For Highlight import org.kde.plasma.components 3.0 as PlasmaComponents3 import "items" +import org.kde.plasma.extras 2.0 as PlasmaExtras PlasmaComponents3.ScrollView { id: hiddenTasksView @@ -39,7 +39,7 @@ PlasmaComponents3.ScrollView { cellHeight: Math.floor(hiddenTasks.height / hiddenTasks.rows) currentIndex: -1 - highlight: PlasmaComponents.Highlight {} + highlight: PlasmaExtras.Highlight {} highlightMoveDuration: 0 pixelAligned: true diff --git a/lookandfeel/contents/runcommand/RunCommand.qml b/lookandfeel/contents/runcommand/RunCommand.qml index d37d51b5e..4a0d9c370 100644 --- a/lookandfeel/contents/runcommand/RunCommand.qml +++ b/lookandfeel/contents/runcommand/RunCommand.qml @@ -8,7 +8,6 @@ import QtQuick 2.6 import QtQuick.Layouts 1.1 import QtQuick.Window 2.1 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.milou 0.1 as Milou @@ -309,7 +308,7 @@ ColumnLayout { ListView { id: listView // needs this id so the delegate can access it keyNavigationWraps: true - highlight: PlasmaComponents.Highlight {} + highlight: PlasmaExtras.Highlight {} highlightMoveDuration: 0 activeFocusOnTab: true model: [] diff --git a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml index 97d8dbf19..01e3b8eb0 100644 --- a/lookandfeel/contents/windowswitcher/WindowSwitcher.qml +++ b/lookandfeel/contents/windowswitcher/WindowSwitcher.qml @@ -8,7 +8,6 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.components 2.0 as PlasmaComponents // for Highlight import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.kwin 2.0 as KWin @@ -112,7 +111,7 @@ KWin.Switcher { } } - highlight: PlasmaComponents.Highlight {} + highlight: PlasmaExtras.Highlight {} } /*