Merge remote-tracking branch 'origin/KDE/4.10'

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 2cc9ff5d927d0d2989a1c321cc1f1995e444216f..e5ac4351c902e574534c2947eee3b5fad65356ae 100644 (file)
--- a/src/main.cpp
+++ b/src/main.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 Stefan Monov <logixoul@gmail.com>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -22,7 +22,7 @@
 
 #include "dolphinmainwindow.h"
 
-#include <kaboutdata.h>
+#include <KAboutData>
 #include <KCmdLineArgs>
 #include <KLocale>
 #include <kmainwindow.h>
@@ -33,17 +33,26 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.6.9",
+                     "2.2.60",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006-2011 Peter Penz"));
+                     ki18nc("@info:credit", "(C) 2006-2013 Peter Penz and Frank Reininghaus"));
     about.setHomepage("http://dolphin.kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Frank Reininghaus"),
+                    ki18nc("@info:credit", "Maintainer (since 2012) and developer"),
+                    "frank78ac@googlemail.com");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
-                    ki18nc("@info:credit", "Maintainer and developer"),
+                    ki18nc("@info:credit", "Maintainer and developer (2006-2012)"),
                     "peter.penz19@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Sebastian Trüg"),
+                    ki18nc("@info:credit", "Developer"),
+                    "trueg@kde.org"),
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
                     "faure@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Emmanuel Pescosta"),
+                    ki18nc("@info:credit", "Developer"),
+                    "emmanuelpescosta099@gmail.com");
     about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
                     ki18nc("@info:credit", "Developer"),
                     "aseigo@kde.org");
@@ -72,30 +81,17 @@ KDE_EXPORT int kdemain(int argc, char **argv)
 
     options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
                                                 "will be selected."));
+    options.add("split", ki18nc("@info:shell", "Dolphin will get started with a split view."));
     options.add("+[Url]", ki18nc("@info:shell", "Document to open"));
     KCmdLineArgs::addCmdLineOptions(options);
 
-    if (!DolphinApplication::start()) {
-        return 0;
-    }
-
-    DolphinApplication app;
-    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
-
-    if (app.isSessionRestored()) {
-        int n = 1;
-        while (KMainWindow::canBeRestored(n)) {
-            const QString className = KXmlGuiWindow::classNameOfToplevel(n);
-            if (className == QLatin1String("DolphinMainWindow")) {
-                DolphinMainWindow* win = app.createMainWindow();
-                win->restore(n);
-            } else {
-                kWarning() << "Unknown class " << className << " in session saved data!";
-            }
-            ++n;
+    {
+        DolphinApplication app;
+        if (app.isSessionRestored()) {
+            app.restoreSession();
         }
+        app.exec(); // krazy:exclude=crashy
     }
-    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }