X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/0368591365d3a4ddd7c7cd189087eeed96acd1fa..abf17941f7a052d25788d2f2f3c84e5aae935e29:/src/dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index dda1bdd47..a25c61038 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -36,6 +36,7 @@
 #include "generalsettings.h"
 #include "viewpropertiesdialog.h"
 #include "viewproperties.h"
+#include "mainwindowadaptor.h"
 
 #include <kaction.h>
 #include <kactioncollection.h>
@@ -70,16 +71,20 @@
 #include <QSplitter>
 #include <QDockWidget>
 
-DolphinMainWindow::DolphinMainWindow() :
+DolphinMainWindow::DolphinMainWindow(int id) :
     KMainWindow(0),
     m_newMenu(0),
     m_splitter(0),
-    m_activeView(0)
+    m_activeView(0),
+    m_id(id)
 {
     setObjectName("Dolphin");
     m_view[PrimaryIdx] = 0;
     m_view[SecondaryIdx] = 0;
 
+    new MainWindowAdaptor(this);
+    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);
+
     KonqUndoManager::incRef();
 
     KonqUndoManager* undoManager = KonqUndoManager::self();
@@ -231,6 +236,13 @@ void DolphinMainWindow::refreshViews()
     emit activeViewChanged();
 }
 
+void DolphinMainWindow::changeUrl(const QString& url)
+{
+    if (activeView() != 0) {
+        activeView()->setUrl(KUrl(url));
+    }
+}
+
 void DolphinMainWindow::slotViewModeChanged()
 {
     updateViewActions();
@@ -883,6 +895,9 @@ void DolphinMainWindow::init()
     // a proper default window size is given at the end of DolphinMainWindow::init().
     GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
     const bool firstRun = generalSettings->firstRun();
+    if (firstRun) {
+        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
+    }
 
     setAcceptDrops(true);