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 away from PlasmaComponents 2.0 on most places

Browse source
This commit is contained in:
Aleix Pol 2021-09-13 19:33:57 +02:00 committed by Devin Lin
parent b091ce2ac3
commit 0cd4f91ec4
32 changed files with 15 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
applets/activities/contents/ui/main.qml
View file

@ -7,11 +7,12 @@
import QtQuick 2.5 import QtQuick 2.5
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 2.0 as PlasmaComponents //Needed for Highlight
import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.activities 0.1 as Activities import org.kde.activities 0.1 as Activities
ColumnLayout { ColumnLayout {
PlasmaComponents.ToolButton { PlasmaComponents3.ToolButton {
id: newButton id: newButton
Layout.fillWidth: true Layout.fillWidth: true
text: i18n("New Activity...") text: i18n("New Activity...")
@ -19,7 +20,7 @@ ColumnLayout {
newEdit.visible = true; newEdit.visible = true;
newEdit.forceActiveFocus(); newEdit.forceActiveFocus();
} }
PlasmaComponents.TextField { PlasmaComponents3.TextField {
id: newEdit id: newEdit
visible: false visible: false
width: parent.width width: parent.width
@ -122,13 +123,13 @@ ColumnLayout {
positionAnim.running = true; positionAnim.running = true;
} }
PlasmaComponents.Label { PlasmaComponents3.Label {
id: label id: label
text: model.name text: model.name
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
x: PlasmaCore.Units.smallSpacing x: PlasmaCore.Units.smallSpacing
} }
PlasmaComponents.TextField { PlasmaComponents3.TextField {
id: edit id: edit
visible: false visible: false
text: model.name text: model.name

2
components/mobilehomescreencomponents/qml/DrawerDelegate.qml
View file

@ -11,7 +11,7 @@ import QtGraphicalEffects 1.6
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 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager

1
components/mobilehomescreencomponents/qml/FavoriteStrip.qml
View file

@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls
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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0

1
components/mobilehomescreencomponents/qml/LauncherContainer.qml
View file

@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls
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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager

1
components/mobilehomescreencomponents/qml/LauncherGrid.qml
View file

@ -10,7 +10,6 @@ import QtQuick.Controls 2.3 as Controls
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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.kirigami 2.10 as Kirigami import org.kde.kirigami 2.10 as Kirigami
import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager

1
components/mobilehomescreencomponents/qml/LauncherRepeater.qml
View file

@ -11,7 +11,6 @@ import QtGraphicalEffects 1.6
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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager import org.kde.plasma.private.containmentlayoutmanager 1.0 as ContainmentLayoutManager

1
components/mobilehomescreencomponents/qml/private/ActionButton.qml
View file

@ -7,7 +7,6 @@
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.plasma.components 2.0 as PlasmaComponents
PlasmaCore.ToolTipArea { PlasmaCore.ToolTipArea {
id: button id: button

1
containments/panel/package/contents/ui/indicators/Bluetooth.qml
View file

@ -9,7 +9,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.bluezqt 1.0 as BluezQt import org.kde.bluezqt 1.0 as BluezQt
import "providers" import "providers"

2
containments/panel/package/contents/ui/indicators/SignalStrength.qml
View file

@ -10,7 +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 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import "providers" import "providers"

1
containments/panel/package/contents/ui/indicators/Volume.qml
View file

@ -9,7 +9,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.private.volume 0.1 import org.kde.plasma.private.volume 0.1
import "providers" import "providers"

2
containments/panel/package/contents/ui/indicators/Wifi.qml
View file

@ -9,7 +9,7 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
import "providers" import "providers"

1
containments/panel/package/contents/ui/indicators/providers/BluetoothProvider.qml
View file

@ -9,7 +9,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.bluezqt 1.0 as BluezQt import org.kde.bluezqt 1.0 as BluezQt
QtObject { QtObject {

1
containments/panel/package/contents/ui/indicators/providers/SignalStrengthProvider.qml
View file

@ -7,7 +7,6 @@
*/ */
import QtQuick 2.1 import QtQuick 2.1
import org.kde.plasma.mm 1.0 import org.kde.plasma.mm 1.0
QtObject { QtObject {

1
containments/panel/package/contents/ui/indicators/providers/VolumeProvider.qml
View file

@ -9,7 +9,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.private.volume 0.1 import org.kde.plasma.private.volume 0.1
import "../../volumeosd" import "../../volumeosd"

1
containments/panel/package/contents/ui/indicators/providers/WifiProvider.qml
View file

@ -9,7 +9,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
Item { Item {

1
containments/panel/package/contents/ui/quicksettings/QuickSettingsPanel.qml
View file

@ -11,7 +11,6 @@ import QtQuick.Window 2.2
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.kirigami 2.12 as Kirigami import org.kde.kirigami 2.12 as Kirigami
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
import org.kde.bluezqt 1.0 as BluezQt import org.kde.bluezqt 1.0 as BluezQt
import org.kde.colorcorrect 0.1 as CC import org.kde.colorcorrect 0.1 as CC

1
containments/panel/package/contents/ui/quicksettings/SettingsModel.qml
View file

@ -10,7 +10,6 @@ import QtQuick 2.14
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
import org.kde.bluezqt 1.0 as BluezQt import org.kde.bluezqt 1.0 as BluezQt
import org.kde.plasma.private.nanoshell 2.0 as NanoShell import org.kde.plasma.private.nanoshell 2.0 as NanoShell

1
containments/taskpanel/package/contents/ui/Button.qml
View file

@ -9,7 +9,6 @@ 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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
Item { Item {

1
containments/taskpanel/package/contents/ui/main.qml
View file

@ -12,7 +12,6 @@ import QtGraphicalEffects 1.12
import org.kde.taskmanager 0.1 as TaskManager import org.kde.taskmanager 0.1 as TaskManager
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 2.0 as PlasmaComponents
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.plasma.private.nanoshell 2.0 as NanoShell import org.kde.plasma.private.nanoshell 2.0 as NanoShell

2
look-and-feel/contents/components/DialerButton.qml
View file

@ -7,7 +7,7 @@
import QtQuick 2.0 import QtQuick 2.0
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
PlasmaComponents.Label { PlasmaComponents.Label {
horizontalAlignment: Qt.AlignHCenter horizontalAlignment: Qt.AlignHCenter

2
look-and-feel/contents/components/UserDelegate.qml
View file

@ -8,7 +8,7 @@
import QtQuick 2.8 import QtQuick 2.8
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
Item { Item {
id: wrapper id: wrapper

2
look-and-feel/contents/lockscreen/Keypad.qml
View file

@ -8,7 +8,7 @@ import QtQuick 2.12
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.workspace.keyboardlayout 1.0
import org.kde.kirigami 2.12 as Kirigami import org.kde.kirigami 2.12 as Kirigami

1
look-and-feel/contents/lockscreen/LockScreen.qml
View file

@ -9,7 +9,6 @@ import QtQuick 2.12
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.workspace.keyboardlayout 1.0
import org.kde.notificationmanager 1.1 as Notifications import org.kde.notificationmanager 1.1 as Notifications

1
look-and-feel/contents/lockscreen/NotificationsList.qml
View file

@ -8,7 +8,6 @@ import QtQuick 2.15
import QtQuick.Controls 1.1 import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.notificationmanager 1.1 as Notifications import org.kde.notificationmanager 1.1 as Notifications
import org.kde.kirigami 2.13 as Kirigami import org.kde.kirigami 2.13 as Kirigami

1
look-and-feel/contents/lockscreen/PasswordBar.qml
View file

@ -8,7 +8,6 @@ import QtQuick 2.12
import QtQuick.Controls 2.1 import QtQuick.Controls 2.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.workspace.keyboardlayout 1.0 import org.kde.plasma.workspace.keyboardlayout 1.0
import org.kde.kirigami 2.12 as Kirigami import org.kde.kirigami 2.12 as Kirigami

1
look-and-feel/contents/lockscreen/SimpleNotification.qml
View file

@ -9,7 +9,6 @@ import QtQuick.Controls 1.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.components 3.0 as PlasmaComponents3 import org.kde.plasma.components 3.0 as PlasmaComponents3
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.extras 2.0 as PlasmaExtras

1
look-and-feel/contents/lockscreen/indicators/Bluetooth.qml
View file

@ -8,7 +8,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.bluezqt 1.0 as BluezQt import org.kde.bluezqt 1.0 as BluezQt
PlasmaCore.IconItem { PlasmaCore.IconItem {

4
look-and-feel/contents/lockscreen/indicators/SignalStrength.qml
View file

@ -9,9 +9,7 @@ import QtQuick 2.1
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.1
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import "providers"
Item { Item {
required property QtObject provider required property QtObject provider

1
look-and-feel/contents/lockscreen/indicators/Volume.qml
View file

@ -8,7 +8,6 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.private.volume 0.1 import org.kde.plasma.private.volume 0.1
PlasmaCore.IconItem { PlasmaCore.IconItem {

2
look-and-feel/contents/lockscreen/indicators/Wifi.qml
View file

@ -8,7 +8,7 @@
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Layouts 1.4 import QtQuick.Layouts 1.4
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import org.kde.plasma.networkmanagement 0.2 as PlasmaNM import org.kde.plasma.networkmanagement 0.2 as PlasmaNM
PlasmaCore.IconItem { PlasmaCore.IconItem {

1
shell/contents/views/Desktop.qml
View file

@ -10,7 +10,6 @@ import QtGraphicalEffects 1.0
import QtQuick.Controls 2.3 import QtQuick.Controls 2.3
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.shell 2.0 as Shell import org.kde.plasma.shell 2.0 as Shell
import org.kde.plasma.components 2.0 as PlasmaComponents
import org.kde.plasma.workspace.components 2.0 as PlasmaWorkspace import org.kde.plasma.workspace.components 2.0 as PlasmaWorkspace
import org.kde.kquickcontrolsaddons 2.0 import org.kde.kquickcontrolsaddons 2.0
import org.kde.activities 0.1 as Activities import org.kde.activities 0.1 as Activities

2
shell/contents/views/Pin.qml
View file

@ -10,7 +10,7 @@ import QtQuick.Layouts 1.1
import QtQuick.Controls 2.5 import QtQuick.Controls 2.5
import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.core 2.0 as PlasmaCore
import QtGraphicalEffects 1.12 import QtGraphicalEffects 1.12
import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.components 3.0 as PlasmaComponents
import MeeGo.QOfono 0.2 import MeeGo.QOfono 0.2
import "../components" import "../components"