X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/1b3ea64abb0579e71ce1dfa490a0805b399be930..0daae5336714c2124171ca89415eb8bf6098519d:/src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index ed4c9f9d8..105330059 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -21,6 +21,8 @@
 
 #include "dolphinmainwindow.h"
 #include "dolphin_generalsettings.h"
+#include "dbusinterface.h"
+#include "global.h"
 
 #include <KDBusService>
 #include <KAboutData>
@@ -28,14 +30,21 @@
 #include <QCommandLineOption>
 #include <QApplication>
 #include <KLocalizedString>
-#include <KDebug>
+#include "dolphindebug.h"
+#include <kdelibs4configmigrator.h>
 
 extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 {
     QApplication app(argc, argv);
+    app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
+    Kdelibs4ConfigMigrator migrate(QStringLiteral("dolphin"));
+    migrate.setConfigFiles(QStringList() << QStringLiteral("dolphinrc"));
+    migrate.setUiFiles(QStringList() << QStringLiteral("dolphinpart.rc") << QStringLiteral("dolphinui.rc"));
+    migrate.migrate();
+
     app.setWindowIcon(QIcon::fromTheme("system-file-manager"));
 
-    KAboutData aboutData("dolphin", i18n("Dolphin"), "4.60",
+    KAboutData aboutData("dolphin", i18n("Dolphin"), "14.12.95",
                          i18nc("@title", "File Manager"),
                          KAboutLicense::GPL,
                          i18nc("@info:credit", "(C) 2006-2014 Peter Penz, Frank Reininghaus, and Emmanuel Pescosta"));
@@ -77,6 +86,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     KAboutData::setApplicationData(aboutData);
 
     KDBusService dolphinDBusService;
+    DBusInterface interface;
 
     QCommandLineParser parser;
     parser.addVersionOption();
@@ -87,23 +97,21 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     parser.addOption(QCommandLineOption(QStringList() << QLatin1String("select"), i18nc("@info:shell", "The files and directories passed as arguments "
                                                                                         "will be selected.")));
     parser.addOption(QCommandLineOption(QStringList() << QLatin1String("split"), i18nc("@info:shell", "Dolphin will get started with a split view.")));
+    parser.addOption(QCommandLineOption(QStringList() << QLatin1String("daemon"), i18nc("@info:shell", "Start Dolphin Daemon (only required for DBus Interface)")));
     parser.addPositionalArgument(QLatin1String("+[Url]"), i18nc("@info:shell", "Document to open"));
 
     parser.process(app);
     aboutData.processCommandLine(&parser);
 
+    if (parser.isSet("daemon")) {
+        return app.exec();
+    }
 
     DolphinMainWindow* m_mainWindow = new DolphinMainWindow();
     m_mainWindow->setAttribute(Qt::WA_DeleteOnClose);
 
-    QList<QUrl> urls;
     const QStringList args = parser.positionalArguments();
-    foreach (const QString& str,  args) {
-        const QUrl url(str);
-        if (url.isValid()) {
-            urls.append(url);
-        }
-    }
+    QList<QUrl> urls = Dolphin::validateUris(args);
 
     bool resetSplitSettings = false;
     if (parser.isSet("split") && !GeneralSettings::splitView()) {
@@ -144,7 +152,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         if (className == QLatin1String("DolphinMainWindow")) {
             m_mainWindow->restore(1);
         } else {
-            kWarning() << "Unknown class " << className << " in session saved data!";
+           qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!";
         }
     }