merge commits from KDE repo

Author: SeptemberHX

CMakeLists.txt

@@ -24,10 +24,12 @@ find_package(Qt5DBus REQUIRED)
 find_package(KF5WindowSystem REQUIRED)
 find_package(Qt5X11Extras REQUIRED)
 find_package(XCB REQUIRED COMPONENTS xcb)
+find_package(KF5Config)
+find_package(KF5CoreAddons)
 
 set(SRCS main.cpp
         menuimporter.h menuimporter.cpp
-        gmenu-dbusmenu-proxy/dbusmenutypes_p.h gmenu-dbusmenu-proxy/dbusmenutypes_p.cpp
+        dbusmenutypes_p.h dbusmenutypes_p.cpp
         dbusmenushortcut_p.h dbusmenushortcut_p.cpp
 
         # gmenu dbus proxy
@@ -36,10 +38,10 @@ set(SRCS main.cpp
         gmenu-dbusmenu-proxy/menuproxy.h gmenu-dbusmenu-proxy/menuproxy.cpp
         gmenu-dbusmenu-proxy/menu.h gmenu-dbusmenu-proxy/menu.cpp
         gmenu-dbusmenu-proxy/icons.h gmenu-dbusmenu-proxy/icons.cpp
-        gdbusmenutypes_p.h gdbusmenutypes_p.cpp
+        gmenu-dbusmenu-proxy/gdbusmenutypes_p.h gmenu-dbusmenu-proxy/gdbusmenutypes_p.cpp
         gmenu-dbusmenu-proxy/actions.h gmenu-dbusmenu-proxy/actions.cpp
         config-X11.h
-        )
+        gmenu-dbusmenu-proxy/debug.h)
 
 qt5_add_dbus_adaptor(SRCS com.canonical.AppMenu.Registrar.xml
     menuimporter.h MenuImporter menuimporteradaptor MenuImporterAdaptor)
@@ -61,6 +63,9 @@ target_link_libraries(${PROJECT}
         Qt5::X11Extras
         KF5::WindowSystem
         ${XCB_LIBRARIES}
+        KF5::ConfigCore
+        KF5::ConfigGui
+        KF5::CoreAddons
         )
 
 include(deb.cmake)

gmenu-dbusmenu-proxy/dbusmenutypes_p.cpp dbusmenutypes_p.cppgmenu-dbusmenu-proxy/dbusmenutypes_p.cpp renamed to dbusmenutypes_p.cpp

@@ -1,21 +1,8 @@
 /*
- * Copyright (C) 2018 Kai Uwe Broulik <kde@privat.broulik.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
+    SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde@privat.broulik.de>
+
+    SPDX-License-Identifier: LGPL-2.1-or-later
+*/
 
 #include "actions.h"
 
@@ -30,9 +17,9 @@
 static const QString s_orgGtkActions = QStringLiteral("org.gtk.Actions");
 
 Actions::Actions(const QString &serviceName, const QString &objectPath, QObject *parent)
-    : QObject(parent)
-    , m_serviceName(serviceName)
-    , m_objectPath(objectPath)
+        : QObject(parent)
+        , m_serviceName(serviceName)
+        , m_objectPath(objectPath)
 {
     Q_ASSERT(!serviceName.isEmpty());
     Q_ASSERT(!m_objectPath.isEmpty());
@@ -42,7 +29,7 @@ Actions::Actions(const QString &serviceName, const QString &objectPath, QObject
                                                s_orgGtkActions,
                                                QStringLiteral("Changed"),
                                                this,
-                                               SLOT(onActionsChanged(QStringList,StringBoolMap,QVariantMap,GMenuActionMap)))) {
+                                               SLOT(onActionsChanged(QStringList, StringBoolMap, QVariantMap, GMenuActionMap)))) {
         qDebug() << "Failed to subscribe to action changes for" << parent << "on" << serviceName << "at" << objectPath;
     }
 }
