Add menus recursivly (submenus) in the search menu (#91)

* Add menus recursivly (submenus) in the sarch menu

requires to switch from the application window and back again atm..

* Add libXcomposite

* Do only include leafs in search and improve first search

* Do not call last on an empty list

* Refactor to avoid to much recursion.

Co-authored-by: probonopd <probonopd@users.noreply.github.com>

Author: jsm222

src/actionsearch/actionsearch.cpp

@@ -16,7 +16,9 @@ void ActionSearch::update(QMenuBar *menu)
 {
 	for (auto menuAction: menu->actions())
 	{
-		readMenuActions(menuAction->menu());
+		QStringList names;
+		readMenuActions(menuAction->menu(),names);
+
 	}
 }
 
@@ -27,7 +29,7 @@ void ActionSearch::execute(QString actionName)
 	}
 }
 
-void ActionSearch::readMenuActions(QMenu* menu)
+void ActionSearch::readMenuActions(QMenu* menu,QStringList names)
 {
 	// See https://doc.qt.io/qt-5/qaction.html#menu
 	// If a QAction does not have menu in it, then
@@ -36,29 +38,30 @@ void ActionSearch::readMenuActions(QMenu* menu)
 	if (!menu)
 		return;
 
-	QString menuName = menu->title().replace("&", "");
-
-
+	names << menu->title();
 	for (auto action: menu->actions())
 	{
+
 		if (action->menu() != NULL)
 		{
-			readMenuActions(action->menu());
-			continue;
+
+			readMenuActions(action->menu(),names);
 		}
 
+
 		QString actionName = action->text().replace("&", "");
-		if (!actionName.isEmpty() && action->isEnabled())
+		if (!actionName.isEmpty() && action->isEnabled() && !action->menu())
 		{
-			// TODO: we might want to have a multilevel menuName
-            // actionName += "\n(" + menuName +")";
-            actionName = menuName + " → " + actionName;
+            actionName = names.join(" → ") + " → " + actionName;
+
             if (action->shortcut().toString() != "") {
                 actionName = actionName + " (" + action->shortcut().toString() +")";
             }
 			actions.insert(actionName, action);
 		}
 
 	}
+	names.clear();
+
 }
 

src/actionsearch/actionsearch.h

@@ -20,7 +20,7 @@ class ActionSearch
 	private:
 		QMenuBar* menuBar;
 
-		void readMenuActions(QMenu* menu);
+		void readMenuActions(QMenu* menu, QStringList names);
 
 		QHash<QString, QAction*> actions{}; // std::unordered_map
 };

src/appmenu/appmenumodel.cpp

@@ -33,7 +33,7 @@
 #include <QDBusConnectionInterface>
 #include <QDBusServiceWatcher>
 #include <QGuiApplication>
-
+#include <QTimer>
 #include <QDebug>
 
 #include "dbusmenuimporter.h"
@@ -99,6 +99,7 @@ AppMenuModel::AppMenuModel(QObject *parent)
         if (serviceName == m_serviceName) {
             setMenuAvailable(false);
             emit modelNeedsUpdate();
+            emit menuParsed();
         }
     });
 }
@@ -302,6 +303,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
     if (!id) {
         setMenuAvailable(false);
         emit modelNeedsUpdate();
+        emit menuParsed();
         return;
     }
 
@@ -401,6 +403,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
             // rekols: 切换到桌面时要隐藏menubar
             setMenuAvailable(false);
             emit modelNeedsUpdate();
+            emit menuParsed();
             return;
         }
 
@@ -431,8 +434,11 @@ void AppMenuModel::onActiveWindowChanged(WId id)
         m_delayedMenuWindowId = id;
 
         //no menu found, set it to unavailable
+
         setMenuAvailable(false);
         emit modelNeedsUpdate();
+        emit menuParsed();
+
     }
 }
 
@@ -522,18 +528,21 @@ void AppMenuModel::updateApplicationMenu(const QString &serviceName, const QStri
     }
 
     m_importer = new KDBusMenuImporter(serviceName, menuObjectPath, this);
