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 0df406f926be666d797613dda5c019aab6bcc523..3418c333f8790f78960a23b6294a8ed0323e8938 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -32,10 +32,10 @@ int main(int argc, char **argv)
 {
     KAboutData about("dolphin", 0,
                      ki18nc("@title", "Dolphin"),
-                     "1.1.80",
+                     "1.4",
                      ki18nc("@title", "File Manager"),
                      KAboutData::License_GPL,
-                     ki18nc("@info:credit", "(C) 2006-2008 Peter Penz"));
+                     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"),
@@ -61,12 +61,21 @@ 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("+[Url]", ki18nc("@info:shell", "Document to open"));
+
+    // 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()) {
@@ -74,8 +83,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:
     KGlobal::locale()->insertCatalog("libkonq"); // needed for applications using libkonq
 
     if (app.isSessionRestored()) {
@@ -91,7 +98,7 @@ int main(int argc, char **argv)
             ++n;
         }
     }
-    app.exec();
+    app.exec(); // krazy:exclude=crashy
 
     return 0;
 }