The &-shortcut from another action is not set until the action has been shown at...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index 988019de1bf9d7e16b01b9519d82e28ef5f833ec..8b6139d925257bbe3ab9118acb4d4119baec7d7b 100644 (file)
--- a/src/dolphinapplication.cpp
+++ b/src/dolphinapplication.cpp
@@ -28,7 +28,7 @@
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :
 #include <QtDBus/QDBusConnection>
 
 DolphinApplication::DolphinApplication() :

-    m_lastId(0), m_closedBySessionManager(false)
+    m_lastId(0)

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


@@ -74,25 +74,22 @@ int DolphinApplication::newInstance()
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     static bool first = true;
 
     KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
     static bool first = true;
 

-    switch (args->count()) {
-    case 0:
-        if( !first || !isSessionRestored()) {
-            openWindow(KUrl());
+    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));

         }
         }

-        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) {
-            openWindow(args->url(i));
+        DolphinMainWindow* win = createMainWindow();
+        if (urls.count() > 0) {
+            if (args->isSet("select")) {
+                win->openFiles(urls);
+            } else {
+                win->openDirectories(urls);
+            }

         }
         }

+        win->show();

     }
 
     first = false;
     }
 
     first = false;


@@ -100,40 +97,15 @@ int DolphinApplication::newInstance()
     return 0;
 }
 
     return 0;
 }
 

-bool DolphinApplication::closedBySessionManager() const
-{
-    return m_closedBySessionManager;
-}
-
-void DolphinApplication::commitData(QSessionManager& sessionManager) {
-    m_closedBySessionManager = true;
-    KUniqueApplication::commitData(sessionManager);
-    m_closedBySessionManager = false;
-}
-
-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::openSplitWindow(const KUrl& leftUrl, const KUrl& rightUrl)
+int DolphinApplication::openWindow(const QString& urlString)

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

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

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

-

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