feat: add shutdown applet

applets/CMakeLists.txt

@@ -5,3 +5,4 @@
 add_subdirectory(dde-am)
 add_subdirectory(dde-appearance)
 add_subdirectory(dde-apps)
+add_subdirectory(dde-shutdown)

applets/dde-shutdown/CMakeLists.txt

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+add_library(dde-shutdown SHARED
+    shutdownapplet.cpp
+    shutdownapplet.h
+)
+
+target_link_libraries(dde-shutdown PRIVATE
+    dde-shell-frame
+    Qt${QT_MAJOR_VERSION}::DBus
+)
+
+ds_install_package(PACKAGE org.deepin.ds.dde-shutdown TARGET dde-shutdown)

applets/dde-shutdown/package/metadata.json

@@ -0,0 +1,7 @@
+{
+    "Plugin": {
+        "Version": "1.0",
+        "Id": "org.deepin.ds.dde-shutdown",
+        "Category": "DDE"
+    }
+}

applets/dde-shutdown/shutdownapplet.cpp

@@ -0,0 +1,51 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#include "shutdownapplet.h"
+#include "pluginfactory.h"
+
+#include <QDebug>
+#include <QGuiApplication>
+
+#include <DDBusSender>
+DCORE_USE_NAMESPACE
+
+DS_BEGIN_NAMESPACE
+namespace shutdown {
+
+ShutdownApplet::ShutdownApplet(QObject *parent)
+    : DApplet(parent)
+{
+}
+
+ShutdownApplet::~ShutdownApplet()
+{
+}
+
+bool ShutdownApplet::load()
+{
+    return true;
+}
+
+bool ShutdownApplet::requestShutdown()
+{
+    if (QStringLiteral("wayland") == QGuiApplication::platformName()) {
+        qDebug() << "request treeland shutdown";
+    } else {
+        DDBusSender()
+            .service("org.deepin.dde.ShutdownFront1")
+            .interface("org.deepin.dde.ShutdownFront1")
+            .path("/org/deepin/dde/ShutdownFront1")
+            .method("Show")
+            .call();
+    }
+
+    return true;
+}
+
+D_APPLET_CLASS(ShutdownApplet)
+}
+DS_END_NAMESPACE
+
+#include "shutdownapplet.moc"

applets/dde-shutdown/shutdownapplet.h

@@ -0,0 +1,25 @@
+// SPDX-FileCopyrightText: 2024 UnionTech Software Technology Co., Ltd.
+//
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+#pragma once
+
+#include "applet.h"
+
+DS_BEGIN_NAMESPACE
+namespace shutdown {
+class ShutdownApplet : public DApplet
+{
+    Q_OBJECT
+public:
+    explicit ShutdownApplet(QObject *parent = nullptr);
+    ~ShutdownApplet();
+
+    virtual bool load() override;
+
+public Q_SLOTS:
+    bool requestShutdown();
+};
+
+}
+DS_END_NAMESPACE

panels/dock/DockCompositor.qml

@@ -27,6 +27,7 @@ Item {
 
     signal pluginSurfacesUpdated()
     signal popupCreated(var popup)
+    signal requestShutdown()
 
     function removeDockPluginSurface(model, object) {
         for (var i = 0; i < model.count; ++i) {
@@ -101,6 +102,10 @@ Item {
                 console.log("plugin popup created", popup.pluginId, popup.itemKey, popup.popupType)
                 dockCompositor.popupCreated(popup)
             }
+
+            onRequestShutdown: {
+                dockCompositor.requestShutdown()
+            }
         }
     }
 }

panels/dock/pluginmanagerextension.cpp

@@ -115,6 +115,12 @@ void PluginSurface::plugin_dcc_icon(Resource *resource, const QString &icon)
     m_dccIcon = icon;
 }
 
+void PluginSurface::plugin_request_shutdown(Resource *resource)
+{
+    Q_UNUSED(resource);
+    Q_EMIT m_manager->requestShutdown();
+}
+
 void PluginSurface::plugin_destroy_resource(Resource *resource)
 {
     Q_UNUSED(resource);

panels/dock/pluginmanagerextension_p.h

@@ -50,6 +50,7 @@ class PluginManager : public QWaylandCompositorExtensionTemplate<PluginManager>,
     void pluginSurfaceDestroyed(PluginSurface*);
     void messageRequest(PluginSurface *, const QString &msg);
     void dockSizeChanged();
+    void requestShutdown();
 
 protected:
     virtual void plugin_manager_v1_request_message(Resource *resource, const QString &plugin_id, const QString &item_key, const QString &msg) override;
@@ -131,6 +132,7 @@ class PluginSurface : public QWaylandShellSurfaceTemplate<PluginSurface>, public
 protected:
     virtual void plugin_mouse_event(Resource *resource, int32_t type) override;
     virtual void plugin_dcc_icon(Resource *resource, const QString &icon) override;
+    virtual void plugin_request_shutdown(Resource *resource) override;
     virtual void plugin_destroy_resource(Resource *resource) override;
     virtual void plugin_destroy(Resource *resource) override;
 

panels/dock/tray/package/tray.qml

@@ -156,6 +156,15 @@ AppletItem {
             DDT.TraySortOrderModel.availableSurfaces = surfacesData
             console.log("onPluginSurfacesUpdated", surfacesData.length)
         }
+
+        function onRequestShutdown() {
+            var shutdown = DS.applet("org.deepin.ds.dde-shutdown")
+            if (shutdown) {
+                shutdown.requestShutdown()
+            } else {
+                console.warn("shutdown applet not found")
+            }
+        }
     }
 
     WaylandOutput {

panels/dock/tray/quickpanel/PanelPluginPage.qml

@@ -58,7 +58,12 @@ Item {
                 icon.name: "quickpanel-power"
                 onClicked: function () {
                     console.log("clicked shutdown")
-                    model.openShutdownScreen()
+                    var shutdown = DS.applet("org.deepin.ds.dde-shutdown")
+                    if (shutdown) {
+                        shutdown.requestShutdown()
+                    } else {
+                        console.warn("shutdown applet not found")
+                    }
                 }
             }
         }

panels/dock/tray/quickpanel/quickpanelproxymodel.cpp

@@ -54,16 +54,6 @@ void QuickPanelProxyModel::openSystemSettings()
         .call();
 }
 
-void QuickPanelProxyModel::openShutdownScreen()
-{
-    DDBusSender()
-        .service("org.deepin.dde.ShutdownFront1")
-        .interface("org.deepin.dde.ShutdownFront1")
-        .path("/org/deepin/dde/ShutdownFront1")
-        .method("Show")
-        .call();
-}
-
 QVariant QuickPanelProxyModel::data(const QModelIndex &index, int role) const
 {
     const auto sourceIndex = mapToSource(index);

panels/dock/tray/quickpanel/quickpanelproxymodel.h

@@ -24,7 +24,6 @@ class QuickPanelProxyModel : public QSortFilterProxyModel, public QQmlParserStat
     Q_INVOKABLE QString getTitle(const QString &pluginId) const;
     Q_INVOKABLE bool isQuickPanelPopup(const QString &pluginId, const QString &itemKey) const;
     Q_INVOKABLE void openSystemSettings();
-    Q_INVOKABLE void openShutdownScreen();
 
     QVariant data(const QModelIndex &index, int role) const override;
     QHash<int, QByteArray> roleNames() const override;