fix: unable to set visibility of 'Show Desktop' in DCC

Issues: linuxdeepin/developer-center#9820
zsien · Jul 26, 2024 · 55c8c0b · 55c8c0b
1 parent 057636c
commit 55c8c0b
Show file tree

Hide file tree

Showing 25 changed files with 316 additions and 2 deletions.
diff --git a/panels/dock/dockdbusproxy.cpp b/panels/dock/dockdbusproxy.cpp
@@ -21,6 +21,7 @@ DockDBusProxy::DockDBusProxy(DockPanel* parent)
     , m_clipboardApplet(nullptr)
     , m_searchApplet(nullptr)
     , m_multitaskviewApplet(nullptr)
+    , m_showdesktopApplet(nullptr)
     , m_trayApplet(nullptr)
 {
     registerPluginInfoMetaType();
@@ -29,12 +30,14 @@ DockDBusProxy::DockDBusProxy(DockPanel* parent)
         setPluginVisible("org.deepin.ds.dock.clipboarditem", pluginsVisible);
         setPluginVisible("org.deepin.ds.dock.searchitem", pluginsVisible);
         setPluginVisible("org.deepin.ds.dock.multitaskview", pluginsVisible);
+        setPluginVisible("org.deepin.ds.dock.showdesktop", pluginsVisible);
     });
     connect(parent, &DockPanel::rootObjectChanged, this, [this]() {
         auto pluginsVisible = DockSettings::instance()->pluginsVisible();
         setPluginVisible("org.deepin.ds.dock.clipboarditem", pluginsVisible);
         setPluginVisible("org.deepin.ds.dock.searchitem", pluginsVisible);
         setPluginVisible("org.deepin.ds.dock.multitaskview", pluginsVisible);
+        setPluginVisible("org.deepin.ds.dock.showdesktop", pluginsVisible);
     });
 
     // Communicate with the other module
@@ -51,7 +54,10 @@ DockDBusProxy::DockDBusProxy(DockPanel* parent)
         list = appletList("org.deepin.ds.dock.multitaskview");
         if (!list.isEmpty()) m_multitaskviewApplet = list.first();
 
-        return m_trayApplet && m_clipboardApplet && m_searchApplet && m_multitaskviewApplet;
+        list = appletList("org.deepin.ds.dock.showdesktop");
+        if (!list.isEmpty()) m_showdesktopApplet = list.first();
+
+        return m_trayApplet && m_clipboardApplet && m_searchApplet && m_multitaskviewApplet && m_showdesktopApplet;
     };
 
     // TODO: DQmlGlobal maybe missing a  signal which named `appletListChanged`?
@@ -259,6 +265,13 @@ DockItemInfos DockDBusProxy::plugins()
             iteminfos.append(info);
         }
     }
+
+    if (m_showdesktopApplet && DWindowManagerHelper::instance()->hasComposite()) {
+        DockItemInfo info;
+        if (QMetaObject::invokeMethod(m_showdesktopApplet, "dockItemInfo", Qt::DirectConnection, qReturnArg(info))) {
+            iteminfos.append(info);
+        }
+    }
     return iteminfos;
 }
 
@@ -289,6 +302,11 @@ void DockDBusProxy::setItemOnDock(const QString &settingKey, const QString &item
         auto pluginsVisible = DockSettings::instance()->pluginsVisible();
         pluginsVisible[itemKey] = visible;
         DockSettings::instance()->setPluginsVisible(pluginsVisible);
+    } else if (itemKey == "showdesktop" && m_showdesktopApplet) {
+        QMetaObject::invokeMethod(m_showdesktopApplet, "setVisible", Qt::QueuedConnection, visible);
+        auto pluginsVisible = DockSettings::instance()->pluginsVisible();
+        pluginsVisible[itemKey] = visible;
+        DockSettings::instance()->setPluginsVisible(pluginsVisible);
     } else if (m_trayApplet) {
         Q_EMIT pluginVisibleChanged(itemKey, visible);
         QMetaObject::invokeMethod(m_trayApplet, "setItemOnDock", Qt::QueuedConnection, settingKey, itemKey, visible);

diff --git a/panels/dock/dockdbusproxy.h b/panels/dock/dockdbusproxy.h
@@ -86,6 +86,7 @@ class DockDBusProxy final: public QObject, public QDBusContext
     DS_NAMESPACE::DApplet *m_clipboardApplet;
     DS_NAMESPACE::DApplet *m_searchApplet;
     DS_NAMESPACE::DApplet *m_multitaskviewApplet;
+    DS_NAMESPACE::DApplet *m_showdesktopApplet;
     DS_NAMESPACE::DApplet *m_trayApplet;
 };
 }

