marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

port QML to KSvg

Browse source 
Search and replace all the occurrences of Svg/FrameSvgItem/SvgItem
to their new implementation from KSvg.
Changes only namespace, API is the same

See also:
https://invent.kde.org/frameworks/ksvg/-/issues/1
This commit is contained in:
Alexey Andreyev 2023-07-10 01:50:33 +03:00
parent b566834158
commit 2275e2d7dd
10 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml
View file

@ -9,6 +9,7 @@ import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import org.kde.kirigami 2.12 as Kirigami 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 import org.kde.plasma.core 2.0 as PlasmaCore
@ -57,7 +58,7 @@ Components.BaseItem {
rightPadding: PlasmaCore.Units.smallSpacing rightPadding: PlasmaCore.Units.smallSpacing
bottomPadding: PlasmaCore.Units.smallSpacing * 4 bottomPadding: PlasmaCore.Units.smallSpacing * 4
background: PlasmaCore.FrameSvgItem { background: KSvg.FrameSvgItem {
enabledBorders: PlasmaCore.FrameSvg.BottomBorder enabledBorders: PlasmaCore.FrameSvg.BottomBorder
imagePath: "widgets/background" imagePath: "widgets/background"
} }

3
components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml
View file

@ -9,6 +9,7 @@ import QtQuick.Controls as QQC2
import QtQuick.Layouts import QtQuick.Layouts
import org.kde.kirigami 2.12 as Kirigami 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 import org.kde.plasma.core 2.0 as PlasmaCore
@ -38,7 +39,7 @@ Components.BaseItem {
rightPadding: PlasmaCore.Units.smallSpacing * 4 rightPadding: PlasmaCore.Units.smallSpacing * 4
bottomPadding: PlasmaCore.Units.smallSpacing * 4 bottomPadding: PlasmaCore.Units.smallSpacing * 4
background: PlasmaCore.FrameSvgItem { background: KSvg.FrameSvgItem {
enabledBorders: PlasmaCore.FrameSvg.AllBorders enabledBorders: PlasmaCore.FrameSvg.AllBorders
imagePath: "widgets/background" imagePath: "widgets/background"
} }

5
components/mobileshell/qml/volumeosd/ListItemBase.qml
View file

@ -11,6 +11,7 @@ import QtQuick.Controls 2.15 as Controls
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.kde.ksvg 1.0 as KSvg
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.core 2.1 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents 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) Accessible.name: i18nc("Accessibility data on volume slider", "Adjust volume for %1", baseItem.label)
background: PlasmaCore.FrameSvgItem { background: KSvg.FrameSvgItem {
imagePath: "widgets/slider" imagePath: "widgets/slider"
prefix: "groove" prefix: "groove"
width: parent.availableWidth width: parent.availableWidth
@ -159,7 +160,7 @@ Controls.ItemDelegate {
anchors.centerIn: parent anchors.centerIn: parent
scale: parent.mirrored ? -1 : 1 scale: parent.mirrored ? -1 : 1
PlasmaCore.FrameSvgItem { KSvg.FrameSvgItem {
imagePath: "widgets/slider" imagePath: "widgets/slider"
prefix: "groove-highlight" prefix: "groove-highlight"
anchors.left: parent.left anchors.left: parent.left

3
components/mobileshell/qml/volumeosd/PopupCard.qml
View file

@ -9,6 +9,7 @@ import QtQuick.Controls as Controls
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Window import QtQuick.Window
import org.kde.ksvg 1.0 as KSvg
import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.core 2.1 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
@ -17,7 +18,7 @@ Controls.Control {
id: content id: content
implicitWidth: Math.min(PlasmaCore.Units.gridUnit * 20, parent.width - PlasmaCore.Units.largeSpacing * 2) implicitWidth: Math.min(PlasmaCore.Units.gridUnit * 20, parent.width - PlasmaCore.Units.largeSpacing * 2)
padding: PlasmaCore.Units.smallSpacing * 2 padding: PlasmaCore.Units.smallSpacing * 2
background: PlasmaCore.FrameSvgItem { background: KSvg.FrameSvgItem {
imagePath: "widgets/background" imagePath: "widgets/background"
anchors.margins: -PlasmaCore.Units.smallSpacing * 2 anchors.margins: -PlasmaCore.Units.smallSpacing * 2
anchors.fill: parent anchors.fill: parent

11
containments/homescreens/folio/package/contents/ui/private/ActionButton.qml
View file

@ -7,6 +7,7 @@
import QtQuick 2.0 import QtQuick 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.ksvg 1.0 as KSvg
PlasmaCore.ToolTipArea { PlasmaCore.ToolTipArea {
id: button id: button
@ -16,7 +17,7 @@ PlasmaCore.ToolTipArea {
mainItem: toolTipDelegate mainItem: toolTipDelegate
//API //API
property PlasmaCore.Svg svg property KSvg.Svg svg
property alias elementId: icon.elementId property alias elementId: icon.elementId
property QtObject action property QtObject action
property bool backgroundVisible: false property bool backgroundVisible: false
@ -51,12 +52,12 @@ PlasmaCore.ToolTipArea {
} }
} }
PlasmaCore.Svg { KSvg.Svg {
id: buttonSvg id: buttonSvg
imagePath: "widgets/actionbutton" imagePath: "widgets/actionbutton"
} }
PlasmaCore.SvgItem { KSvg.SvgItem {
id: shadowItem id: shadowItem
svg: buttonSvg svg: buttonSvg
elementId: "shadow" elementId: "shadow"
@ -72,7 +73,7 @@ PlasmaCore.ToolTipArea {
width: buttonItem.visible?buttonItem.width:iconSize width: buttonItem.visible?buttonItem.width:iconSize
height: buttonItem.visible?buttonItem.height:iconSize height: buttonItem.visible?buttonItem.height:iconSize
PlasmaCore.SvgItem { KSvg.SvgItem {
id: buttonItem id: buttonItem
svg: buttonSvg svg: buttonSvg
elementId: "normal" elementId: "normal"
@ -81,7 +82,7 @@ PlasmaCore.ToolTipArea {
visible: backgroundVisible visible: backgroundVisible
} }
PlasmaCore.SvgItem { KSvg.SvgItem {
id: icon id: icon
width: iconSize width: iconSize
height: iconSize height: iconSize

5
containments/homescreens/folio/package/contents/ui/private/ConfigOverlay.qml
View file

@ -10,6 +10,7 @@ import QtQuick.Layouts 1.1
import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.plasmoid 2.0
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 3.0 as PlasmaComponents 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 import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager
@ -21,7 +22,7 @@ ContainmentLayoutManager.ConfigOverlayWithHandles {
signal requestEditModeClose signal requestEditModeClose
readonly property int iconSize: PlasmaCore.Units.iconSizes.medium readonly property int iconSize: PlasmaCore.Units.iconSizes.medium
PlasmaCore.Svg { KSvg.Svg {
id: configIconsSvg id: configIconsSvg
imagePath: "widgets/configuration-icons" imagePath: "widgets/configuration-icons"
} }
@ -54,7 +55,7 @@ ContainmentLayoutManager.ConfigOverlayWithHandles {
} }
} }
} }
PlasmaCore.FrameSvgItem { KSvg.FrameSvgItem {
id: frame id: frame
anchors.centerIn: parent anchors.centerIn: parent

7
containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml
View file

@ -7,15 +7,16 @@
import QtQuick 2.4 import QtQuick 2.4
import Qt5Compat.GraphicalEffects import Qt5Compat.GraphicalEffects
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.ksvg 1.0 as KSvg
PlasmaCore.SvgItem {
KSvg.SvgItem {
id: scrollIndicator id: scrollIndicator
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
z: 2 z: 2
opacity: 0 opacity: 0
svg: PlasmaCore.Svg { svg: KSvg.Svg {
imagePath: "widgets/arrows" imagePath: "widgets/arrows"
colorGroup: PlasmaCore.Theme.ComplementaryColorGroup colorGroup: PlasmaCore.Theme.ComplementaryColorGroup
} }

5
initialstart/modules/wifi/package/contents/ui/ConnectionItemDelegate.qml
View file

@ -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.plasma.networkmanagement 0.2 as PlasmaNM
import org.kde.kirigami 2.2 as Kirigami import org.kde.kirigami 2.2 as Kirigami
import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm import org.kde.kirigamiaddons.labs.mobileform 0.1 as MobileForm
import org.kde.ksvg 1.0 as KSvg
MobileForm.AbstractFormDelegate { MobileForm.AbstractFormDelegate {
topPadding: Kirigami.Units.smallSpacing topPadding: Kirigami.Units.smallSpacing
@ -53,11 +54,11 @@ MobileForm.AbstractFormDelegate {
Layout.preferredWidth: Kirigami.Units.gridUnit Layout.preferredWidth: Kirigami.Units.gridUnit
Layout.preferredHeight: Kirigami.Units.gridUnit Layout.preferredHeight: Kirigami.Units.gridUnit
PlasmaCore.SvgItem { KSvg.SvgItem {
id: connectionSvgIcon id: connectionSvgIcon
elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon
svg: PlasmaCore.Svg { svg: KSvg.Svg {
multipleImages: true multipleImages: true
imagePath: "icons/network" imagePath: "icons/network"
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup

5
kcms/wifi/ui/ConnectionItemDelegate.qml
View file

@ -10,6 +10,7 @@ import QtQuick.Controls 2.2 as Controls
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
import org.kde.kirigami 2.2 as Kirigami import org.kde.kirigami 2.2 as Kirigami
import org.kde.ksvg 1.0 as KSvg
Kirigami.SwipeListItem { Kirigami.SwipeListItem {
@ -31,11 +32,11 @@ Kirigami.SwipeListItem {
Layout.preferredWidth: Kirigami.Units.gridUnit Layout.preferredWidth: Kirigami.Units.gridUnit
Layout.preferredHeight: Kirigami.Units.gridUnit Layout.preferredHeight: Kirigami.Units.gridUnit
PlasmaCore.SvgItem { KSvg.SvgItem {
id: connectionSvgIcon id: connectionSvgIcon
elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon elementId: mobileProxyModel.showSavedMode ? "network-wireless-connected-100" : ConnectionIcon
svg: PlasmaCore.Svg { svg: KSvg.Svg {
multipleImages: true multipleImages: true
imagePath: "icons/network" imagePath: "icons/network"
colorGroup: PlasmaCore.ColorScope.colorGroup colorGroup: PlasmaCore.ColorScope.colorGroup

2
shell/contents/configuration/ContainmentConfiguration.qml
View file

@ -77,7 +77,7 @@ AppletConfiguration {
duration: PlasmaCore.Units.longDuration duration: PlasmaCore.Units.longDuration
} }
background: PlasmaCore.FrameSvgItem { background: KSvg.FrameSvgItem {
enabledBorders: PlasmaCore.FrameSvg.AllBorders enabledBorders: PlasmaCore.FrameSvg.AllBorders
imagePath: "widgets/background" imagePath: "widgets/background"
} }