Make use of the error messages coming from the places model.

[dolphin.git] / src / viewproperties.cpp

diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp
index 485ed438498f6a8146bfe40e72c89d9721318ab8..835be2aad944d0ab58128210adb0595d9f2f3694 100644 (file)
--- a/src/viewproperties.cpp
+++ b/src/viewproperties.cpp
@@ -18,28 +18,27 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 

-#include <assert.h>
+#include "viewproperties.h"

 
 

-#include <QDateTime>
-#include <QFile>
-#include <QFileInfo>
+#include "dolphinsettings.h"
+#include "dolphin_directoryviewpropertysettings.h"
+#include "dolphin_generalsettings.h"

 
 #include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 
 #include <kcomponentdata.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

-#include <kcomponentdata.h>

 
 

-#include "viewproperties.h"
-#include "dolphinsettings.h"
-#include "dolphin_generalsettings.h"
+#include <QDate>
+#include <QFile>
+#include <QFileInfo>

 
 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :
 
 #define FILE_NAME "/.directory"
 
 ViewProperties::ViewProperties(const KUrl& url) :

-        m_changedProps(false),
-        m_autoSave(true),
-        m_node(0)
+    m_changedProps(false),
+    m_autoSave(true),
+    m_node(0)

 {
     KUrl cleanUrl(url);
     cleanUrl.cleanPath();
 {
     KUrl cleanUrl(url);
     cleanUrl.cleanPath();


@@ -131,6 +130,20 @@ void ViewProperties::setShowHiddenFiles(bool show)
     }
 }
 
     }
 }
 

+void ViewProperties::setCategorizedSorting(bool categorized)
+{
+    if (m_node->categorizedSorting() != categorized) {
+        m_node->setCategorizedSorting(categorized);
+        updateTimeStamp();
+    }
+}
+
+bool ViewProperties::categorizedSorting() const
+{
+    return m_node->categorizedSorting();
+}
+
+

 bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();
 bool ViewProperties::showHiddenFiles() const
 {
     return m_node->showHiddenFiles();


@@ -181,6 +194,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props)
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());
     setViewMode(props.viewMode());
     setShowPreview(props.showPreview());
     setShowHiddenFiles(props.showHiddenFiles());

+    setCategorizedSorting(props.categorizedSorting());

     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setAdditionalInfo(props.additionalInfo());
     setSorting(props.sorting());
     setSortOrder(props.sortOrder());
     setAdditionalInfo(props.additionalInfo());