- Write the settings to the disk as soon as "Apply" or "OK" has been pressed inside...

[dolphin.git] / src / dolphinpart.cpp

diff --git a/src/dolphinpart.cpp b/src/dolphinpart.cpp
index c5d85a3cc5cd4c98f3ce03db50c231589396dfd3..c6076cc371c032015b4c79386c1f7e34a013edb4 100644 (file)
--- a/src/dolphinpart.cpp
+++ b/src/dolphinpart.cpp
@@ -18,11 +18,11 @@
 */
 
 #include "dolphinpart.h"
-#include <kdebug.h>
 #include "dolphinviewactionhandler.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphinview.h"
 #include "dolphinmodel.h"
+#include "dolphinnewmenuobserver.h"
 
 #include <konq_fileitemcapabilities.h>
 #include <konq_operations.h>
@@ -43,6 +43,8 @@
 #include <knewmenu.h>
 #include <kmenu.h>
 
+#include "settings/dolphinsettings.h"
+
 #include <QActionGroup>
 #include <QApplication>
 #include <QClipboard>
@@ -139,6 +141,8 @@ DolphinPart::DolphinPart(QWidget* parentWidget, QObject* parent, const QVariantL
 
 DolphinPart::~DolphinPart()
 {
+    DolphinSettings::instance().save();
+    DolphinNewMenuObserver::instance().detach(m_newMenu);
     delete m_dirLister;
 }
 
@@ -147,6 +151,7 @@ void DolphinPart::createActions()
     // Edit menu
 
     m_newMenu = new KNewMenu(actionCollection(), widget(), "new_menu");
+    DolphinNewMenuObserver::instance().attach(m_newMenu);
     connect(m_newMenu->menu(), SIGNAL(aboutToShow()),
             this, SLOT(updateNewMenu()));
 
@@ -508,7 +513,7 @@ void DolphinPart::slotOpenTerminal()
 
     //If the URL is local after the above conversion, set the directory.
     if (u.isLocalFile()) {
-        dir = u.path();
+        dir = u.toLocalFile();
     }
 
     KToolInvocation::invokeTerminal(QString(), dir);