Update e-mail address from peter.penz@gmx.at to peter.penz19@gmail.com

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index ad345dbebdcba7f90f042da943054692e90b11e8..d37fa78defeca6759e4ad1b6eca8290b0161b505 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz19@gmail.com>             *

  *   Copyright (C) 2006 by Holger 'zecke' Freyther <freyther@kde.org>      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   Copyright (C) 2006 by Holger 'zecke' Freyther <freyther@kde.org>      *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,14 +20,15 @@
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"
 
 #include "dolphinapplication.h"
 #include "dolphinmainwindow.h"

+#include "dolphinviewcontainer.h"

 
 #include <applicationadaptor.h>
 
 #include <applicationadaptor.h>

-#include <kcmdlineargs.h>
-#include <kurl.h>
-#include <QDBusConnection>
+#include <KCmdLineArgs>
+#include <KUrl>
+#include <QtDBus/QDBusConnection>

 
 DolphinApplication::DolphinApplication() :
 
 DolphinApplication::DolphinApplication() :

-        m_lastId(0)
+    m_lastId(0)

 {
     new ApplicationAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);
 {
     new ApplicationAdaptor(this);
     QDBusConnection::sessionBus().registerObject("/dolphin/Application", this);


@@ -68,30 +69,40 @@ void DolphinApplication::refreshMainWindows()
     }
 }
 
     }
 }
 

-

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

-    int exitValue = KUniqueApplication::newInstance();
-

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

-    if (args->count() > 0) {
-        for (int i = 0; i < args->count(); ++i) {
-            openWindow(args->arg(i));
+    static bool first = true;
+
+    const int argsCount = args->count();
+    if ((argsCount > 0) || !first || !isSessionRestored()) {
+        QList<KUrl> urls;
+        for (int i = 0; i < argsCount; ++i) {
+            urls.append(args->url(i));

         }
         }

-    } else {
-        openWindow(QString());
+
+        DolphinMainWindow* win = createMainWindow();
+        if (urls.count() > 0) {
+            if (args->isSet("select")) {
+                win->openFiles(urls);
+            } else {
+                win->openDirectories(urls);
+            }
+        }
+        win->show();

     }
 
     }
 

+    first = false;

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

-
-    return exitValue;
+    return 0;

 }
 
 }
 

-int DolphinApplication::openWindow(const QString& url)
+int DolphinApplication::openWindow(const QString& urlString)

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

-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
+    const KUrl url(urlString);
+    if (!url.isEmpty()) {
+        win->openDirectories(QList<KUrl>() << url);

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