Dolphin is now a KUniqueApplication. A lot of thanks go to Oscar Blumberg, who submit...

[dolphin.git] / src / dolphinmainwindow.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index dda1bdd47efafd13d252057f5d3141cf21db7277..a25c61038194f1bc6fba2660bc5da3ecdaba4340 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -36,6 +36,7 @@
 #include "generalsettings.h"\r
 #include "viewpropertiesdialog.h"\r
 #include "viewproperties.h"\r
 #include "generalsettings.h"\r
 #include "viewpropertiesdialog.h"\r
 #include "viewproperties.h"\r

+#include "mainwindowadaptor.h"\r

 \r
 #include <kaction.h>\r
 #include <kactioncollection.h>\r
 \r
 #include <kaction.h>\r
 #include <kactioncollection.h>\r


@@ -70,16 +71,20 @@
 #include <QSplitter>\r
 #include <QDockWidget>\r
 \r
 #include <QSplitter>\r
 #include <QDockWidget>\r
 \r

-DolphinMainWindow::DolphinMainWindow() :\r
+DolphinMainWindow::DolphinMainWindow(int id) :\r

     KMainWindow(0),\r
     m_newMenu(0),\r
     m_splitter(0),\r
     KMainWindow(0),\r
     m_newMenu(0),\r
     m_splitter(0),\r

-    m_activeView(0)\r
+    m_activeView(0),\r
+    m_id(id)\r

 {\r
     setObjectName("Dolphin");\r
     m_view[PrimaryIdx] = 0;\r
     m_view[SecondaryIdx] = 0;\r
 \r
 {\r
     setObjectName("Dolphin");\r
     m_view[PrimaryIdx] = 0;\r
     m_view[SecondaryIdx] = 0;\r
 \r

+    new MainWindowAdaptor(this);\r
+    QDBusConnection::sessionBus().registerObject(QString("/dolphin/MainWindow%1").arg(m_id), this);\r
+\r

     KonqUndoManager::incRef();\r
 \r
     KonqUndoManager* undoManager = KonqUndoManager::self();\r
     KonqUndoManager::incRef();\r
 \r
     KonqUndoManager* undoManager = KonqUndoManager::self();\r


@@ -231,6 +236,13 @@ void DolphinMainWindow::refreshViews()
     emit activeViewChanged();\r
 }\r
 \r
     emit activeViewChanged();\r
 }\r
 \r

+void DolphinMainWindow::changeUrl(const QString& url)\r
+{\r
+    if (activeView() != 0) {\r
+        activeView()->setUrl(KUrl(url));\r
+    }\r
+}\r
+\r

 void DolphinMainWindow::slotViewModeChanged()\r
 {\r
     updateViewActions();\r
 void DolphinMainWindow::slotViewModeChanged()\r
 {\r
     updateViewActions();\r


@@ -883,6 +895,9 @@ void DolphinMainWindow::init()
     // a proper default window size is given at the end of DolphinMainWindow::init().\r
     GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();\r
     const bool firstRun = generalSettings->firstRun();\r
     // a proper default window size is given at the end of DolphinMainWindow::init().\r
     GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();\r
     const bool firstRun = generalSettings->firstRun();\r

+    if (firstRun) {\r
+        generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());\r
+    }\r

 \r
     setAcceptDrops(true);\r
 \r
 \r
     setAcceptDrops(true);\r
 \r