Apply fix for #123, thanks @jsm222

@jsm222 says: Needs some polish but workarounds the problem of new fast spawning windows with same servicename and different object paths...
helloSystem · Dec 23, 2022 · 71ce4a8 · 71ce4a8
1 parent 267f193
commit 71ce4a8
Show file tree

Hide file tree

Showing 32 changed files with 298 additions and 285 deletions.
diff --git a/.gitignore b/.gitignore
@@ -9,6 +9,8 @@
 *.so.*
 *.dll
 *.dylib
+*.orig
+*.rej
 
 # Qt-es
 object_script.*.Release

diff --git a/Shutdown/Shutdown_de_DE.ts b/Shutdown/Shutdown_de_DE.ts
@@ -34,52 +34,52 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1000"/>
+        <location filename="../src/appmenuwidget.cpp" line="1002"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1001"/>
+        <location filename="../src/appmenuwidget.cpp" line="1003"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1008"/>
+        <location filename="../src/appmenuwidget.cpp" line="1010"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1016"/>
+        <location filename="../src/appmenuwidget.cpp" line="1018"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1017"/>
+        <location filename="../src/appmenuwidget.cpp" line="1019"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1047"/>
+        <location filename="../src/appmenuwidget.cpp" line="1049"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1052"/>
+        <location filename="../src/appmenuwidget.cpp" line="1054"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1057"/>
+        <location filename="../src/appmenuwidget.cpp" line="1059"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1204"/>
+        <location filename="../src/appmenuwidget.cpp" line="1206"/>
         <source>About helloDesktop</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/appmenuwidget.cpp" line="1235"/>
+        <location filename="../src/appmenuwidget.cpp" line="1237"/>
         <source>About This Computer</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/appmenu/appmenumodel.cpp b/src/appmenu/appmenumodel.cpp
@@ -40,18 +40,19 @@
 #include <QDBusServiceWatcher>
 #include <QGuiApplication>
 #include <QTimer>
+#include <QMutex>
 #include <QWidgetAction>
 #include <QHBoxLayout>
 #include <QDebug>
 #include<QModelIndex>
 #include <dbusmenu-qt5/dbusmenuimporter.h>
 
+QMutex mutex;
 static const QByteArray s_x11AppMenuServiceNamePropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_SERVICE_NAME");
 static const QByteArray s_x11AppMenuObjectPathPropertyName = QByteArrayLiteral("_KDE_NET_WM_APPMENU_OBJECT_PATH");
 
 static QHash<QByteArray, xcb_atom_t> s_atoms;
 