diff --git a/panels/dock/showdesktop/CMakeLists.txt b/panels/dock/showdesktop/CMakeLists.txt
@@ -5,10 +5,20 @@
 add_library(dock-showdesktop SHARED
     showdesktop.cpp
     showdesktop.h
+    ../dockiteminfo.cpp
+    ../dockiteminfo.h
+)
+
+target_include_directories(dock-showdesktop PRIVATE
+    "${CMAKE_CURRENT_BINARY_DIR}/../"
+    "../"
 )
 
 target_link_libraries(dock-showdesktop PRIVATE
     dde-shell-frame
 )
 
 ds_install_package(PACKAGE org.deepin.ds.dock.showdesktop TARGET dock-showdesktop)
+ds_handle_package_translation(PACKAGE org.deepin.ds.dock.showdesktop)
+
+install(FILES "package/icons/showdesktop.svg" DESTINATION share/dde-dock/icons/dcc-setting)
diff --git a/panels/dock/showdesktop/package/icons/showdesktop.svg b/panels/dock/showdesktop/package/icons/showdesktop.svg
diff --git a/panels/dock/showdesktop/showdesktop.cpp b/panels/dock/showdesktop/showdesktop.cpp
@@ -5,20 +5,25 @@
 #include "applet.h"
 #include "showdesktop.h"
 #include "pluginfactory.h"
+#include "../constants.h"
 
 #include <QProcess>
 #include <QGuiApplication>
 #include <QDBusInterface>
 #include <QLoggingCategory>
+#include <DWindowManagerHelper>
 
 Q_LOGGING_CATEGORY(showDesktop, "dde.shell.dock.showdesktop")
 
+DGUI_USE_NAMESPACE
+
 namespace dock {
 
 ShowDesktop::ShowDesktop(QObject *parent)
     : DApplet(parent)
+    , m_visible(true)
 {
-
+    connect(DWindowManagerHelper::instance(), &DWindowManagerHelper::hasCompositeChanged, this, &ShowDesktop::visibleChanged);
 }
 
 bool ShowDesktop::load()
@@ -50,6 +55,32 @@ bool ShowDesktop::checkNeedShowDesktop()
     return false;
 }
 
+DockItemInfo ShowDesktop::dockItemInfo()
+{
+    DockItemInfo info;
+    info.name = "showdesktop";
+    info.displayName = tr("Show Desktop");
+    info.itemKey = "showdesktop";
+    info.settingKey = "showdesktop";
+    info.visible = visible();
+    info.dccIcon = DCCIconPath + "showdesktop.svg";
+    return info;
+}
+
+bool ShowDesktop::visible() const
+{
+    return m_visible && DWindowManagerHelper::instance()->hasComposite();
+}
+
+void ShowDesktop::setVisible(bool visible)
+{
+    if (m_visible != visible) {
+        m_visible = visible;
+
+        Q_EMIT visibleChanged();
+    }
+}
+
 D_APPLET_CLASS(ShowDesktop)
 }
 

diff --git a/panels/dock/showdesktop/showdesktop.h b/panels/dock/showdesktop/showdesktop.h
@@ -6,19 +6,32 @@
 
 #include "applet.h"
 #include "dsglobal.h"
+#include "../dockiteminfo.h"
 
 namespace dock {
 
 class ShowDesktop : public DS_NAMESPACE::DApplet
 {
     Q_OBJECT
+    Q_PROPERTY(bool visible READ visible WRITE setVisible NOTIFY visibleChanged)
+
 public:
     explicit ShowDesktop(QObject *parent = nullptr);
     virtual bool init() override;
     virtual bool load() override;
 
     Q_INVOKABLE void toggleShowDesktop();
     Q_INVOKABLE bool checkNeedShowDesktop();
+
+    Q_INVOKABLE DockItemInfo dockItemInfo();
+    Q_INVOKABLE bool visible() const;
+    Q_INVOKABLE void setVisible(bool visible);
+
+Q_SIGNALS:
+    void visibleChanged();
+
+private:
+    bool m_visible;
 };
 
 }
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_az.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_az.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_bo.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_bo.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ca.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ca.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_es.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_es.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_fi.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_fi.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_fr.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_fr.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_hu.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_hu.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_it.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_it.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ja.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ja.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ko.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ko.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_nb_NO.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_nb_NO.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_pl.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_pl.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_pt_BR.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_pt_BR.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>
diff --git a/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ru.ts b/panels/dock/showdesktop/translations/org.deepin.ds.dock.showdesktop_ru.ts
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1">
+<context>
+    <name>dock::ShowDesktop</name>
+    <message>
+        <location filename="../showdesktop.cpp" line="62"/>
+        <source>Show Desktop</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>