* Use Nepomuk for getting the meta data instead of KFileMetaInfo.

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 8c1464d53b60163ac8203bacb4ea1857eebbd238..d9dc0728ef2feb893cd22b97b9e89dee4702cd5d 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -20,11 +20,13 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"

+#include "dolphinviewcontainer.h"

 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>
 
 #include <applicationadaptor.h>
 #include <kcmdlineargs.h>
 #include <kurl.h>

-#include <QDBusConnection>
+#include <QtDBus/QDBusConnection>
+#include <QtCore/QDir>

 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)
 
 DolphinApplication::DolphinApplication() :
     m_lastId(0)


@@ -68,33 +70,61 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
     }
 }
 

-

 int DolphinApplication::newInstance()
 {
 int DolphinApplication::newInstance()
 {

-    int exitValue = KUniqueApplication::newInstance();
-
+    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());

     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();

-    if (args->count() > 0) {
+    static bool first = true;
+
+    switch (args->count()) {
+    case 0:
+        if( !first || !isSessionRestored()) {
+            openWindow(KUrl());
+        }
+        break;
+
+    case 1:
+        openWindow(args->url(0));
+        break;
+
+    case 2:
+        openSplitWindow(args->url(0),args->url(1));
+        break;
+
+    default:

         for (int i = 0; i < args->count(); ++i) {
         for (int i = 0; i < args->count(); ++i) {

-            openWindow(args->arg(i));
+            openWindow(args->url(i));

         }
         }

-    } else {
-        openWindow(QString());

     }
 
     }
 

+    first = false;

     args->clear();
     args->clear();

+    return 0;
+}

 
 

-    return exitValue;
+int DolphinApplication::openWindow(const KUrl& url)
+{
+    DolphinMainWindow* win = createMainWindow();
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);
+    }
+    win->show();
+    return win->getId();

 }
 
 }
 

-int DolphinApplication::openWindow(const QString& url)
+int DolphinApplication::openSplitWindow(const KUrl& leftUrl, const KUrl& rightUrl)

 {
     DolphinMainWindow* win = createMainWindow();
 {
     DolphinMainWindow* win = createMainWindow();

-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
+    if ((win->activeViewContainer() != 0) && leftUrl.isValid()) {
+        win->activeViewContainer()->setUrl(leftUrl);
+    }
+    win->toggleSplitView();
+    if ((win->activeViewContainer() != 0) && rightUrl.isValid()){
+      win->activeViewContainer()->setUrl(rightUrl);

     }
     win->show();
     return win->getId();
 }
 
     }
     win->show();
     return win->getId();
 }
 

+

 #include "dolphinapplication.moc"
 #include "dolphinapplication.moc"