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

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 50ba137d2dd5c7e8c6edfed11a6f41e3ebf26d73..a1cce4fa90817e8c8e680cb57b562ea1dcc2471d 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  *
  *   Copyright (C) 2006 by Stefan Monov <logixoul@gmail.com>               *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -20,34 +20,59 @@
 
 #include "dolphinapplication.h"
 
 
 #include "dolphinapplication.h"
 

+#include "dolphinmainwindow.h"
+

 #include <kaboutdata.h>
 #include <kaboutdata.h>

-#include <kcmdlineargs.h>
-#include <klocale.h>
+#include <KCmdLineArgs>
+#include <KLocale>
+#include <kmainwindow.h>
+#include <KDebug>

 
 

-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)

 {
     KAboutData about("dolphin", 0,
 {
     KAboutData about("dolphin", 0,

-                     ki18n("Dolphin"),
-                     "0.9.0",
-                     ki18n("File Manager"),
+                     ki18nc("@title", "Dolphin"),
+                     "1.6.9",
+                     ki18nc("@title", "File Manager"),

                      KAboutData::License_GPL,
                      KAboutData::License_GPL,

-                     ki18n("(C) 2006 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
-    about.setBugAddress("peter.penz@gmx.at");
-    about.addAuthor(ki18n("Peter Penz"), ki18n("Maintainer and developer"), "peter.penz@gmx.at");
-    about.addAuthor(ki18n("Cvetoslav Ludmiloff"), ki18n("Developer"), "ludmiloff@gmail.com");
-    about.addAuthor(ki18n("Stefan Monov"), ki18n("Developer"), "logixoul@gmail.com");
-    about.addAuthor(ki18n("Michael Austin"), ki18n("Documentation"), "tuxedup@users.sourceforge.net");
-    about.addAuthor(ki18n("Orville Bennett"), ki18n("Documentation"), "obennett@hartford.edu");
-    about.addCredit(ki18n("Aaron J. Seigo"), ki18n("... for the great support and the amazing patches"));
-    about.addCredit(ki18n("Patrice Tremblay and Gregor Kalisnik"), ki18n("... for their patches"));
-    about.addCredit(ki18n("Ain, Itai, Ivan, Stephane, Patrice, Piotr and Stefano"),
-                    ki18n("... for their translations"));
+                     ki18nc("@info:credit", "(C) 2006-2011 Peter Penz"));
+    about.setHomepage("http://dolphin.kde.org");
+    about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
+                    ki18nc("@info:credit", "Maintainer and developer"),
+                    "peter.penz19@gmail.com");
+    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;
 
     KCmdLineArgs::init(argc, argv, &about);
 
     KCmdLineOptions options;

-    options.add("+[Url]", ki18n("Document to open"));
+
+    options.add("select", ki18nc("@info:shell", "The files and directories passed as arguments "
+                                                "will be selected."));
+    options.add("+[Url]", ki18nc("@info:shell", "Document to open"));

     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {
     KCmdLineArgs::addCmdLineOptions(options);
 
     if (!DolphinApplication::start()) {


@@ -55,17 +80,22 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
     }
 
     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)) {
         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;
         }
             ++n;
         }

-    } else {
-#endif
-        return app.exec();

     }
     }

+    app.exec(); // krazy:exclude=crashy
+
+    return 0;
+}