Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / dolphinapplication.cpp

diff --git a/src/dolphinapplication.cpp b/src/dolphinapplication.cpp
index b426ec1b821b946e1a3011e58da8ddceaa888575..ea18db1323b31ab2e8899eeb9c6fb7d2ac96bc97 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 "metadataloader.h"
+#include "dolphinviewcontainer.h"

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

+#include <kcmdlineargs.h>

 #include <kurl.h>
 #include <kurl.h>

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

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


@@ -56,33 +58,46 @@ DolphinMainWindow* DolphinApplication::createMainWindow()
     return mainWindow;
 }
 
     return mainWindow;
 }
 

-MetadataLoader* DolphinApplication::metadataLoader()
+void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)

 {
 {

-    static MetadataLoader loader;
-    return &loader;
+    m_mainWindows.removeAll(mainWindow);

 }
 
 }
 

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

 {
 {

-    DolphinMainWindow* win = createMainWindow();
-    if ((win->activeView() != 0) && !url.isEmpty()) {
-        win->activeView()->setUrl(KUrl(url));
+    for (int i = 0; i < m_mainWindows.count(); ++i) {
+        m_mainWindows[i]->refreshViews();

     }
     }

-    win->show();
-    //TODO find how to raise a window (as if we've launched a new dolphin process)
-    return win->getId();

 }
 
 }
 

-void DolphinApplication::removeMainWindow(DolphinMainWindow* mainWindow)
+
+int DolphinApplication::newInstance()

 {
 {

-    m_mainWindows.removeAll(mainWindow);
+    int exitValue = KUniqueApplication::newInstance();
+
+    KCmdLineArgs::setCwd(QDir::currentPath().toUtf8());
+    KCmdLineArgs* args = KCmdLineArgs::parsedArgs();
+    if (args->count() > 0) {
+        for (int i = 0; i < args->count(); ++i) {
+            openWindow(args->url(i));
+        }
+    } else {
+        openWindow(KUrl());
+    }
+
+    args->clear();
+
+    return exitValue;

 }
 
 }
 

-void DolphinApplication::refreshMainWindows()
+int DolphinApplication::openWindow(const KUrl& url)

 {
 {

-    for (int i = 0; i < m_mainWindows.count(); ++i) {
-        m_mainWindows[i]->refreshViews();
+    DolphinMainWindow* win = createMainWindow();
+    if ((win->activeViewContainer() != 0) && url.isValid()) {
+        win->activeViewContainer()->setUrl(url);

     }
     }

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

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