Modified (some) 'About' windows to carry legally enforceable Copyright messages....

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index a7857272afb7b19f8f0678183a7a472491e86a0e..7d01b79f55b407f20b11ad9c95027a52bc84f257 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -24,22 +24,22 @@
 
 #include <kaboutdata.h>
 #include <kcmdlineargs.h>
-#include <kicon.h>
 #include <klocale.h>
 #include <kmainwindow.h>
 #include <kdebug.h>
 
-int main(int argc, char **argv)
+extern "C"
+KDE_EXPORT int kdemain(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.0.1",
+                     "1.5",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006, 2007 Peter Penz"));
-    about.setHomepage("http://enzosworld.gmxhome.de");
+                     ki18nc("@info:credit", "Copyright © 2006–2011 Dolphin authors"));
+    about.setHomepage("http://dolphin.kde.org");
     about.addAuthor(ki18nc("@info:credit", "Peter Penz"),
-                    ki18nc("@info:credit", "Maintainer and developer"),
+                    ki18nc("@info:credit", "Maintainer and lead developer"),
                     "peter.penz@gmx.at");
     about.addAuthor(ki18nc("@info:credit", "David Faure"),
                     ki18nc("@info:credit", "Developer"),
@@ -62,10 +62,16 @@ int main(int argc, char **argv)
     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;
+
+    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);
 
@@ -74,9 +80,6 @@ int main(int argc, char **argv)
     }
 
     DolphinApplication app;
-    // the .desktop file is not taken into account when launching manually, so
-    // set the icon precautionally:
-    QApplication::setWindowIcon(KIcon("system-file-manager"));
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {
@@ -91,9 +94,8 @@ int main(int argc, char **argv)
             }
             ++n;
         }
-    } else {
-        app.exec();
     }
+    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }