[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/konqueror
From:       Laurent Montel <montel () kde ! org>
Date:       2007-01-02 22:15:45
Message-ID: 1167776145.693901.14123.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 619175 by mlaurent:

Fix send signal to refresh all profile list


 M  +4 -0      KonquerorAdaptor.h  
 M  +13 -0     konq_application.cpp  
 M  +1 -1      konq_application.h  
 M  +7 -4      konq_viewmgr.cc  


--- trunk/KDE/kdebase/konqueror/KonquerorAdaptor.h #619174:619175
@@ -156,6 +156,10 @@
    * Emitted by kcontrol when the global configuration changes
    */
   void reparseConfiguration();
+  /**
+   * Emitted by konqueror when we must update list of profiles
+   */
+  void updateAllProfileList();
 };
 
 #endif
--- trunk/KDE/kdebase/konqueror/konq_application.cpp #619174:619175
@@ -21,6 +21,7 @@
 #include <QtDBus/QtDBus>
 #include "konq_mainwindow.h"
 #include "KonquerorAdaptor.h"
+#include "konq_viewmgr.h"
 
 KonquerorApplication::KonquerorApplication()
     : KApplication(),
@@ -30,6 +31,7 @@
     const QString dbusInterface = "org.kde.Konqueror.Main";
     QDBusConnection dbus = QDBusConnection::sessionBus();
     dbus.connect(QString(), KONQ_MAIN_PATH, dbusInterface, "reparseConfiguration", \
this, SLOT(slotReparseConfiguration())); +    dbus.connect(QString(), KONQ_MAIN_PATH, \
dbusInterface, "updateAllProfileList", this, SLOT(slotUpdateProfileList()));  }
 
 void KonquerorApplication::slotReparseConfiguration()
@@ -45,4 +47,15 @@
     }
 }
 
+void KonquerorApplication::slotUpdateProfileList()
+{
+    QList<KonqMainWindow*> *mainWindows = KonqMainWindow::mainWindowList();
+    if ( !mainWindows )
+        return;
+
+    foreach ( KonqMainWindow* window, *mainWindows )
+        window->viewManager()->profileListDirty( false );
+}
+
+
 #include "konq_application.moc"
--- trunk/KDE/kdebase/konqueror/konq_application.h #619174:619175
@@ -39,7 +39,7 @@
 
 public slots:
   void slotReparseConfiguration();
-
+  void slotUpdateProfileList();
 private:
   bool closed_by_sm;
 
--- trunk/KDE/kdebase/konqueror/konq_viewmgr.cc #619174:619175
@@ -27,6 +27,8 @@
 #include "konq_settingsxt.h"
 
 #include <QFileInfo>
+#include <QDBusMessage>
+#include <QDBusConnection>
 
 #include <kaccelgen.h>
 #include <kactionmenu.h>
@@ -1698,10 +1700,11 @@
     return;
   }
 
-#ifdef __GNUC__
-#warning port to DBUS signal updateProfileList
-#endif
-//  kapp->dcopClient()->send( "konqueror*", "KonquerorIface", "updateProfileList()", \
QByteArray() ); +    // Send signal to all konqueror instances
+    QDBusMessage message =
+        QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", \
"updateAllProfileList"); +    QDBusConnection::sessionBus().send(message);
+
 }
 
 void KonqViewManager::slotProfileActivated( int id )


[prev in list] [next in list] [prev in thread] [next in thread]