@@ -51,21 +38,18 @@ Actions::~Actions() = default;
 
 void Actions::load()
 {
-    QDBusMessage msg = QDBusMessage::createMethodCall(m_serviceName,
-                                                      m_objectPath,
-                                                      s_orgGtkActions,
-                                                      QStringLiteral("DescribeAll"));
+    QDBusMessage msg = QDBusMessage::createMethodCall(m_serviceName, m_objectPath, s_orgGtkActions, QStringLiteral("DescribeAll"));
 
     QDBusPendingReply<GMenuActionMap> reply = QDBusConnection::sessionBus().asyncCall(msg);
     QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(reply, this);
     connect(watcher, &QDBusPendingCallWatcher::finished, this, [this](QDBusPendingCallWatcher *watcher) {
         QDBusPendingReply<GMenuActionMap> reply = *watcher;
         if (reply.isError()) {
             qDebug() << "Failed to get actions from" << m_serviceName << "at" << m_objectPath << reply.error();
-            emit failedToLoad();
+            Q_EMIT failedToLoad();
         } else {
             m_actions = reply.value();
-            emit loaded();
+            Q_EMIT loaded();
         }
         watcher->deleteLater();
     });
@@ -94,10 +78,7 @@ void Actions::trigger(const QString &name, const QVariant &target, uint timestam
         return;
     }
 
-    QDBusMessage msg = QDBusMessage::createMethodCall(m_serviceName,
-                                                      m_objectPath,
-                                                      s_orgGtkActions,
-                                                      QStringLiteral("Activate"));
+    QDBusMessage msg = QDBusMessage::createMethodCall(m_serviceName, m_objectPath, s_orgGtkActions, QStringLiteral("Activate"));
     msg << name;
 
     QVariantList args;
@@ -134,10 +115,7 @@ bool Actions::isValid() const
     return !m_actions.isEmpty();
 }
 
-void Actions::onActionsChanged(const QStringList &removed,
-                               const StringBoolMap &enabledChanges,
-                               const QVariantMap &stateChanges,
-                               const GMenuActionMap &added)
+void Actions::onActionsChanged(const QStringList &removed, const StringBoolMap &enabledChanges, const QVariantMap &stateChanges, const GMenuActionMap &added)
 {
     // Collect the actions that we removed, altered, or added, so we can eventually signal changes for all menus that contain one of those actions
     QStringList dirtyActions;
@@ -201,18 +179,12 @@ void Actions::onActionsChanged(const QStringList &removed,
     for (auto it = added.constBegin(), end = added.constEnd(); it != end; ++it) {
         const QString &actionName = it.key();
 
-//        if (DBUSMENUPROXY().isInfoEnabled()) {
-//            if (m_actions.contains(actionName)) {
-//                qDebug() << "Got new action" << actionName << "that we already have, overwriting existing one";
-//            }
-//        }
-
         m_actions.insert(actionName, it.value());
 
         dirtyActions.append(actionName);
     }
 
     if (!dirtyActions.isEmpty()) {
-        emit actionsChanged(dirtyActions);
+        Q_EMIT actionsChanged(dirtyActions);
     }
-}
+}

gmenu-dbusmenu-proxy/dbusmenutypes_p.h dbusmenutypes_p.hgmenu-dbusmenu-proxy/dbusmenutypes_p.h renamed to dbusmenutypes_p.h

@@ -1,34 +1,20 @@
 /*
- * Copyright (C) 2018 Kai Uwe Broulik <kde@privat.broulik.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
+    SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde@privat.broulik.de>
+
+    SPDX-License-Identifier: LGPL-2.1-or-later
+*/
 
 #pragma once
 
 #include <QObject>
 #include <QString>
+#include <QStringList>
 
 #include "gdbusmenutypes_p.h"
 
-class QStringList;
-
 class Actions : public QObject
 {
-    Q_OBJECT
+Q_OBJECT
 
 public:
     Actions(const QString &serviceName, const QString &objectPath, QObject *parent = nullptr);
@@ -42,21 +28,17 @@ class Actions : public QObject
 
     bool isValid() const; // basically "has actions"
 
-signals:
+Q_SIGNALS:
     void loaded();
     void failedToLoad(); // expose error?
     void actionsChanged(const QStringList &dirtyActions);
 
-private slots:
-    void onActionsChanged(const QStringList &removed,
-                          const StringBoolMap &enabledChanges,
-                          const QVariantMap &stateChanges,
-                          const GMenuActionMap &added);
+private Q_SLOTS:
+    void onActionsChanged(const QStringList &removed, const StringBoolMap &enabledChanges, const QVariantMap &stateChanges, const GMenuActionMap &added);
 
 private:
     GMenuActionMap m_actions;
 
     QString m_serviceName;
     QString m_objectPath;
-
-};
+};

