diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml index 37c8c44e..ab414e99 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsDrawer.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml index 7e0fcd8a..f5a48451 100644 --- a/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml +++ b/components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsPanel.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/components/StartupFeedback.qml b/components/mobileshell/qml/components/StartupFeedback.qml index 073d11dc..65908237 100644 --- a/components/mobileshell/qml/components/StartupFeedback.qml +++ b/components/mobileshell/qml/components/StartupFeedback.qml @@ -6,7 +6,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.kde.plasma.core 2.0 as PlasmaCore -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.13 as Kirigami diff --git a/components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml b/components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml index c72093ac..4a16f486 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationGestureArea.qml @@ -8,7 +8,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml index 61dcb51d..95f9d8ee 100644 --- a/components/mobileshell/qml/navigationpanel/NavigationPanel.qml +++ b/components/mobileshell/qml/navigationpanel/NavigationPanel.qml @@ -8,7 +8,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/components/mobileshell/qml/osd/volume/AudioApplet.qml b/components/mobileshell/qml/osd/volume/AudioApplet.qml index c21edc83..fa548d52 100644 --- a/components/mobileshell/qml/osd/volume/AudioApplet.qml +++ b/components/mobileshell/qml/osd/volume/AudioApplet.qml @@ -9,7 +9,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.1 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/osd/volume/ListItemBase.qml b/components/mobileshell/qml/osd/volume/ListItemBase.qml index b429749e..c375cf5d 100644 --- a/components/mobileshell/qml/osd/volume/ListItemBase.qml +++ b/components/mobileshell/qml/osd/volume/ListItemBase.qml @@ -10,7 +10,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kquickcontrolsaddons 2.0 import org.kde.plasma.core 2.1 as PlasmaCore diff --git a/components/mobileshell/qml/osd/volume/VolumeOSD.qml b/components/mobileshell/qml/osd/volume/VolumeOSD.qml index f1b799ff..40bbf3ad 100644 --- a/components/mobileshell/qml/osd/volume/VolumeOSD.qml +++ b/components/mobileshell/qml/osd/volume/VolumeOSD.qml @@ -10,7 +10,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtra diff --git a/components/mobileshell/qml/statusbar/StatusBar.qml b/components/mobileshell/qml/statusbar/StatusBar.qml index 60a54424..6b68d087 100644 --- a/components/mobileshell/qml/statusbar/StatusBar.qml +++ b/components/mobileshell/qml/statusbar/StatusBar.qml @@ -10,7 +10,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.12 as Controls import QtQuick.Layouts 1.3 import QtQml.Models 2.12 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml index 24d20bb2..f8fc58ab 100644 --- a/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml +++ b/components/mobileshell/qml/widgets/krunner/KRunnerWidget.qml @@ -9,7 +9,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.15 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml index d70f3475..6a2bddd8 100644 --- a/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml +++ b/components/mobileshell/qml/widgets/mediacontrols/BlurredBackground.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml b/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml index 07e966a8..dbf5d283 100644 --- a/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml +++ b/components/mobileshell/qml/widgets/notifications/BaseNotificationItem.qml @@ -8,7 +8,7 @@ import QtQuick 2.8 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 diff --git a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml index ba8c9e5e..e8ecee22 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationCard.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationCard.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml index 6fc09c9f..df0584d8 100644 --- a/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml +++ b/components/mobileshell/qml/widgets/notifications/NotificationsWidget.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.12 as Kirigami diff --git a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml index 3d391ecf..8d67c2d6 100644 --- a/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml +++ b/components/mobileshell/qml/widgets/notifications/ThumbnailStrip.qml @@ -6,7 +6,7 @@ import QtQuick 2.0 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents3 diff --git a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml index 4244ef2e..bc1b169c 100644 --- a/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/HomeDelegate.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/LauncherRepeater.qml b/containments/homescreens/folio/package/contents/ui/LauncherRepeater.qml index 6d5c2f70..44302367 100644 --- a/containments/homescreens/folio/package/contents/ui/LauncherRepeater.qml +++ b/containments/homescreens/folio/package/contents/ui/LauncherRepeater.qml @@ -7,7 +7,7 @@ import QtQuick 2.14 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/MobileAppletContainer.qml b/containments/homescreens/folio/package/contents/ui/MobileAppletContainer.qml index c036c265..8f431ad6 100644 --- a/containments/homescreens/folio/package/contents/ui/MobileAppletContainer.qml +++ b/containments/homescreens/folio/package/contents/ui/MobileAppletContainer.qml @@ -7,7 +7,7 @@ import QtQuick 2.12 import QtQuick.Window 2.12 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml index 04f9f440..3244d375 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerGridDelegate.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml index e3a02b45..e4a959c3 100644 --- a/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml +++ b/containments/homescreens/folio/package/contents/ui/appdrawer/DrawerListDelegate.qml @@ -8,7 +8,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/private/DelegateRemoveButton.qml b/containments/homescreens/folio/package/contents/ui/private/DelegateRemoveButton.qml index b7673cd9..b2aa0a31 100644 --- a/containments/homescreens/folio/package/contents/ui/private/DelegateRemoveButton.qml +++ b/containments/homescreens/folio/package/contents/ui/private/DelegateRemoveButton.qml @@ -7,7 +7,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/private/OpenDrawerButton.qml b/containments/homescreens/folio/package/contents/ui/private/OpenDrawerButton.qml index c888eb5c..caa5f0dc 100644 --- a/containments/homescreens/folio/package/contents/ui/private/OpenDrawerButton.qml +++ b/containments/homescreens/folio/package/contents/ui/private/OpenDrawerButton.qml @@ -7,7 +7,7 @@ import QtQuick 2.12 import QtQuick.Window 2.12 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml b/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml index b354d225..fbfbdb2c 100644 --- a/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml +++ b/containments/homescreens/folio/package/contents/ui/private/ScrollIndicator.qml @@ -5,7 +5,7 @@ */ import QtQuick 2.4 -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore PlasmaCore.SvgItem { diff --git a/containments/homescreens/halcyon/package/contents/ui/Clock.qml b/containments/homescreens/halcyon/package/contents/ui/Clock.qml index a2104e0f..786479ab 100644 --- a/containments/homescreens/halcyon/package/contents/ui/Clock.qml +++ b/containments/homescreens/halcyon/package/contents/ui/Clock.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml index 7db3cb3d..db72e8ab 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml @@ -4,7 +4,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml index 291ac195..1a4dc493 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml @@ -5,7 +5,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQml.Models 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml b/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml index 285e9444..f14f17d8 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml @@ -5,7 +5,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQml.Models 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml index 63329d19..bb04b822 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 as Controls -import QtGraphicalEffects 1.6 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PlasmaComponents diff --git a/containments/homescreens/halcyon/package/contents/ui/main.qml b/containments/homescreens/halcyon/package/contents/ui/main.qml index ae7b8092..ec26f4d2 100644 --- a/containments/homescreens/halcyon/package/contents/ui/main.qml +++ b/containments/homescreens/halcyon/package/contents/ui/main.qml @@ -13,6 +13,8 @@ import org.kde.plasma.private.mobileshell 1.0 as MobileShell import org.kde.plasma.private.mobileshell.state 1.0 as MobileShellState import org.kde.phone.homescreen.halcyon 1.0 as Halcyon +Item {} +/* MobileShell.HomeScreen { id: root @@ -104,6 +106,6 @@ MobileShell.HomeScreen { } } } -} +}*/ diff --git a/containments/panel/package/contents/ui/main.qml b/containments/panel/package/contents/ui/main.qml index 70f076ab..8efd7e8c 100644 --- a/containments/panel/package/contents/ui/main.qml +++ b/containments/panel/package/contents/ui/main.qml @@ -25,7 +25,7 @@ import org.kde.notificationmanager 1.0 as NotificationManager Item { id: root - + /* // only opaque if there are no maximized windows on this screen readonly property bool showingApp: visibleMaximizedWindowsModel.count > 0 readonly property color backgroundColor: topPanel.colorScopeColor @@ -160,5 +160,5 @@ Item { return urgencies; } } - } + }*/ } diff --git a/containments/taskpanel/package/contents/ui/main.qml b/containments/taskpanel/package/contents/ui/main.qml index b11f5af7..6b414d63 100644 --- a/containments/taskpanel/package/contents/ui/main.qml +++ b/containments/taskpanel/package/contents/ui/main.qml @@ -8,7 +8,7 @@ import QtQuick 2.4 import QtQuick.Layouts 1.1 import QtQuick.Window 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.taskmanager 0.1 as TaskManager import org.kde.plasma.plasmoid 2.0 @@ -21,144 +21,144 @@ import org.kde.plasma.private.mobileshell.state 1.0 as MobileShellState PlasmaCore.ColorScope { id: root - Plasmoid.backgroundHints: PlasmaCore.Types.NoBackground - - width: 480 - height: PlasmaCore.Units.gridUnit * 2 - - // toggle visibility of navigation bar (show, or use gestures only) - Binding { - target: plasmoid.Window.window // assumed to be plasma-workspace "PanelView" component - property: "visibilityMode" - // 0 - VisibilityMode.NormalPanel - // 3 - VisibilityMode.WindowsGoBelow - value: MobileShell.MobileShellSettings.navigationPanelEnabled ? 0 : 3 - } - - // we have the following scenarios: - // - system is in landscape orientation & nav panel is enabled (panel on right) - // - system is in landscape orientation & gesture mode is enabled (panel on bottom) - // - system is in portrait orientation (panel on bottom) - readonly property bool inLandscape: Screen.width > Screen.height; - readonly property bool isInLandscapeNavPanelMode: inLandscape && MobileShell.MobileShellSettings.navigationPanelEnabled - - readonly property real navigationPanelHeight: PlasmaCore.Units.gridUnit * 2 - readonly property real gesturePanelHeight: 8 - - readonly property real intendedWindowThickness: MobileShell.MobileShellSettings.navigationPanelEnabled ? navigationPanelHeight : gesturePanelHeight - readonly property real intendedWindowLength: isInLandscapeNavPanelMode ? Screen.height : Screen.width - readonly property real intendedWindowOffset: isInLandscapeNavPanelMode ? MobileShellState.TopPanelControls.panelHeight : 0; // offset for top panel - readonly property int intendedWindowLocation: isInLandscapeNavPanelMode ? PlasmaCore.Types.RightEdge : PlasmaCore.Types.BottomEdge - - onIntendedWindowThicknessChanged: plasmoid.Window.window.thickness = intendedWindowThickness - onIntendedWindowLengthChanged: maximizeTimer.restart() // ensure it always takes up the full length of the screen - onIntendedWindowOffsetChanged: plasmoid.Window.window.offset = intendedWindowOffset - onIntendedWindowLocationChanged: locationChangeTimer.restart() - - // use a timer so we don't have to maximize for every single pixel - // - improves performance if the shell is run in a window, and can be resized - Timer { - id: maximizeTimer - running: false - interval: 100 - onTriggered: { - // maximize first, then we can apply offsets (otherwise they are overridden) - plasmoid.Window.window.maximize() - plasmoid.Window.window.offset = intendedWindowOffset; - } - } - - // use a timer so that rotation events are faster (offload the panel movement to later, after everything is figured out) - Timer { - id: locationChangeTimer - running: false - interval: 100 - onTriggered: plasmoid.Window.window.location = intendedWindowLocation - } - - function setWindowProperties() { - // plasmoid.Window.window is assumed to be plasma-workspace "PanelView" component - plasmoid.Window.window.maximize(); // maximize first, then we can apply offsets (otherwise they are overridden) - plasmoid.Window.window.offset = intendedWindowOffset; - plasmoid.Window.window.thickness = intendedWindowThickness; - plasmoid.Window.window.location = intendedWindowLocation; - } - - Connections { - target: plasmoid.Window.window - - // HACK: There seems to be some component that overrides our initial bindings for the panel, - // which is particularly problematic on first start (since the panel is misplaced) - // - We set an event to override any attempts to override our bindings. - function onLocationChanged() { - if (plasmoid.Window.window.location !== root.intendedWindowLocation) { - root.setWindowProperties(); - } - } - - function onThicknessChanged() { - if (plasmoid.Window.window.thickness !== root.intendedWindowThickness) { - root.setWindowProperties(); - } - } - } - - Component.onCompleted: setWindowProperties(); - - TaskManager.VirtualDesktopInfo { - id: virtualDesktopInfo - } - - TaskManager.ActivityInfo { - id: activityInfo - } - - PlasmaCore.SortFilterModel { - id: visibleMaximizedWindowsModel - filterRole: 'IsMinimized' - filterRegExp: 'false' - sourceModel: TaskManager.TasksModel { - id: tasksModel - filterByVirtualDesktop: true - filterByActivity: true - filterNotMaximized: true - filterByScreen: true - filterHidden: true - - virtualDesktop: virtualDesktopInfo.currentDesktop - activity: activityInfo.currentActivity - - groupMode: TaskManager.TasksModel.GroupDisabled - } - } - - // only opaque if there are no maximized windows on this screen - readonly property bool opaqueBar: visibleMaximizedWindowsModel.count > 0 - - // contrasting colour - colorGroup: opaqueBar ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup - - // bottom navigation panel component - Component { - id: navigationPanel - NavigationPanelComponent { - taskSwitcher: MobileShellState.HomeScreenControls.taskSwitcher - opaqueBar: root.opaqueBar - } - } - - // bottom navigation gesture area component - Component { - id: navigationGesture - MobileShell.NavigationGestureArea { - taskSwitcher: MobileShellState.HomeScreenControls.taskSwitcher - } - } - - // load appropriate system navigation component - Loader { - id: navigationLoader - anchors.fill: parent - sourceComponent: MobileShell.MobileShellSettings.navigationPanelEnabled ? navigationPanel : navigationGesture - } +// Plasmoid.backgroundHints: PlasmaCore.Types.NoBackground +// +// width: 480 +// height: PlasmaCore.Units.gridUnit * 2 +// +// // toggle visibility of navigation bar (show, or use gestures only) +// Binding { +// target: plasmoid.Window.window // assumed to be plasma-workspace "PanelView" component +// property: "visibilityMode" +// // 0 - VisibilityMode.NormalPanel +// // 3 - VisibilityMode.WindowsGoBelow +// value: MobileShell.MobileShellSettings.navigationPanelEnabled ? 0 : 3 +// } +// +// // we have the following scenarios: +// // - system is in landscape orientation & nav panel is enabled (panel on right) +// // - system is in landscape orientation & gesture mode is enabled (panel on bottom) +// // - system is in portrait orientation (panel on bottom) +// readonly property bool inLandscape: Screen.width > Screen.height; +// readonly property bool isInLandscapeNavPanelMode: inLandscape && MobileShell.MobileShellSettings.navigationPanelEnabled +// +// readonly property real navigationPanelHeight: PlasmaCore.Units.gridUnit * 2 +// readonly property real gesturePanelHeight: 8 +// +// readonly property real intendedWindowThickness: MobileShell.MobileShellSettings.navigationPanelEnabled ? navigationPanelHeight : gesturePanelHeight +// readonly property real intendedWindowLength: isInLandscapeNavPanelMode ? Screen.height : Screen.width +// readonly property real intendedWindowOffset: isInLandscapeNavPanelMode ? MobileShellState.TopPanelControls.panelHeight : 0; // offset for top panel +// readonly property int intendedWindowLocation: isInLandscapeNavPanelMode ? PlasmaCore.Types.RightEdge : PlasmaCore.Types.BottomEdge +// +// onIntendedWindowThicknessChanged: plasmoid.Window.window.thickness = intendedWindowThickness +// onIntendedWindowLengthChanged: maximizeTimer.restart() // ensure it always takes up the full length of the screen +// onIntendedWindowOffsetChanged: plasmoid.Window.window.offset = intendedWindowOffset +// onIntendedWindowLocationChanged: locationChangeTimer.restart() +// +// // use a timer so we don't have to maximize for every single pixel +// // - improves performance if the shell is run in a window, and can be resized +// Timer { +// id: maximizeTimer +// running: false +// interval: 100 +// onTriggered: { +// // maximize first, then we can apply offsets (otherwise they are overridden) +// plasmoid.Window.window.maximize() +// plasmoid.Window.window.offset = intendedWindowOffset; +// } +// } +// +// // use a timer so that rotation events are faster (offload the panel movement to later, after everything is figured out) +// Timer { +// id: locationChangeTimer +// running: false +// interval: 100 +// onTriggered: plasmoid.Window.window.location = intendedWindowLocation +// } +// +// function setWindowProperties() { +// // plasmoid.Window.window is assumed to be plasma-workspace "PanelView" component +// plasmoid.Window.window.maximize(); // maximize first, then we can apply offsets (otherwise they are overridden) +// plasmoid.Window.window.offset = intendedWindowOffset; +// plasmoid.Window.window.thickness = intendedWindowThickness; +// plasmoid.Window.window.location = intendedWindowLocation; +// } +// +// Connections { +// target: plasmoid.Window.window +// +// // HACK: There seems to be some component that overrides our initial bindings for the panel, +// // which is particularly problematic on first start (since the panel is misplaced) +// // - We set an event to override any attempts to override our bindings. +// function onLocationChanged() { +// if (plasmoid.Window.window.location !== root.intendedWindowLocation) { +// root.setWindowProperties(); +// } +// } +// +// function onThicknessChanged() { +// if (plasmoid.Window.window.thickness !== root.intendedWindowThickness) { +// root.setWindowProperties(); +// } +// } +// } +// +// Component.onCompleted: setWindowProperties(); +// +// TaskManager.VirtualDesktopInfo { +// id: virtualDesktopInfo +// } +// +// TaskManager.ActivityInfo { +// id: activityInfo +// } +// +// PlasmaCore.SortFilterModel { +// id: visibleMaximizedWindowsModel +// filterRole: 'IsMinimized' +// filterRegExp: 'false' +// sourceModel: TaskManager.TasksModel { +// id: tasksModel +// filterByVirtualDesktop: true +// filterByActivity: true +// filterNotMaximized: true +// filterByScreen: true +// filterHidden: true +// +// virtualDesktop: virtualDesktopInfo.currentDesktop +// activity: activityInfo.currentActivity +// +// groupMode: TaskManager.TasksModel.GroupDisabled +// } +// } +// +// // only opaque if there are no maximized windows on this screen +// readonly property bool opaqueBar: visibleMaximizedWindowsModel.count > 0 +// +// // contrasting colour +// colorGroup: opaqueBar ? PlasmaCore.Theme.NormalColorGroup : PlasmaCore.Theme.ComplementaryColorGroup +// +// // bottom navigation panel component +// Component { +// id: navigationPanel +// NavigationPanelComponent { +// taskSwitcher: MobileShellState.HomeScreenControls.taskSwitcher +// opaqueBar: root.opaqueBar +// } +// } +// +// // bottom navigation gesture area component +// Component { +// id: navigationGesture +// MobileShell.NavigationGestureArea { +// taskSwitcher: MobileShellState.HomeScreenControls.taskSwitcher +// } +// } +// +// // load appropriate system navigation component +// Loader { +// id: navigationLoader +// anchors.fill: parent +// sourceComponent: MobileShell.MobileShellSettings.navigationPanelEnabled ? navigationPanel : navigationGesture +// } } diff --git a/look-and-feel/contents/lockscreen/Clock.qml b/look-and-feel/contents/lockscreen/Clock.qml index a06c0b51..901fc500 100644 --- a/look-and-feel/contents/lockscreen/Clock.qml +++ b/look-and-feel/contents/lockscreen/Clock.qml @@ -7,7 +7,7 @@ import QtQuick 2.15 import QtQuick.Layouts 1.15 import QtQuick.Controls 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PC3 diff --git a/look-and-feel/contents/lockscreen/Keypad.qml b/look-and-feel/contents/lockscreen/Keypad.qml index 39cf58b6..929d789b 100644 --- a/look-and-feel/contents/lockscreen/Keypad.qml +++ b/look-and-feel/contents/lockscreen/Keypad.qml @@ -7,7 +7,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.components 3.0 as PlasmaComponents import org.kde.plasma.core 2.0 as PlasmaCore diff --git a/look-and-feel/contents/lockscreen/LockScreen.qml b/look-and-feel/contents/lockscreen/LockScreen.qml index 2719d03a..84828526 100644 --- a/look-and-feel/contents/lockscreen/LockScreen.qml +++ b/look-and-feel/contents/lockscreen/LockScreen.qml @@ -8,7 +8,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.notificationmanager 1.1 as Notifications diff --git a/look-and-feel/contents/lockscreen/NotificationsComponent.qml b/look-and-feel/contents/lockscreen/NotificationsComponent.qml index cc5da8cb..6cecd999 100644 --- a/look-and-feel/contents/lockscreen/NotificationsComponent.qml +++ b/look-and-feel/contents/lockscreen/NotificationsComponent.qml @@ -6,7 +6,7 @@ import QtQuick 2.12 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.notificationmanager 1.1 as Notifications diff --git a/look-and-feel/contents/lockscreen/PasswordBar.qml b/look-and-feel/contents/lockscreen/PasswordBar.qml index 8953b027..d19156c7 100644 --- a/look-and-feel/contents/lockscreen/PasswordBar.qml +++ b/look-and-feel/contents/lockscreen/PasswordBar.qml @@ -6,7 +6,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.1 import QtQuick.Layouts 1.1 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.workspace.keyboardlayout 1.0 diff --git a/look-and-feel/contents/lockscreen/WallpaperBlur.qml b/look-and-feel/contents/lockscreen/WallpaperBlur.qml index 05440b43..5a66da5b 100644 --- a/look-and-feel/contents/lockscreen/WallpaperBlur.qml +++ b/look-and-feel/contents/lockscreen/WallpaperBlur.qml @@ -4,7 +4,7 @@ */ import QtQuick 2.12 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects FastBlur { id: fastBlur diff --git a/look-and-feel/contents/systemdialog/SystemDialog.qml b/look-and-feel/contents/systemdialog/SystemDialog.qml index 3f801098..16ac278e 100644 --- a/look-and-feel/contents/systemdialog/SystemDialog.qml +++ b/look-and-feel/contents/systemdialog/SystemDialog.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtQuick.Window 2.15 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.18 as Kirigami import "private" as Private diff --git a/look-and-feel/contents/systemdialog/private/MobileSystemDialogButton.qml b/look-and-feel/contents/systemdialog/private/MobileSystemDialogButton.qml index 1fc6c4cb..0cee3809 100644 --- a/look-and-feel/contents/systemdialog/private/MobileSystemDialogButton.qml +++ b/look-and-feel/contents/systemdialog/private/MobileSystemDialogButton.qml @@ -8,7 +8,7 @@ import QtQuick 2.15 import QtQuick.Controls 2.15 import QtQuick.Layouts 1.15 import QtQuick.Window 2.2 -import QtGraphicalEffects 1.12 +import Qt5Compat.GraphicalEffects import org.kde.kirigami 2.18 as Kirigami AbstractButton {