Merge remote-tracking branch 'origin/master' into kf6

[dolphin.git] / src / settings / dolphinsettingsdialog.cpp

diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp
index 0d2c76e3c8b841d142bba10a5bea70aa9cd14083..8c41794e93b593d9b11a9ffeda3b6208c44c7dd3 100644 (file)
--- a/src/settings/dolphinsettingsdialog.cpp
+++ b/src/settings/dolphinsettingsdialog.cpp
@@ -68,6 +68,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl &url, QWidget *parent, K
                                                                 QStringLiteral("view_mode"),
                                                                 QStringLiteral("open_in_new_tab"),
                                                                 QStringLiteral("open_in_new_window"),
                                                                 QStringLiteral("view_mode"),
                                                                 QStringLiteral("open_in_new_tab"),
                                                                 QStringLiteral("open_in_new_window"),

+                                                                QStringLiteral("open_in_split_view"),

                                                                 QStringLiteral("copy_location"),
                                                                 QStringLiteral("duplicate"),
                                                                 QStringLiteral("open_terminal_here"),
                                                                 QStringLiteral("copy_location"),
                                                                 QStringLiteral("duplicate"),
                                                                 QStringLiteral("open_terminal_here"),


@@ -160,29 +161,17 @@ void DolphinSettingsDialog::closeEvent(QCloseEvent *event)
         return;
     }
 
         return;
     }
 

-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)

     const auto response = KMessageBox::warningTwoActionsCancel(this,
     const auto response = KMessageBox::warningTwoActionsCancel(this,

-#else
-    const auto response = KMessageBox::warningYesNoCancel(this,
-#endif

                                                                i18n("You have unsaved changes. Do you want to apply the changes or discard them?"),
                                                                i18n("Warning"),
                                                                KStandardGuiItem::save(),
                                                                KStandardGuiItem::discard(),
                                                                KStandardGuiItem::cancel());
     switch (response) {
                                                                i18n("You have unsaved changes. Do you want to apply the changes or discard them?"),
                                                                i18n("Warning"),
                                                                KStandardGuiItem::save(),
                                                                KStandardGuiItem::discard(),
                                                                KStandardGuiItem::cancel());
     switch (response) {

-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)

     case KMessageBox::PrimaryAction:
     case KMessageBox::PrimaryAction:

-#else
-    case KMessageBox::Yes:
-#endif

         applySettings();
         Q_FALLTHROUGH();
         applySettings();
         Q_FALLTHROUGH();

-#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)

     case KMessageBox::SecondaryAction:
     case KMessageBox::SecondaryAction:

-#else
-    case KMessageBox::No:
-#endif

         event->accept();
         break;
     case KMessageBox::Cancel:
         event->accept();
         break;
     case KMessageBox::Cancel: