diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml index ce44157a..79ecedd8 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml @@ -9,6 +9,7 @@ import QtQuick.Controls as QQC2 import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami +import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.core 2.0 as PlasmaCore @@ -57,7 +58,7 @@ Components.BaseItem { rightPadding: PlasmaCore.Units.smallSpacing bottomPadding: PlasmaCore.Units.smallSpacing * 4 - background: PlasmaCore.FrameSvgItem { + background: KSvg.FrameSvgItem { enabledBorders: PlasmaCore.FrameSvg.BottomBorder imagePath: "widgets/background" } diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml index 41ee8482..55cb2234 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml @@ -9,6 +9,7 @@ import QtQuick.Controls as QQC2 import QtQuick.Layouts import org.kde.kirigami 2.12 as Kirigami +import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.core 2.0 as PlasmaCore @@ -38,7 +39,7 @@ Components.BaseItem { rightPadding: PlasmaCore.Units.smallSpacing * 4 bottomPadding: PlasmaCore.Units.smallSpacing * 4 - background: PlasmaCore.FrameSvgItem { + background: KSvg.FrameSvgItem { enabledBorders: PlasmaCore.FrameSvg.AllBorders imagePath: "widgets/background" } diff --git a/components/mobileshell/qml/volumeosd/ListItemBase.qml b/components/mobileshell/qml/volumeosd/ListItemBase.qml index cb89daf7..eed068b6 100644 --- a/components/mobileshell/qml/volumeosd/ListItemBase.qml +++ b/components/mobileshell/qml/volumeosd/ListItemBase.qml @@ -11,6 +11,7 @@ import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 +import org.kde.ksvg 1.0 as KSvg import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents @@ -151,7 +152,7 @@ Controls.ItemDelegate { Accessible.name: i18nc("Accessibility data on volume slider", "Adjust volume for %1", baseItem.label) - background: PlasmaCore.FrameSvgItem { + background: KSvg.FrameSvgItem { imagePath: "widgets/slider" prefix: "groove" width: parent.availableWidth @@ -159,7 +160,7 @@ Controls.ItemDelegate { anchors.centerIn: parent scale: parent.mirrored ? -1 : 1 - PlasmaCore.FrameSvgItem { + KSvg.FrameSvgItem { imagePath: "widgets/slider" prefix: "groove-highlight" anchors.left: parent.left diff --git a/components/mobileshell/qml/volumeosd/PopupCard.qml b/components/mobileshell/qml/volumeosd/PopupCard.qml index 7208718f..780821c6 100644 --- a/components/mobileshell/qml/volumeosd/PopupCard.qml +++ b/components/mobileshell/qml/volumeosd/PopupCard.qml @@ -9,6 +9,7 @@ import QtQuick.Controls as Controls import QtQuick.Layouts import QtQuick.Window +import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents @@ -17,7 +18,7 @@ Controls.Control { id: content implicitWidth: Math.min(PlasmaCore.Units.gridUnit * 20, parent.width - PlasmaCore.Units.largeSpacing * 2) padding: PlasmaCore.Units.smallSpacing * 2 - background: PlasmaCore.FrameSvgItem { + background: KSvg.FrameSvgItem { imagePath: "widgets/background" anchors.margins: -PlasmaCore.Units.smallSpacing * 2 anchors.fill: parent diff --git a/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml b/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml index 5d7ba9af..21003c2c 100644 --- a/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml +++ b/containments/homescreens/folio/package/contents/ui/private/ActionButton.qml @@ -7,6 +7,7 @@ import QtQuick 2.0 import org.kde.plasma.core 2.0 as PlasmaCore +import org.kde.ksvg 1.0 as KSvg PlasmaCore.ToolTipArea { id: button @@ -16,7 +17,7 @@ PlasmaCore.ToolTipArea { mainItem: toolTipDelegate //API - property PlasmaCore.Svg svg + property KSvg.Svg svg property alias elementId: icon.elementId property QtObject action property bool backgroundVisible: false @@ -51,12 +52,12 @@ PlasmaCore.ToolTipArea { } } - PlasmaCore.Svg { + KSvg.Svg { id: buttonSvg imagePath: "widgets/actionbutton" } - PlasmaCore.SvgItem { + KSvg.SvgItem { id: shadowItem svg: buttonSvg elementId: "shadow" @@ -72,7 +73,7 @@ PlasmaCore.ToolTipArea { width: buttonItem.visible?buttonItem.width:iconSize height: buttonItem.visible?buttonItem.height:iconSize - PlasmaCore.SvgItem { + KSvg.SvgItem { id: buttonItem svg: buttonSvg elementId: "normal" @@ -81,7 +82,7 @@ PlasmaCore.ToolTipArea { visible: backgroundVisible } - PlasmaCore.SvgItem { + KSvg.SvgItem { id: icon width: iconSize height: iconSize diff --git a/containments/homescreens/folio/package/contents/ui/private/ConfigOverlay.qml b/containments/homescreens/folio/package/contents/ui/private/ConfigOverlay.qml index 03a1878d..da8d8807 100644 --- a/containments/homescreens/folio/package/contents/ui/private/ConfigOverlay.qml +++ b/containments/homescreens/folio/package/contents/ui/private/ConfigOverlay.qml @@ -10,6 +10,7 @@ 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 3.0 as PlasmaComponents +import org.kde.ksvg 1.0 as KSvg import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager @@ -21,7 +22,7 @@ ContainmentLayoutManager.ConfigOverlayWithHandles { signal requestEditModeClose readonly property int iconSize: PlasmaCore.Units.iconSizes.medium - PlasmaCore.Svg { + KSvg.Svg { id: configIconsSvg imagePath: "widgets/configuration-icons" } @@ -54,7 +55,7 @@ ContainmentLayoutManager.ConfigOverlayWithHandles { } } } - PlasmaCore.FrameSvgItem { + KSvg.FrameSvgItem { id: frame anchors.centerIn: parent diff --git a/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml b/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml index fbfbdb2c..71394156 100644 --- a/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml +++ b/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml @@ -7,15 +7,16 @@ import QtQuick 2.4 import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore - -PlasmaCore.SvgItem { +import org.kde.ksvg 1.0 as KSvg + +KSvg.SvgItem { id: scrollIndicator anchors.verticalCenter: parent.verticalCenter z: 2 opacity: 0 - svg: PlasmaCore.Svg { + svg: KSvg.Svg { imagePath: "widgets/arrows" colorGroup: PlasmaCore.Theme.ComplementaryColorGroup } diff --git a/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml b/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml index 6b17d242..af0d9776 100644 --- a/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml +++ b/initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml @@ -10,6 +10,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.kirigami 2.2 as Kirigami import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm +import org.kde.ksvg 1.0 as KSvg MobileForm.AbstractFormDelegate { topPadding: Kirigami.Units.smallSpacing @@ -53,11 +54,11 @@ MobileForm.AbstractFormDelegate { Layout.preferredWidth: Kirigami.Units.gridUnit Layout.preferredHeight: Kirigami.Units.gridUnit - PlasmaCore.SvgItem { + KSvg.SvgItem { id: connectionSvgIcon elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon - svg: PlasmaCore.Svg { + svg: KSvg.Svg { multipleImages: true imagePath: "icons/network" colorGroup: PlasmaCore.ColorScope.colorGroup diff --git a/kcms/wifi/ui/ConnectionItemDelegate.qml b/kcms/wifi/ui/ConnectionItemDelegate.qml index e2396e10..7be15ba7 100644 --- a/kcms/wifi/ui/ConnectionItemDelegate.qml +++ b/kcms/wifi/ui/ConnectionItemDelegate.qml @@ -10,6 +10,7 @@ import QtQuick.Controls 2.2 as Controls import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.kirigami 2.2 as Kirigami +import org.kde.ksvg 1.0 as KSvg Kirigami.SwipeListItem { @@ -31,11 +32,11 @@ Kirigami.SwipeListItem { Layout.preferredWidth: Kirigami.Units.gridUnit Layout.preferredHeight: Kirigami.Units.gridUnit - PlasmaCore.SvgItem { + KSvg.SvgItem { id: connectionSvgIcon elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon - svg: PlasmaCore.Svg { + svg: KSvg.Svg { multipleImages: true imagePath: "icons/network" colorGroup: PlasmaCore.ColorScope.colorGroup diff --git a/shell/contents/configuration/ContainmentConfiguration.qml b/shell/contents/configuration/ContainmentConfiguration.qml index e8347d54..57e3351b 100644 --- a/shell/contents/configuration/ContainmentConfiguration.qml +++ b/shell/contents/configuration/ContainmentConfiguration.qml @@ -77,7 +77,7 @@ AppletConfiguration { duration: PlasmaCore.Units.longDuration } - background: PlasmaCore.FrameSvgItem { + background: KSvg.FrameSvgItem { enabledBorders: PlasmaCore.FrameSvg.AllBorders imagePath: "widgets/background" }