-
 void HMenu::actionEvent(QActionEvent *e) {
     if(e->type() == QEvent::ActionAdded) {
         // probono: Remove mnemonics (underlined characters in menus represented by "&" in code)
@@ -380,6 +381,7 @@ void AppMenuModel::onActiveWindowChanged(WId id)
 
                 if(m_serviceName == serviceName &&
                         m_menuObjectPath == menuObjectPath) {
+                    m_pending_service[m_serviceName]=true;
                     updateApplicationMenu(m_serviceName, m_menuObjectPath);
                 }else {
                     m_initialApplicationFromWindowId = -1;
@@ -453,7 +455,10 @@ void AppMenuModel::onActiveWindowChanged(WId id)
             qDebug() << serviceName << menuObjectPath << __LINE__ << id;
             if (!serviceName.isEmpty() && !menuObjectPath.isEmpty()) {
                 m_initialApplicationFromWindowId = id;
+                mutex.lock();
+                m_pending_service[m_serviceName]=true;
                 updateApplicationMenu(serviceName, menuObjectPath);
+                mutex.unlock();
                 return true;
             }
 
@@ -756,7 +761,10 @@ void AppMenuModel::refreshSearch() {
 
 void AppMenuModel::updateApplicationMenu(const QString &serviceName, const QString &menuObjectPath)
 {
-
+    if(m_pending_service[serviceName] && m_serviceName == serviceName) {
+        qDebug() << "Skipping" << serviceName << menuObjectPath <<"switching too fast";
+        return;
+    }
     QMenuBar * menuBar = qobject_cast<QMenuBar*>(w_parent);/*m_importers[serviceName+menuObjectPath]->menu()->parent());*/
     int cnt = menuBar->actions().count();
     QList<QAction*> remove;
@@ -784,7 +792,7 @@ void AppMenuModel::updateApplicationMenu(const QString &serviceName, const QStri
 
     setMenuAvailable(!m_menu.isNull());
 
-    emit menuImported();
+    emit menuImported(serviceName);
 }
 
 void AppMenuModel::updateSearch() {

diff --git a/src/appmenu/appmenumodel.h b/src/appmenu/appmenumodel.h
@@ -162,6 +162,7 @@ class AppMenuModel : public QAbstractItemModel, public QAbstractNativeEventFilte
         MenuRole = Qt::UserRole + 1, // TODO this should be Qt::DisplayRole
         ActionRole
     };
+    QHash<QString,bool> m_pending_service;
 
     QAction *findParent(QAction * child,QAction *root) const ;
     /**
@@ -352,7 +353,7 @@ private Q_SLOTS:
 signals:
     void menuAvailableChanged();
     void modelNeedsUpdate();
-    void menuImported();
+    void menuImported(QString serviceName);
     void firstLevelParsed();
     void filterByActiveChanged();
     void filterChildrenChanged();

diff --git a/src/appmenuwidget.cpp b/src/appmenuwidget.cpp
@@ -571,7 +571,8 @@ AppMenuWidget::AppMenuWidget(QWidget *parent)
     m_appMenuModel = new AppMenuModel(m_menuBar);
 
     connect(m_appMenuModel,&AppMenuModel::menuAboutToBeImported,this,&AppMenuWidget::menuAboutToBeImported);
-    connect(m_appMenuModel,&AppMenuModel::menuImported,this,[this,traverse] {
+    connect(m_appMenuModel,&AppMenuModel::menuImported,this,[this,traverse](QString serviceName) {
+
 
 
 
@@ -582,6 +583,7 @@ AppMenuWidget::AppMenuWidget(QWidget *parent)
                 iterate(QModelIndex(),m_appMenuModel,traverse);
             });
         }
+        m_appMenuModel->m_pending_service[serviceName]=false;
     });
     connect(m_appMenuModel, &AppMenuModel::menuAvailableChanged, this, &AppMenuWidget::updateMenu);
 

diff --git a/src/translations/menubar_cs.ts b/src/translations/menubar_cs.ts
@@ -9,7 +9,7 @@
         <translation>Vyhledávání</translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1235"/>
+        <location filename="../appmenuwidget.cpp" line="1237"/>
         <source>About This Computer</source>
         <translation>O tomto počítači</translation>
     </message>
@@ -47,47 +47,47 @@
         <translation>Vypnutí</translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1000"/>
+        <location filename="../appmenuwidget.cpp" line="1002"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1001"/>
+        <location filename="../appmenuwidget.cpp" line="1003"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1008"/>
+        <location filename="../appmenuwidget.cpp" line="1010"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1016"/>
+        <location filename="../appmenuwidget.cpp" line="1018"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1017"/>
+        <location filename="../appmenuwidget.cpp" line="1019"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1047"/>
+        <location filename="../appmenuwidget.cpp" line="1049"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1052"/>
+        <location filename="../appmenuwidget.cpp" line="1054"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1057"/>
+        <location filename="../appmenuwidget.cpp" line="1059"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1204"/>
+        <location filename="../appmenuwidget.cpp" line="1206"/>
         <source>About helloDesktop</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/translations/menubar_da.ts b/src/translations/menubar_da.ts
@@ -11,7 +11,7 @@
 <context>
     <name>AppMenuWidget</name>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1235"/>
+        <location filename="../appmenuwidget.cpp" line="1237"/>
         <source>About This Computer</source>
         <translation>Om denne computer</translation>
     </message>
@@ -54,47 +54,47 @@
         <translation>Luk ned</translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1000"/>
+        <location filename="../appmenuwidget.cpp" line="1002"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1001"/>
+        <location filename="../appmenuwidget.cpp" line="1003"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1008"/>
+        <location filename="../appmenuwidget.cpp" line="1010"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1016"/>
+        <location filename="../appmenuwidget.cpp" line="1018"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1017"/>
+        <location filename="../appmenuwidget.cpp" line="1019"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1047"/>
+        <location filename="../appmenuwidget.cpp" line="1049"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1052"/>
+        <location filename="../appmenuwidget.cpp" line="1054"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1057"/>
+        <location filename="../appmenuwidget.cpp" line="1059"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1204"/>
+        <location filename="../appmenuwidget.cpp" line="1206"/>
         <source>About helloDesktop</source>
         <translation type="unfinished"></translation>
     </message>

diff --git a/src/translations/menubar_de.ts b/src/translations/menubar_de.ts
@@ -9,7 +9,7 @@
         <translation>Suchen</translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1235"/>
+        <location filename="../appmenuwidget.cpp" line="1237"/>
         <source>About This Computer</source>
         <translation>Über diesen Computer</translation>
     </message>
@@ -47,47 +47,47 @@
         <translation>Ausschalten</translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1000"/>
+        <location filename="../appmenuwidget.cpp" line="1002"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1001"/>
+        <location filename="../appmenuwidget.cpp" line="1003"/>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1008"/>
+        <location filename="../appmenuwidget.cpp" line="1010"/>
         <source>Quit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1016"/>
+        <location filename="../appmenuwidget.cpp" line="1018"/>
         <source>Edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1017"/>
+        <location filename="../appmenuwidget.cpp" line="1019"/>
         <source>Undo</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1047"/>
+        <location filename="../appmenuwidget.cpp" line="1049"/>
         <source>Cut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1052"/>
+        <location filename="../appmenuwidget.cpp" line="1054"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1057"/>
+        <location filename="../appmenuwidget.cpp" line="1059"/>
         <source>Paste</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../appmenuwidget.cpp" line="1204"/>
+        <location filename="../appmenuwidget.cpp" line="1206"/>
         <source>About helloDesktop</source>
         <translation type="unfinished"></translation>
     </message>
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,6 +9,8 @@ @@
     *.so.*
     *.dll
     *.dylib
+    *.orig
+    *.rej
     # Qt-es
     object_script.*.Release
@@ Expand Down @@