Use KMessageBox::warningContinueCancel when appropriate

This will prevent saving the "Cancel" + "don't show again" result, which is meaningless.

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 38843f82cacca25b7c2114b36c32abb751ecab89..637cd55afb838ce5d01ebce1844ecd8d0fff91c8 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1162,7 +1162,7 @@ void DolphinMainWindow::openTerminalHere()
 
     if (urls.count() > 5) {
         QString question = i18np("Are you sure you want to open 1 terminal window?", "Are you sure you want to open %1 terminal windows?", urls.count());
-        const int answer = KMessageBox::warningTwoActions(
+        const int answer = KMessageBox::warningContinueCancel(
             this,
             question,
             {},

diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index 9bb202b7152733283233278d3ec3d5d97889cef0..2abd7da49c6963953ec3949922d293d2c8e247b5 100644 (file)
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -145,11 +145,11 @@
     <group name="Notification Messages">
         <entry name="ConfirmOpenManyFolders" type="Bool">
             <label>Ask for confirmation when opening many folders at once.</label>
-            <default>false</default>
+            <default>true</default>
         </entry>
         <entry name="ConfirmOpenManyTerminals" type="Bool">
             <label>Ask for confirmation when opening many terminals at once.</label>
-            <default>false</default>
+            <default>true</default>
         </entry>
     </group>
 </kcfg>

diff --git a/src/settings/interface/confirmationssettingspage.cpp b/src/settings/interface/confirmationssettingspage.cpp
index 491f8261fb6ad4e809f0877557a1191db6f54e11..5f1abb4cd66251902fbbe12f5a00f55c98b80478 100644 (file)
--- a/src/settings/interface/confirmationssettingspage.cpp
+++ b/src/settings/interface/confirmationssettingspage.cpp
@@ -136,8 +136,8 @@ void ConfirmationsSettingsPage::applySettings()
 
     GeneralSettings *settings = GeneralSettings::self();
     settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked());
-    settings->setConfirmOpenManyFolders(!m_confirmOpenManyFolders->isChecked());
-    settings->setConfirmOpenManyTerminals(!m_confirmOpenManyTerminals->isChecked());
+    settings->setConfirmOpenManyFolders(m_confirmOpenManyFolders->isChecked());
+    settings->setConfirmOpenManyTerminals(m_confirmOpenManyTerminals->isChecked());
 
 #if HAVE_TERMINAL
     settings->setConfirmClosingTerminalRunningProgram(m_confirmClosingTerminalRunningProgram->isChecked());
@@ -182,8 +182,8 @@ void ConfirmationsSettingsPage::loadSettings()
     // KMessageBox for its dontshowAgain settings are true => Yes, false => No, No value => ask
     // we use default = false to not write false into the rc file, but have no value
     // the UI has inversed meaning compared to the interpretation
-    m_confirmOpenManyFolders->setChecked(!GeneralSettings::confirmOpenManyFolders());
-    m_confirmOpenManyTerminals->setChecked(!GeneralSettings::confirmOpenManyTerminals());
+    m_confirmOpenManyFolders->setChecked(GeneralSettings::confirmOpenManyFolders());
+    m_confirmOpenManyTerminals->setChecked(GeneralSettings::confirmOpenManyTerminals());
 
 #if HAVE_TERMINAL
     m_confirmClosingTerminalRunningProgram->setChecked(GeneralSettings::confirmClosingTerminalRunningProgram());

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index d525df4c60d370ca37b3964d9094e3a33e60bb79..d0d524196b5eb374a6077d06949cacd6f0c0c4e1 100644 (file)
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1058,7 +1058,7 @@ void DolphinView::slotItemsActivated(const KItemSet &indexes)
 
     if (indexes.count() > 5) {
         QString question = i18np("Are you sure you want to open 1 item?", "Are you sure you want to open %1 items?", indexes.count());
-        const int answer = KMessageBox::warningTwoActions(
+        const int answer = KMessageBox::warningContinueCancel(
             this,
             question,
             {},