X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/25349096ae7fe344613d35e5548cac1a91b60fd1..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/viewproperties.cpp diff --git a/src/viewproperties.cpp b/src/viewproperties.cpp index d3fe72246..835be2aad 100644 --- a/src/viewproperties.cpp +++ b/src/viewproperties.cpp @@ -18,27 +18,27 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "viewproperties.h" -#include -#include +#include "dolphinsettings.h" +#include "dolphin_directoryviewpropertysettings.h" +#include "dolphin_generalsettings.h" #include #include #include #include -#include -#include "viewproperties.h" -#include "dolphinsettings.h" -#include "dolphin_generalsettings.h" +#include +#include +#include #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(); @@ -56,14 +56,12 @@ ViewProperties::ViewProperties(const KUrl& url) : const bool useGlobalViewProps = settings->globalViewProps(); if (useGlobalViewProps) { m_filepath = destinationDir("global"); - } - else if (cleanUrl.isLocalFile()) { + } else if (cleanUrl.isLocalFile()) { const QFileInfo info(m_filepath); if (!info.isWritable()) { m_filepath = destinationDir("local") + m_filepath; } - } - else { + } else { m_filepath = destinationDir("remote") + m_filepath; } @@ -132,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(); @@ -182,6 +194,7 @@ void ViewProperties::setDirProperties(const ViewProperties& props) setViewMode(props.viewMode()); setShowPreview(props.showPreview()); setShowHiddenFiles(props.showHiddenFiles()); + setCategorizedSorting(props.categorizedSorting()); setSorting(props.sorting()); setSortOrder(props.sortOrder()); setAdditionalInfo(props.additionalInfo());