+    if(serviceName =="org.kde.plasma.gmenu_dbusmenu_proxy") {
+        QTimer::singleShot(200,this, [=](){m_importer->updateMenu();});
+    } else {
     QMetaObject::invokeMethod(m_importer, "updateMenu", Qt::QueuedConnection);
+    }
 
+    m_menu = m_importer->menu();
 
     connect(m_importer.data(), &DBusMenuImporter::menuUpdated, this, [=](QMenu *menu) {
-        m_menu = m_importer->menu();
+        for (QAction *a : menu->actions()) {
 
-        if (m_menu.isNull() || menu != m_menu) {
-            return;
-        }
+            if(a->menu()) {
+		           m_importer->updateMenu(a->menu());
 
-        //cache first layer of sub menus, which we'll be popping up
-        for (QAction *a : m_menu->actions()) {
+            }
             // signal dataChanged when the action changes
             connect(a, &QAction::changed, this, [this, a] {
                 if (m_menuAvailable && m_menu)
@@ -544,19 +553,18 @@ void AppMenuModel::updateApplicationMenu(const QString &serviceName, const QStri
                         const QModelIndex modelIdx = index(actionIdx, 0);
                         emit dataChanged(modelIdx, modelIdx);
                     }
-		    emit modelNeedsUpdate();
                 }
             });
 
             connect(a, &QAction::destroyed, this, &AppMenuModel::modelNeedsUpdate);
 
-            if (a->menu()) {
-		m_importer->updateMenu(a->menu());
-            }
         }
-    
-    	setMenuAvailable(true);
-        emit modelNeedsUpdate();
+
+
+    if(m_menu && !m_menu->actions().isEmpty() && m_menu->actions().last() == menu->menuAction()) {
+            setMenuAvailable(true);
+            emit menuParsed();
+          }
     });
 
     connect(m_importer.data(), &DBusMenuImporter::actionActivationRequested, this, [this](QAction * action) {

src/appmenu/appmenumodel.h

@@ -28,7 +28,7 @@
 #include <KWindowSystem>
 #include <QPointer>
 #include <QRect>
-
+#include <QTimer>
 class QMenu;
 class QAction;
 class QModelIndex;
@@ -104,6 +104,7 @@ private Q_SLOTS:
 signals:
     void menuAvailableChanged();
     void modelNeedsUpdate();
+    void menuParsed();
     void filterByActiveChanged();
     void filterChildrenChanged();
     void visibleChanged();

src/appmenu/dbusmenuimporter.cpp

@@ -506,6 +506,7 @@ void DBusMenuImporter::updateMenu(QMenu *menu)
     d->sendEvent(id, QStringLiteral("opened"));
 }
 
+
 void DBusMenuImporter::slotAboutToShowDBusCallFinished(QDBusPendingCallWatcher *watcher)
 {
     int id = watcher->property(DBUSMENU_PROPERTY_ID).toInt();

src/appmenu/dbusmenuimporter.h

@@ -54,7 +54,7 @@ class DBusMenuImporter : public QObject
      * The menu created from listening to the DBusMenuExporter over DBus
      */
     QMenu *menu() const;
-
+    bool m_done;
 public Q_SLOTS:
     /**
      * Load the menu

src/appmenuwidget.cpp

@@ -372,7 +372,7 @@ AppMenuWidget::AppMenuWidget(QWidget *parent)
     menuImporter->connectToBus();
 
     m_appMenuModel = new AppMenuModel(this);
-    connect(m_appMenuModel, &AppMenuModel::modelNeedsUpdate, this, &AppMenuWidget::updateMenu);
+    connect(m_appMenuModel, &AppMenuModel::menuParsed, this, &AppMenuWidget::updateMenu);
 
     connect(KWindowSystem::self(), &KWindowSystem::activeWindowChanged, this, &AppMenuWidget::delayUpdateActiveWindow);
     connect(KWindowSystem::self(), static_cast<void (KWindowSystem::*)(WId, NET::Properties, NET::Properties2)>(&KWindowSystem::windowChanged),