GIT_SILENT Sync po/docbooks with svn

[dolphin.git] / src / main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index e93ee43bc96535148e25bbee9ff0047c6f48d041..6df53b62ebe3c2405b8a10460f1dd945a5ff8e82 100644 (file)
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -22,6 +22,7 @@
 #include <KCrash>
 #include <KDBusService>
 #include <KIO/PreviewJob>
 #include <KCrash>
 #include <KDBusService>
 #include <KIO/PreviewJob>

+#include <KIconTheme>

 #include <KLocalizedString>
 #include <KWindowSystem>
 
 #include <KLocalizedString>
 #include <KWindowSystem>
 


@@ -29,6 +30,11 @@
 #include <Kdelibs4ConfigMigrator>
 #endif
 
 #include <Kdelibs4ConfigMigrator>
 #endif
 

+#define HAVE_STYLE_MANAGER __has_include(<KStyleManager>)
+#if HAVE_STYLE_MANAGER
+#include <KStyleManager>
+#endif
+

 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>
 #include <QApplication>
 #include <QCommandLineParser>
 #include <QDBusConnection>


@@ -69,6 +75,13 @@ int main(int argc, char **argv)
     }
 #endif
 
     }
 #endif
 

+    /**
+     * trigger initialisation of proper icon theme
+     */
+#if KICONTHEMES_VERSION >= QT_VERSION_CHECK(6, 3, 0)
+    KIconTheme::initTheme();
+#endif
+

     /**
      * enable high dpi support
      */
     /**
      * enable high dpi support
      */


@@ -79,6 +92,21 @@ int main(int argc, char **argv)
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 
     QApplication app(argc, argv);
     app.setWindowIcon(QIcon::fromTheme(QStringLiteral("system-file-manager"), app.windowIcon()));
 

+#if HAVE_STYLE_MANAGER
+    /**
+     * trigger initialisation of proper application style
+     */
+    KStyleManager::initStyle();
+#else
+    /**
+     * For Windows and macOS: use Breeze if available
+     * Of all tested styles that works the best for us
+     */
+#if defined(Q_OS_MACOS) || defined(Q_OS_WIN)
+    QApplication::setStyle(QStringLiteral("breeze"));
+#endif
+#endif
+

     KCrash::initialize();
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     KCrash::initialize();
 
 #if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)