fix: Shutdown plugin miss menu function

yixinshark · yixinshark · commit a6b9fa66a3c8 · 2024-12-17T11:47:00.000+08:00
as title

Log: as title
Bug: BUG-294875
diff --git a/applets/dde-shutdown/shutdownapplet.cpp b/applets/dde-shutdown/shutdownapplet.cpp
@@ -34,11 +34,25 @@ bool ShutdownApplet::load()
     return true;
 }
 
-bool ShutdownApplet::requestShutdown()
+bool ShutdownApplet::requestShutdown(const QString &type)
 {
-    qDebug() << "request shutdown";
+    qDebug() << "request shutdown:" << type;
     if (m_lockscreen) {
-        m_lockscreen->shutdown();
+        if (type.isEmpty()) {
+            // TODO: left mouse clicked, show shutdown page
+            m_lockscreen->shutdown();
+        } else if (type == QStringLiteral("Shutdown")) {
+            m_lockscreen->shutdown();
+        } else if (type == QStringLiteral("Lock")) {
+            m_lockscreen->lock();
+        } else if (type == QStringLiteral("SwitchUser")) {
+            m_lockscreen->switchUser();
+        } else if (type == QStringLiteral("UpdateAndShutdown") || type == QStringLiteral("UpdateAndReboot") ||
+            type == QStringLiteral("Suspend") || type == QStringLiteral("Hibernate") ||
+            type == QStringLiteral("Restart") || type == QStringLiteral("Logout")) {
+            // TODO: implement these types
+            m_lockscreen->shutdown();
+        }
     } else {
         DDBusSender()
             .service("org.deepin.dde.ShutdownFront1")
@@ -51,22 +65,6 @@ bool ShutdownApplet::requestShutdown()
     return true;
 }
 
-bool ShutdownApplet::requestLock()
-{
-    if (m_lockscreen) {
-        m_lockscreen->lock();
-    }
-    return true;
-}
-
-bool ShutdownApplet::requestSwitchUser()
-{
-    if (m_lockscreen) {
-        m_lockscreen->switchUser();
-    }
-    return true;
-}
-
 D_APPLET_CLASS(ShutdownApplet)
 }
 DS_END_NAMESPACE
diff --git a/applets/dde-shutdown/shutdownapplet.h b/applets/dde-shutdown/shutdownapplet.h
@@ -19,9 +19,7 @@ class ShutdownApplet : public DApplet
     virtual bool load() override;
 
 public Q_SLOTS:
-    bool requestShutdown();
-    bool requestLock();
-    bool requestSwitchUser();
+    bool requestShutdown(const QString &type);
 
 private:
     QScopedPointer<TreeLandLockScreen> m_lockscreen;
diff --git a/debian/control b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
  libqt6svg6,
  libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon, qt6-declarative-private-dev,
  libyaml-cpp-dev,
- qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (> 1.99.6),
+ qt6-l10n-tools, qt6-svg-dev, dde-tray-loader-dev (> 1.99.8),
  dde-application-manager-api (>= 1.2.16), dde-control-center-dev (>= 6.0.73)
 Standards-Version: 3.9.8
 Homepage: http://www.deepin.org
@@ -60,7 +60,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, libdde-shell( =${binary:Version}),
   libdtk6declarative, qml6-module-qtquick-controls2-styles-chameleon,
   qml6-module-qtquick-layouts, qml6-module-qtquick-window,
   qml6-module-qt-labs-platform, qml6-module-qt-labs-qmlmodels,
-  dde-tray-loader (> 1.99.6)
+  dde-tray-loader (> 1.99.8)
 Multi-Arch: same
 Description: An wrapper for developed based on dde-shell plugin system
 
diff --git a/example/lockscreen-example/package/main.qml b/example/lockscreen-example/package/main.qml
@@ -27,7 +27,7 @@ AppletItem {
             onClicked: {
                 let lockscreen = lockscreenApplet()
                 if (lockscreen) {
-                    lockscreen.requestLock()
+                    lockscreen.requestShutdown("Lock")
                 }
             }
         }
