assure that the Dolphin KPart inside Konqueror gets updated when the settings are...

svn path=/trunk/KDE/kdebase/apps/; revision=792496

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index 0ea761d2d1ede3e5758f1c90c0330d89dbcc6de6..e155573cccb0e6b00118da85026771574f0bbabf 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -367,6 +367,11 @@ void DolphinPartBrowserExtension::paste()
     m_part->view()->paste();
 }
 
     m_part->view()->paste();
 }
 

+void DolphinPartBrowserExtension::reparseConfiguration()
+{
+    m_part->view()->refresh();
+}
+

 ////
 
 void DolphinPart::slotEditMimeType()
 ////
 
 void DolphinPart::slotEditMimeType()

diff --git a/src/dolphinpart.h b/src/dolphinpart.h
index 75d7ee951cfbe71d33447d3c7baa4ac8d743f977..b252c78e173481095ca9ba67c2db1346bdc71504 100644 (file)
--- a/src/dolphinpart.h
+++ b/src/dolphinpart.h
@@ -171,6 +171,7 @@ public Q_SLOTS:
     void cut();
     void copy();
     void paste();
     void cut();
     void copy();
     void paste();

+    void reparseConfiguration();

 
 private:
     DolphinPart* m_part;
 
 private:
     DolphinPart* m_part;

diff --git a/src/kcmdolphin.cpp b/src/kcmdolphin.cpp
index 0902cdb87eec319407e5856ab801f382d4ac9acb..676bc19d3cdaee66055e79a9bec6ea7f793d6387 100644 (file)
--- a/src/kcmdolphin.cpp
+++ b/src/kcmdolphin.cpp
@@ -29,6 +29,8 @@
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 
 #include <kpluginfactory.h>
 #include <kpluginloader.h>
 

+#include <QDBusConnection>
+#include <QDBusMessage>

 #include <QDir>
 #include <QPushButton>
 #include <QVBoxLayout>
 #include <QDir>
 #include <QPushButton>
 #include <QVBoxLayout>


@@ -87,6 +89,7 @@ void DolphinConfigModule::save()
     foreach (ViewSettingsPageBase* page, m_pages) {
         page->applySettings();
     }
     foreach (ViewSettingsPageBase* page, m_pages) {
         page->applySettings();
     }

+    reparseConfiguration();

 }
 
 void DolphinConfigModule::defaults()
 }
 
 void DolphinConfigModule::defaults()


@@ -94,6 +97,13 @@ void DolphinConfigModule::defaults()
     foreach (ViewSettingsPageBase* page, m_pages) {
         page->restoreDefaults();
     }
     foreach (ViewSettingsPageBase* page, m_pages) {
         page->restoreDefaults();
     }

+    reparseConfiguration();
+}
+
+void DolphinConfigModule::reparseConfiguration()
+{
+    QDBusMessage message = QDBusMessage::createSignal("/KonqMain", "org.kde.Konqueror.Main", "reparseConfiguration");
+    QDBusConnection::sessionBus().send(message);

 }
 
 #include "kcmdolphin.moc"
 }
 
 #include "kcmdolphin.moc"

diff --git a/src/kcmdolphin.h b/src/kcmdolphin.h
index 78f9277db815c0b60c508e5ce6bd58aa47fc037d..00d6ea30c7e5b3c6d9e6d20b7ea4f6586ade6fa2 100644 (file)
--- a/src/kcmdolphin.h
+++ b/src/kcmdolphin.h
@@ -38,6 +38,9 @@ public:
     virtual void save();
     virtual void defaults();
 
     virtual void save();
     virtual void defaults();
 

+private:
+    void reparseConfiguration();
+

 private:
     QList<ViewSettingsPageBase*> m_pages;
 };
 private:
     QList<ViewSettingsPageBase*> m_pages;
 };