diff --git a/containments/homescreens/halcyon/application.cpp b/containments/homescreens/halcyon/application.cpp index 57b08eb8..b1939862 100644 --- a/containments/homescreens/halcyon/application.cpp +++ b/containments/homescreens/halcyon/application.cpp @@ -6,7 +6,6 @@ #include -#include #include #include @@ -102,19 +101,6 @@ void Application::setWindow(KWayland::Client::PlasmaWindow *window) Q_EMIT windowChanged(); } -void Application::runApplication() -{ - if (m_window) { - m_window->requestActivate(); - return; - } - - KService::Ptr service = KService::serviceByStorageId(m_storageId); - KIO::ApplicationLauncherJob *job = new KIO::ApplicationLauncherJob(service); - job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled)); - job->start(); -} - void Application::setMinimizedDelegate(QQuickItem *delegate) { QWindow *delegateWindow = delegate->window(); diff --git a/containments/homescreens/halcyon/application.h b/containments/homescreens/halcyon/application.h index 2292bb5d..1c87ba19 100644 --- a/containments/homescreens/halcyon/application.h +++ b/containments/homescreens/halcyon/application.h @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -43,7 +44,6 @@ public: void setStorageId(QString &storageId); void setWindow(KWayland::Client::PlasmaWindow *window); - Q_INVOKABLE void runApplication(); Q_INVOKABLE void setMinimizedDelegate(QQuickItem *delegate); Q_INVOKABLE void unsetMinimizedDelegate(QQuickItem *delegate); diff --git a/containments/homescreens/halcyon/homescreen.cpp b/containments/homescreens/halcyon/homescreen.cpp index 20b304c3..909629cd 100644 --- a/containments/homescreens/halcyon/homescreen.cpp +++ b/containments/homescreens/halcyon/homescreen.cpp @@ -7,6 +7,7 @@ #include "pinnedmodel.h" #include "windowlistener.h" +#include #include #include diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml index 82b523af..9a7bc966 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesAppDelegate.qml @@ -6,7 +6,6 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.3 as Controls import QtGraphicalEffects 1.6 -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.kquickcontrolsaddons 2.0 @@ -89,7 +88,7 @@ Item { } application.setMinimizedDelegate(delegate); - application.runApplication(); + MobileShell.ShellUtil.launchApp(application.storageId); } Loader { diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml index 3c672b4d..794348d4 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesGrid.qml @@ -6,7 +6,6 @@ import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQml.Models 2.15 -import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 3.0 as PC3 diff --git a/containments/homescreens/halcyon/package/contents/ui/FavoritesView.qml b/containments/homescreens/halcyon/package/contents/ui/FavoritesView.qml index 409de56a..c564138d 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FavoritesView.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FavoritesView.qml @@ -6,7 +6,6 @@ import QtQuick.Controls 2.15 as QQC2 import QtQuick.Layouts 1.1 import QtQml.Models 2.15 -import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 3.0 as PC3 diff --git a/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml b/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml index aea9a4c3..285e9444 100644 --- a/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml +++ b/containments/homescreens/halcyon/package/contents/ui/FolderGrid.qml @@ -7,7 +7,6 @@ import QtQuick.Layouts 1.1 import QtQml.Models 2.15 import QtGraphicalEffects 1.12 -import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.extras 2.0 as PlasmaExtras import org.kde.plasma.components 3.0 as PC3 diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml index e1afa722..968b4ca6 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppDelegate.qml @@ -9,7 +9,6 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 as Controls import QtGraphicalEffects 1.6 -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.kquickcontrolsaddons 2.0 diff --git a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml index bbee7d3f..5500e2d2 100644 --- a/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml +++ b/containments/homescreens/halcyon/package/contents/ui/GridAppList.qml @@ -7,7 +7,6 @@ import QtQuick 2.15 import QtQuick.Layouts 1.1 import QtQuick.Controls 2.15 as Controls -import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 3.0 as PC3 import org.kde.plasma.extras 2.0 as PlasmaExtras @@ -86,7 +85,7 @@ MobileShell.GridView { } application.setMinimizedDelegate(delegate); - application.runApplication(); + MobileShell.ShellUtil.launchApp(application.storageId); } } }