Remove all code that is related to DolphinController's

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 98a6a87f1fd437be497437b4efc59b129831c4e7..3418c333f8790f78960a23b6294a8ed0323e8938 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -20,38 +20,62 @@
 
 #include "dolphinapplication.h"
 
+#include "dolphinmainwindow.h"
+
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
-
-static KCmdLineOptions options[] =
-    {
-        { "+[Url]", I18N_NOOP("Document to open"), 0
-        },
-        KCmdLineLastOption
-    };
+#include <kmainwindow.h>
+#include <kdebug.h>
 
 int main(int argc, char **argv)
 {
-    KAboutData about("dolphin",
-                     I18N_NOOP("Dolphin"),
-                     "0.9.0",
-                     I18N_NOOP("File Manager"),
+    KAboutData about("dolphin", 0,
+                     ki18nc("@title", "Dolphin"),
+                     "1.4",
+                     ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     "(C) 2006 Peter Penz");
-    about.setHomepage("http://enzosworld.gmxhome.de");
-    about.setBugAddress("peter.penz@gmx.at");
-    about.addAuthor("Peter Penz", I18N_NOOP("Maintainer and developer"), "peter.penz@gmx.at");
-    about.addAuthor("Cvetoslav Ludmiloff", I18N_NOOP("Developer"), "ludmiloff@gmail.com");
-    about.addAuthor("Stefan Monov", I18N_NOOP("Developer"), "logixoul@gmail.com");
-    about.addAuthor("Michael Austin", I18N_NOOP("Documentation"), "tuxedup@users.sourceforge.net");
-    about.addAuthor("Orville Bennett", I18N_NOOP("Documentation"), "obennett@hartford.edu");
-    about.addCredit("Aaron J. Seigo", I18N_NOOP("... for the great support and the amazing patches"));
-    about.addCredit("Patrice Tremblay and Gregor Kalisnik", I18N_NOOP("... for their patches"));
-    about.addCredit("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano",
-                    I18N_NOOP("... for their translations"));
+                     ki18nc("@info:credit", "(C) 2006-2009 Peter Penz"));
+    about.setHomepage("http://dolphin.kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
+                    ki18nc("@info:credit", "Maintainer and developer"),
+                    "peter.penz@gmx.at");
+    about.addAuthor(ki18nc("@info:credit", "David Faure"),
+                    ki18nc("@info:credit", "Developer"),
+                    "faure@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Aaron J. Seigo"),
+                    ki18nc("@info:credit", "Developer"),
+                    "aseigo@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Rafael Fernández López"),
+                    ki18nc("@info:credit", "Developer"),
+                    "ereslibre@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Kevin Ottens"),
+                    ki18nc("@info:credit", "Developer"),
+                    "ervin@kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Holger Freyther"),
+                    ki18nc("@info:credit", "Developer"),
+                    "freyther@gmx.net");
+    about.addAuthor(ki18nc("@info:credit", "Max Blazejak"),
+                    ki18nc("@info:credit", "Developer"),
+                    "m43ksrocks@gmail.com");
+    about.addAuthor(ki18nc("@info:credit", "Michael Austin"),
+                    ki18nc("@info:credit", "Documentation"),
+                    "tuxedup@users.sourceforge.net");
+    // the .desktop file is not taken into account when launching manually, so
+    // set the icon precautionally:
+    about.setProgramIconName("system-file-manager");
 
     KCmdLineArgs::init(argc, argv, &about);
+
+    KCmdLineOptions options;
+
+    // TODO KDE SC 4.5: The string freeze is valid and no new localized strings are allowed.
+    // To get in the --select option that was available in Konqueror 3, an already existing
+    // string ("Document to open") is used as workaround (the --select option will most probably
+    // anyhow used by applications and not by users).
+    const KLocalizedString& documentToOpen = ki18nc("@info:shell", "Document to open");
+    options.add("select", documentToOpen);
+    options.add("+[Url]", documentToOpen);
     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {
@@ -59,17 +83,22 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
-#ifdef __GNUC__
-#warning TODO, SessionManagement
-#endif
-#if 0
-    if (false /* KDE4-TODO: app.isSessionRestored() */) {
+    KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
+
+    if (app.isSessionRestored()) {
         int n = 1;
         while (KMainWindow::canBeRestored(n)) {
-            Dolphin::mainWin().restore(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;
         }
-    } else {
-#endif
-        return app.exec();
     }
+    app.exec(); // krazy:exclude=crashy
+
+    return 0;
+}