Make UrlNavigators in the toolbar the only option

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9191127e527e8f20e8862b62b305b473952c62d7..a4b1b1963fc61683ccaf31bf214b25b926648443 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -12,11 +12,16 @@
 #include "dolphindebug.h"
 #include "dolphinmainwindow.h"
 #include "global.h"
+#include "config-kuserfeedback.h"
+#ifdef HAVE_KUSERFEEDBACK
+#include "userfeedback/dolphinfeedbackprovider.h"
+#endif
 
 #include <KAboutData>
 #include <KCrash>
 #include <KDBusService>
 #include <KLocalizedString>
+#include <KToolBar>
 #include <Kdelibs4ConfigMigrator>
 #include <KConfigGui>
 
@@ -26,6 +31,7 @@
 #include <QDBusInterface>
 #include <QDBusAbstractInterface>
 #include <QDBusConnectionInterface>
+#include <QSessionManager>
 
 #ifndef Q_OS_WIN
 #include <unistd.h>
@@ -132,6 +138,14 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
 
 
     if (parser.isSet(QStringLiteral("daemon"))) {
+        // Disable session management for the daemonized version
+        // See https://bugs.kde.org/show_bug.cgi?id=417219
+        auto disableSessionManagement = [](QSessionManager &sm) {
+            sm.setRestartHint(QSessionManager::RestartNever);
+        };
+        QObject::connect(&app, &QGuiApplication::commitDataRequest, disableSessionManagement);
+        QObject::connect(&app, &QGuiApplication::saveStateRequest, disableSessionManagement);
+
         KDBusService dolphinDBusService;
         DBusInterface interface;
         interface.setAsDaemon();
@@ -200,6 +214,17 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv)
             }
         }
     }
+    Qt::ToolBarArea area = mainWindow->toolBarArea(mainWindow->toolBar());
+    if (area != Qt::TopToolBarArea && area != Qt::BottomToolBarArea) {
+        // Migrate users with disabled tool bar positions.
+        // Remove this a few years from now (2020).
+        mainWindow->addToolBar(Qt::TopToolBarArea, mainWindow->toolBar());
+    }
+
+#ifdef HAVE_KUSERFEEDBACK
+    auto feedbackProvider = DolphinFeedbackProvider::instance();
+    Q_UNUSED(feedbackProvider)
+#endif
 
     return app.exec(); // krazy:exclude=crash;
 }