The View Properties dialog now correctly disables/enables the Apply button, instead...

svn path=/trunk/KDE/kdebase/apps/; revision=926562

diff --git a/src/settings/viewpropertiesdialog.cpp b/src/settings/viewpropertiesdialog.cpp
index ba8de4d9cc8f2251ce793c9328c2ae29f07550f4..5e3f261f3a102e9185ece9e34f27f0bb204916d4 100644 (file)
--- a/src/settings/viewpropertiesdialog.cpp
+++ b/src/settings/viewpropertiesdialog.cpp
@@ -236,12 +236,13 @@ void ViewPropertiesDialog::slotOk()
 void ViewPropertiesDialog::slotApply()
 {
     applyViewProperties();
+    markAsDirty(false);
 }
 
 void ViewPropertiesDialog::slotViewModeChanged(int index)
 {
     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
-    m_isDirty = true;
+    markAsDirty(true);
 
     const DolphinView::Mode mode = m_viewProps->viewMode();
     m_showInGroups->setEnabled(mode == DolphinView::IconsView);
@@ -252,39 +253,40 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
 {
     const DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(index);
     m_viewProps->setSorting(sorting);
-    m_isDirty = true;
+    markAsDirty(true);
 }
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {
     const Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
     m_viewProps->setSortOrder(sortOrder);
-    m_isDirty = true;
+    markAsDirty(true);
 }
 
 void ViewPropertiesDialog::slotCategorizedSortingChanged()
 {
     m_viewProps->setCategorizedSorting(m_showInGroups->isChecked());
-    m_isDirty = true;
+    markAsDirty(true);
 }
 
 void ViewPropertiesDialog::slotShowPreviewChanged()
 {
     const bool show = m_showPreview->isChecked();
     m_viewProps->setShowPreview(show);
-    m_isDirty = true;
+    markAsDirty(true);
 }
 
 void ViewPropertiesDialog::slotShowHiddenFilesChanged()
 {
     const bool show = m_showHiddenFiles->isChecked();
     m_viewProps->setShowHiddenFiles(show);
-    m_isDirty = true;
+    markAsDirty(true);
 }
 
-void ViewPropertiesDialog::markAsDirty()
+void ViewPropertiesDialog::markAsDirty(bool isDirty)
 {
-    m_isDirty = true;
+    m_isDirty = isDirty;
+    enableButtonApply(isDirty);
 }
 
 void ViewPropertiesDialog::configureAdditionalInfo()
@@ -305,7 +307,7 @@ void ViewPropertiesDialog::configureAdditionalInfo()
     AdditionalInfoDialog dialog(this, info);
     if (dialog.exec() == QDialog::Accepted) {
         m_viewProps->setAdditionalInfo(dialog.additionalInfo());
-        m_isDirty = true;
+        markAsDirty(true);
     }
 }
 
@@ -375,7 +377,7 @@ void ViewPropertiesDialog::applyViewProperties()
 
     m_viewProps->save();
 
-    m_isDirty = false;
+    markAsDirty(false);
 }
 
 void ViewPropertiesDialog::loadSettings()
@@ -400,6 +402,7 @@ void ViewPropertiesDialog::loadSettings()
     m_showInGroups->setEnabled(index == DolphinView::IconsView); // only the icons view supports categorized sorting
 
     m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
+    markAsDirty(false);
 }
 
 #include "viewpropertiesdialog.moc"

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index 320f8f115129e5f500ba8aa4da8834436c4c885c..fbfae3020a3e6911e9d34e98026771a281d0c022 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -56,7 +56,7 @@ private slots:
     void slotCategorizedSortingChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
-    void markAsDirty();
+    void markAsDirty(bool isDirty);
     void configureAdditionalInfo();
 
 private: