SVN_SILENT made messages (.desktop file) - always resolve ours

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

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index 6659d79b63f0b3c9f23cefd0cb4829ed7661e4df..30995f1f72d5644a1f0ce291b621bb85d55045d7 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -8,7 +8,6 @@
 #include "viewpropertiesdialog.h"
 
 #include "dolphin_generalsettings.h"
 #include "viewpropertiesdialog.h"
 
 #include "dolphin_generalsettings.h"

-#include "dolphin_iconsmodesettings.h"

 #include "global.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "viewpropsprogressinfo.h"
 #include "global.h"
 #include "kitemviews/kfileitemmodel.h"
 #include "viewpropsprogressinfo.h"


@@ -19,7 +18,9 @@
 #include <KMessageBox>
 #include <KWindowConfig>
 
 #include <KMessageBox>
 #include <KWindowConfig>
 

-#ifdef HAVE_BALOO
+#include <kwidgetsaddons_version.h>
+
+#if HAVE_BALOO

     #include <Baloo/IndexerConfig>
 #endif
 
     #include <Baloo/IndexerConfig>
 #endif
 


@@ -108,7 +109,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
         // Add checkboxes
         bool indexingEnabled = false;
 
         // Add checkboxes
         bool indexingEnabled = false;

-#ifdef HAVE_BALOO
+#if HAVE_BALOO

         Baloo::IndexerConfig config;
         indexingEnabled = config.fileIndexingEnabled();
 #endif
         Baloo::IndexerConfig config;
         indexingEnabled = config.fileIndexingEnabled();
 #endif


@@ -150,11 +151,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     layout->addRow(QString(), m_showHiddenFiles);
     layout->addRow(QString(), m_sortHiddenLast);
 
     layout->addRow(QString(), m_showHiddenFiles);
     layout->addRow(QString(), m_sortHiddenLast);
 

-    connect(m_viewMode, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(m_viewMode, &QComboBox::currentIndexChanged,

             this, &ViewPropertiesDialog::slotViewModeChanged);
             this, &ViewPropertiesDialog::slotViewModeChanged);

-    connect(m_sorting, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(m_sorting, &QComboBox::currentIndexChanged,

             this, &ViewPropertiesDialog::slotSortingChanged);
             this, &ViewPropertiesDialog::slotSortingChanged);

-    connect(m_sortOrder, QOverload<int>::of(&QComboBox::currentIndexChanged),
+    connect(m_sortOrder, &QComboBox::currentIndexChanged,

             this, &ViewPropertiesDialog::slotSortOrderChanged);
     connect(m_sortFoldersFirst, &QCheckBox::clicked,
             this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);
             this, &ViewPropertiesDialog::slotSortOrderChanged);
     connect(m_sortFoldersFirst, &QCheckBox::clicked,
             this, &ViewPropertiesDialog::slotSortFoldersFirstChanged);


@@ -348,7 +349,15 @@ void ViewPropertiesDialog::applyViewProperties()
     const bool applyToSubFolders = m_applyToSubFolders && m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub-folders will be changed. Do you want to continue?"));
     const bool applyToSubFolders = m_applyToSubFolders && m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub-folders will be changed. Do you want to continue?"));

-        if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        if (KMessageBox::questionTwoActions(this, text, {},
+                                            KStandardGuiItem::cont(),
+                                            KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) {
+#else
+        if (KMessageBox::questionYesNo(this, text, {},
+                                       KStandardGuiItem::cont(),
+                                       KStandardGuiItem::cancel()) == KMessageBox::No) {
+#endif

             return;
         }
 
             return;
         }
 


@@ -380,7 +389,15 @@ void ViewPropertiesDialog::applyViewProperties()
 
     if (applyToAllFolders) {
         const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?"));
 
     if (applyToAllFolders) {
         const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?"));

-        if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
+#if KWIDGETSADDONS_VERSION >= QT_VERSION_CHECK(5, 100, 0)
+        if (KMessageBox::questionTwoActions(this, text, {},
+                                            KStandardGuiItem::cont(),
+                                            KStandardGuiItem::cancel()) == KMessageBox::SecondaryAction) {
+#else
+        if (KMessageBox::questionYesNo(this, text, {},
+                                       KStandardGuiItem::cont(),
+                                       KStandardGuiItem::cancel()) == KMessageBox::No) {
+#endif

             return;
         }
 
             return;
         }
 


@@ -391,7 +408,7 @@ void ViewPropertiesDialog::applyViewProperties()
         settings->save();
     }
 
         settings->save();
     }
 

-    m_dolphinView->setMode(m_viewProps->viewMode());
+    m_dolphinView->setViewMode(m_viewProps->viewMode());

     m_dolphinView->setSortRole(m_viewProps->sortRole());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());
     m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst());
     m_dolphinView->setSortRole(m_viewProps->sortRole());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());
     m_dolphinView->setSortFoldersFirst(m_viewProps->sortFoldersFirst());