Add Reset Zoom Level action inside View menu

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 10adfc638b05cd4d91ba1816d587bbccb0c4108f..a4685f2573a9e86f9d8c8633675234967e3e7714 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -116,9 +116,6 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
     KAboutData::setApplicationData(aboutData);
 
 
     KAboutData::setApplicationData(aboutData);
 

-    KDBusService dolphinDBusService;
-    DBusInterface interface;
-

     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
 
     QCommandLineParser parser;
     aboutData.setupCommandLine(&parser);
 


@@ -139,14 +136,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
     QList<QUrl> urls = Dolphin::validateUris(args);
 
     if (parser.isSet(QStringLiteral("daemon"))) {
     QList<QUrl> urls = Dolphin::validateUris(args);
 
     if (parser.isSet(QStringLiteral("daemon"))) {

+        KDBusService dolphinDBusService;
+        DBusInterface interface;

         return app.exec();
     }
 
         return app.exec();
     }
 

-    if (splitView && urls.size() < 2) {
-        // Split view does only make sense if we have at least 2 URLs
-        urls.append(urls.last());
-    }
-

     if (!parser.isSet(QStringLiteral("new-window"))) {
         if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
             // Successfully attached to existing instance of Dolphin
     if (!parser.isSet(QStringLiteral("new-window"))) {
         if (Dolphin::attachToExistingInstance(urls, openFiles, splitView)) {
             // Successfully attached to existing instance of Dolphin


@@ -159,6 +153,11 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         urls.append(Dolphin::homeUrl());
     }
     
         urls.append(Dolphin::homeUrl());
     }
     

+    if (splitView && urls.size() < 2) {
+        // Split view does only make sense if we have at least 2 URLs
+        urls.append(urls.last());
+    }
+    

     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 
     if (openFiles) {
     DolphinMainWindow* mainWindow = new DolphinMainWindow();
 
     if (openFiles) {


@@ -178,5 +177,8 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
         }
     }
 
         }
     }
 

+    KDBusService dolphinDBusService;
+    DBusInterface interface;
+

     return app.exec(); // krazy:exclude=crash;
 }
     return app.exec(); // krazy:exclude=crash;
 }