@@ -36,7 +36,7 @@ AppletItem {
             onClicked: {
                 let lockscreen = lockscreenApplet()
                 if (lockscreen) {
-                    lockscreen.requestShutdown()
+                    lockscreen.requestShutdown("Shutdown")
                 }
             }
         }
@@ -45,7 +45,7 @@ AppletItem {
             onClicked: {
                 let lockscreen = lockscreenApplet()
                 if (lockscreen) {
-                    lockscreen.requestSwitchUser()
+                    lockscreen.requestShutdown("SwitchUser")
                 }
             }
         }
diff --git a/panels/dock/DockCompositor.qml b/panels/dock/DockCompositor.qml
@@ -28,7 +28,7 @@ Item {
 
     signal pluginSurfacesUpdated()
     signal popupCreated(var popup)
-    signal requestShutdown()
+    signal requestShutdown(var type)
 
     function removeDockPluginSurface(model, object) {
         for (var i = 0; i < model.count; ++i) {
@@ -104,8 +104,8 @@ Item {
                 dockCompositor.popupCreated(popup)
             }
 
-            onRequestShutdown: {
-                dockCompositor.requestShutdown()
+            onRequestShutdown: (type) => {
+                dockCompositor.requestShutdown(type)
             }
         }
 
diff --git a/panels/dock/pluginmanagerextension.cpp b/panels/dock/pluginmanagerextension.cpp
@@ -186,10 +186,10 @@ void PluginSurface::plugin_dcc_icon(Resource *resource, const QString &icon)
     m_dccIcon = icon;
 }
 
-void PluginSurface::plugin_request_shutdown(Resource *resource)
+void PluginSurface::plugin_request_shutdown(Resource *resource, const QString &type)
 {
     Q_UNUSED(resource);
-    Q_EMIT m_manager->requestShutdown();
+    Q_EMIT m_manager->requestShutdown(type);
 }
 
 void PluginSurface::plugin_destroy_resource(Resource *resource)
diff --git a/panels/dock/pluginmanagerextension_p.h b/panels/dock/pluginmanagerextension_p.h
@@ -82,7 +82,7 @@ class PluginManager : public QWaylandCompositorExtensionTemplate<PluginManager>,
     void pluginSurfaceDestroyed(PluginSurface*);
     void messageRequest(PluginSurface *, const QString &msg);
     void dockSizeChanged();
-    void requestShutdown();
+    void requestShutdown(const QString &type);
 
 protected:
     virtual void plugin_manager_v1_request_message(Resource *resource, const QString &plugin_id, const QString &item_key, const QString &msg) override;
@@ -169,7 +169,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_request_shutdown(Resource *resource, const QString &type) override;
     virtual void plugin_destroy_resource(Resource *resource) override;
     virtual void plugin_destroy(Resource *resource) override;
     virtual void plugin_source_size(Resource *resource, int32_t width, int32_t height) override;
diff --git a/panels/dock/tray/package/tray.qml b/panels/dock/tray/package/tray.qml
@@ -157,10 +157,10 @@ AppletItem {
             console.log("onPluginSurfacesUpdated", surfacesData.length)
         }
 
-        function onRequestShutdown() {
+        function onRequestShutdown(type) {
             var shutdown = DS.applet("org.deepin.ds.dde-shutdown")
             if (shutdown) {
-                shutdown.requestShutdown()
+                shutdown.requestShutdown(type)
             } else {
                 console.warn("shutdown applet not found")
             }
diff --git a/panels/dock/tray/quickpanel/PanelPluginPage.qml b/panels/dock/tray/quickpanel/PanelPluginPage.qml
@@ -60,7 +60,8 @@ Item {
                     console.log("clicked shutdown")
                     var shutdown = DS.applet("org.deepin.ds.dde-shutdown")
                     if (shutdown) {
-                        shutdown.requestShutdown()
+                        // type is empty: just show shutdown page
+                        shutdown.requestShutdown("")
                     } else {
                         console.warn("shutdown applet not found")
                     }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ AppletItem {`
`27`	`27`	`onClicked: {`
`28`	`28`	`let lockscreen = lockscreenApplet()`
`29`	`29`	`if (lockscreen) {`
`30`		`- lockscreen.requestLock()`
	`30`	`+ lockscreen.requestShutdown("Lock")`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`	`}`
`@@ -36,7 +36,7 @@ AppletItem {`
`36`	`36`	`onClicked: {`
`37`	`37`	`let lockscreen = lockscreenApplet()`
`38`	`38`	`if (lockscreen) {`
`39`		`- lockscreen.requestShutdown()`
	`39`	`+ lockscreen.requestShutdown("Shutdown")`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
`@@ -45,7 +45,7 @@ AppletItem {`
`45`	`45`	`onClicked: {`
`46`	`46`	`let lockscreen = lockscreenApplet()`
`47`	`47`	`if (lockscreen) {`
`48`		`- lockscreen.requestSwitchUser()`
	`48`	`+ lockscreen.requestShutdown("SwitchUser")`
`49`	`49`	`}`
`50`	`50`	`}`
`51`	`51`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ Item {`
`28`	`28`
`29`	`29`	`signal pluginSurfacesUpdated()`
`30`	`30`	`signal popupCreated(var popup)`
`31`		`- signal requestShutdown()`
	`31`	`+ signal requestShutdown(var type)`
`32`	`32`
`33`	`33`	`function removeDockPluginSurface(model, object) {`
`34`	`34`	`for (var i = 0; i < model.count; ++i) {`
`@@ -104,8 +104,8 @@ Item {`
`104`	`104`	`dockCompositor.popupCreated(popup)`
`105`	`105`	`}`
`106`	`106`
`107`		`- onRequestShutdown: {`
`108`		`- dockCompositor.requestShutdown()`
	`107`	`+ onRequestShutdown: (type) => {`
	`108`	`+ dockCompositor.requestShutdown(type)`
`109`	`109`	`}`
`110`	`110`	`}`
`111`	`111`
Original file line number	Diff line number	Diff line change
`@@ -186,10 +186,10 @@ void PluginSurface::plugin_dcc_icon(Resource *resource, const QString &icon)`
`186`	`186`	`m_dccIcon = icon;`
`187`	`187`	`}`
`188`	`188`
`189`		`-void PluginSurface::plugin_request_shutdown(Resource *resource)`
	`189`	`+void PluginSurface::plugin_request_shutdown(Resource *resource, const QString &type)`
`190`	`190`	`{`
`191`	`191`	`Q_UNUSED(resource);`
`192`		`- Q_EMIT m_manager->requestShutdown();`
	`192`	`+ Q_EMIT m_manager->requestShutdown(type);`
`193`	`193`	`}`
`194`	`194`
`195`	`195`	`void PluginSurface::plugin_destroy_resource(Resource *resource)`
Original file line number	Diff line number	Diff line change
`@@ -157,10 +157,10 @@ AppletItem {`
`157`	`157`	`console.log("onPluginSurfacesUpdated", surfacesData.length)`
`158`	`158`	`}`
`159`	`159`
`160`		`- function onRequestShutdown() {`
	`160`	`+ function onRequestShutdown(type) {`
`161`	`161`	`var shutdown = DS.applet("org.deepin.ds.dde-shutdown")`
`162`	`162`	`if (shutdown) {`
`163`		`- shutdown.requestShutdown()`
	`163`	`+ shutdown.requestShutdown(type)`
`164`	`164`	`} else {`
`165`	`165`	`console.warn("shutdown applet not found")`
`166`	`166`	`}`