diff options
| author | Méven Car <[email protected]> | 2023-09-10 15:24:39 +0200 |
|---|---|---|
| committer | Méven Car <[email protected]> | 2023-09-10 15:24:39 +0200 |
| commit | 4cbeb81b2b8e2d37c93cda4d88787e08e0658291 (patch) | |
| tree | 013a28405e8011fd5a5a5c514aaf3daa395a42b1 /src/settings/dolphinsettingsdialog.cpp | |
| parent | 0ed26df6a9074b71ae247017e1080b2285b73438 (diff) | |
| parent | 5c33e0211ff09f37adb5b48c59cf15b67c0059dc (diff) | |
Merge remote-tracking branch 'origin/master' into kf6
Diffstat (limited to 'src/settings/dolphinsettingsdialog.cpp')
| -rw-r--r-- | src/settings/dolphinsettingsdialog.cpp | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 0d2c76e3c..8c41794e9 100644 --- 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("open_in_split_view"), QStringLiteral("copy_location"), QStringLiteral("duplicate"), QStringLiteral("open_terminal_here"), @@ -160,29 +161,17 @@ void DolphinSettingsDialog::closeEvent(QCloseEvent *event) return; } -#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) 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) { -#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) case KMessageBox::PrimaryAction: -#else - case KMessageBox::Yes: -#endif applySettings(); Q_FALLTHROUGH(); -#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0) case KMessageBox::SecondaryAction: -#else - case KMessageBox::No: -#endif event->accept(); break; case KMessageBox::Cancel: |