gmenu-dbusmenu-proxy/actions.cpp

@@ -0,0 +1,15 @@
+//
+// Created by ragdoll on 2022/4/3.
+//
+
+#ifndef DDE_GLOBALMENU_SERVICE_DEBUG_H
+#define DDE_GLOBALMENU_SERVICE_DEBUG_H
+
+#include <QLoggingCategory>
+
+static const QLoggingCategory &DBUSMENUPROXY() {
+    static const QLoggingCategory category("DBusMenuProxy");
+    return category;
+}
+
+#endif //DDE_GLOBALMENU_SERVICE_DEBUG_H

gmenu-dbusmenu-proxy/actions.h

@@ -1,21 +1,8 @@
 /*
- * Copyright (C) 2018 Kai Uwe Broulik <kde@privat.broulik.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
+    SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde@privat.broulik.de>
+
+    SPDX-License-Identifier: LGPL-2.1-or-later
+*/
 
 #include "gdbusmenutypes_p.h"
 
@@ -129,4 +116,4 @@ void GDBusMenuTypes_register()
     qDBusRegisterMetaType<StringBoolMap>();
 
     registered = true;
-}
+}

gmenu-dbusmenu-proxy/debug.h

@@ -1,21 +1,8 @@
 /*
- * Copyright (C) 2018 Kai Uwe Broulik <kde@privat.broulik.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
+    SPDX-FileCopyrightText: 2018 Kai Uwe Broulik <kde@privat.broulik.de>
+
+    SPDX-License-Identifier: LGPL-2.1-or-later
+*/
 
 #pragma once
 
@@ -34,8 +21,7 @@ using StringBoolMap = QMap<QString, bool>;
 Q_DECLARE_METATYPE(StringBoolMap);
 
 // Menu item itself (Start method)
-struct GMenuItem
-{
+struct GMenuItem {
     uint id;
     uint section;
     VariantMapList items;
@@ -49,8 +35,7 @@ using GMenuItemList = QList<GMenuItem>;
 Q_DECLARE_METATYPE(GMenuItemList);
 
 // Information about what section or submenu to use for a particular entry
-struct GMenuSection
-{
+struct GMenuSection {
     uint subscription;
     uint menu;
 };
@@ -60,8 +45,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const GMenuSection &item);
 const QDBusArgument &operator>>(const QDBusArgument &argument, GMenuSection &item);
 
 // Changes of a menu item (Changed signal)
-struct GMenuChange
-{
+struct GMenuChange {
     uint subscription;
     uint menu;
 
@@ -78,8 +62,7 @@ using GMenuChangeList = QList<GMenuChange>;
 Q_DECLARE_METATYPE(GMenuChangeList);
 
 // An application action
-struct GMenuAction
-{
+struct GMenuAction {
     bool enabled;
     QDBusSignature signature;
     QVariantList state;
@@ -92,8 +75,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, GMenuAction &item
 using GMenuActionMap = QMap<QString, GMenuAction>;
 Q_DECLARE_METATYPE(GMenuActionMap);
 
-struct GMenuActionsChange
-{
+struct GMenuActionsChange {
     QStringList removed;
     QMap<QString, bool> enabledChanged;
     QVariantMap stateChanged;
@@ -104,4 +86,4 @@ Q_DECLARE_METATYPE(GMenuActionsChange);
 QDBusArgument &operator<<(QDBusArgument &argument, const GMenuActionsChange &item);
 const QDBusArgument &operator>>(const QDBusArgument &argument, GMenuActionsChange &item);
 
-void GDBusMenuTypes_register();
+void GDBusMenuTypes_register();