Create the new architecture for KCategorizedView. Now DolphinModel is created, inheri...

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index f72e6fc40c928e2fb9184445ace9ba5bee2b95fd..040e9f6be93ac31ed72eca9ea2346243c6f380c2 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -15,109 +15,152 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *

- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *

  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"
  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"

+#include "viewpropsprogressinfo.h"
+#include "dolphinview.h"
+#include "dolphinsettings.h"
+#include "dolphinsortfilterproxymodel.h"
+#include "dolphin_generalsettings.h"
+#include "viewproperties.h"
+
+#include <config-nepomuk.h>
+#ifdef HAVE_NEPOMUK
+#include <nepomuk/resourcemanager.h>
+#endif
+
+#include <kcomponentdata.h>

 #include <klocale.h>
 #include <klocale.h>

-#include <qlabel.h>
-#include <qlayout.h>
-#include <q3vbox.h>
-#include <q3buttongroup.h>
-#include <qcheckbox.h>
-#include <qradiobutton.h>
-#include <qpushbutton.h>
-#include <qsizepolicy.h>
-#include <q3groupbox.h>
-#include <qcombobox.h>
-//Added by qt3to4:
-#include <Q3VBoxLayout>

 #include <kiconloader.h>
 #include <kiconloader.h>

+#include <kio/netaccess.h>

 #include <kmessagebox.h>
 #include <kmessagebox.h>

-#include <assert.h>
-
-#include "viewproperties.h"
-#include "dolphinview.h"
+#include <kstandarddirs.h>
+#include <kurl.h>
+
+#include <QAction>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGridLayout>
+#include <QGroupBox>
+#include <QLabel>
+#include <QMenu>
+#include <QPushButton>
+#include <QRadioButton>
+#include <QBoxLayout>

 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :

-    KDialog(dolphinView, static_cast<Qt::WFlags>(Ok /* KDE4-TODO: Apply | Cancel*/)),
+    KDialog(dolphinView),

     m_isDirty(false),
     m_isDirty(false),

-    m_dolphinView(dolphinView)
+    m_dolphinView(dolphinView),
+    m_viewProps(0),
+    m_viewMode(0),
+    m_sortOrder(0),
+    m_sorting(0),
+    m_additionalInfo(0),
+    m_showPreview(0),
+    m_showInGroups(0),
+    m_showHiddenFiles(0),
+    m_applyToCurrentFolder(0),
+    m_applyToSubFolders(0),
+    m_useAsDefault(0)

 {
 {

-    assert(dolphinView != 0);
+    Q_ASSERT(dolphinView != 0);
+    const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();

 
 

-    const int margin = KDialog::marginHint();
-    const QSizePolicy sizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
+    setCaption(i18nc("@title:window", "View Properties"));
+    setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);

 
     const KUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);
     m_viewProps->setAutoSaveEnabled(false);
 
 
     const KUrl& url = dolphinView->url();
     m_viewProps = new ViewProperties(url);
     m_viewProps->setAutoSaveEnabled(false);
 

-    Q3VBoxLayout* topLayout = new Q3VBoxLayout(mainWidget(), 0, spacingHint());
+    QWidget* main = new QWidget();
+    QVBoxLayout* topLayout = new QVBoxLayout();

 
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
 
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files

-    Q3GroupBox* propsGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Properties"), mainWidget());
-    propsGroup->setSizePolicy(sizePolicy);
-    propsGroup->setMargin(margin);
-
-    new QLabel(i18n("View mode:"), propsGroup);
-    m_viewMode = new QComboBox(propsGroup);
-    m_viewMode->insertItem(SmallIcon("view_icon"), i18n("Icons"));
-    m_viewMode->insertItem(SmallIcon("view_text"), i18n("Details"));
-    m_viewMode->insertItem(SmallIcon("gvdirpart"), i18n("Previews"));
-    const int index = static_cast<int>(m_viewProps->viewMode());
-    m_viewMode->setCurrentItem(index);
-
-    new QLabel(i18n("Sorting:"), propsGroup);
-    m_sorting = new QComboBox(propsGroup);
-    m_sorting->insertItem("By Name");
-    m_sorting->insertItem("By Size");
-    m_sorting->insertItem("By Date");
-    int sortingIdx = 0;
-    switch (m_viewProps->sorting()) {
-        case DolphinView::SortByName: sortingIdx = 0; break;
-        case DolphinView::SortBySize: sortingIdx = 1; break;
-        case DolphinView::SortByDate: sortingIdx = 2; break;
-        default: break;
+    QWidget* propsBox = main;
+    if (!useGlobalViewProps) {
+        propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);

     }
     }

-    m_sorting->setCurrentItem(sortingIdx);
-
-    new QLabel(i18n("Sort order:"), propsGroup);
-    m_sortOrder = new QComboBox(propsGroup);
-    m_sortOrder->insertItem(i18n("Ascending"));
-    m_sortOrder->insertItem(i18n("Descending"));
-    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1;
-    m_sortOrder->setCurrentItem(sortOrderIdx);
-
-    m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsGroup);
-    m_showHiddenFiles->setChecked(m_viewProps->isShowHiddenFilesEnabled());
-
-    // create 'Apply view properties to:' group
-    Q3ButtonGroup* buttonGroup = new Q3ButtonGroup(3,
-                                                 Qt::Vertical,
-                                                 i18n("Apply view properties to:"),
-                                                 mainWidget());
-    buttonGroup->setSizePolicy(sizePolicy);
-    buttonGroup->setMargin(margin);
-
-    m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), buttonGroup);
-    buttonGroup->insert(m_applyToCurrentFolder);

 
 

-    m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), buttonGroup);
-    buttonGroup->insert(m_applyToSubFolders);
-
-    m_applyToAllFolders = new QRadioButton(i18n("All folders"), buttonGroup);
-    buttonGroup->insert(m_applyToAllFolders);
-
-    if (m_viewProps->isValidForSubDirs()) {
-        m_applyToSubFolders->setChecked(true);
-    }
-    else {
-        m_applyToCurrentFolder->setChecked(true);
+    QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
+    m_viewMode = new QComboBox(propsBox);
+    m_viewMode->addItem(KIcon("fileview-icon"), i18nc("@item:inlistbox", "Icons"));
+    m_viewMode->addItem(KIcon("fileview-detailed"), i18nc("@item:inlistbox", "Details"));
+    m_viewMode->addItem(KIcon("fileview-column"), i18nc("@item:inlistbox", "Column"));
+    const int index = static_cast<int>(m_viewProps->viewMode());
+    m_viewMode->setCurrentIndex(index);
+    const bool iconsViewEnabled = (index == DolphinView::IconsView);
+
+    QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);
+    QWidget* sortingBox = new QWidget(propsBox);
+
+    m_sortOrder = new QComboBox(sortingBox);
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending"));
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending"));
+    const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
+    m_sortOrder->setCurrentIndex(sortOrderIndex);
+
+    m_sorting = new QComboBox(sortingBox);
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Permissions"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Owner"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group"));
+    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
+#ifdef HAVE_NEPOMUK
+    if (!Nepomuk::ResourceManager::instance()->init()) {
+        m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating"));
+        m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags"));

     }
     }

-
-    topLayout->addWidget(propsGroup);
-    topLayout->addWidget(buttonGroup);
+#endif
+    m_sorting->setCurrentIndex(m_viewProps->sorting());
+
+    QHBoxLayout* sortingLayout = new QHBoxLayout();
+    sortingLayout->setMargin(0);
+    sortingLayout->addWidget(m_sortOrder);
+    sortingLayout->addWidget(m_sorting);
+    sortingBox->setLayout(sortingLayout);
+
+    QLabel* additionalInfoLabel = new QLabel(i18nc("@label:listbox", "Additional information:"), propsBox);
+    m_additionalInfo = new QComboBox(propsBox);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "No Information"),
+                              KFileItemDelegate::NoInformation);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Type"),
+                              KFileItemDelegate::FriendlyMimeType);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Size"),
+                              KFileItemDelegate::Size);
+    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Date"),
+                              KFileItemDelegate::ModificationTime);
+    const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
+    m_additionalInfo->setCurrentIndex(addInfoIndex);
+    m_additionalInfo->setEnabled(iconsViewEnabled);
+
+    m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox);
+    m_showPreview->setChecked(m_viewProps->showPreview());
+
+    m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in Groups"), propsBox);
+    m_showInGroups->setChecked(m_viewProps->categorizedSorting());
+
+    m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files"), propsBox);
+    m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
+
+    QGridLayout* propsBoxLayout = new QGridLayout(propsBox);
+    propsBoxLayout->addWidget(viewModeLabel, 0, 0);
+    propsBoxLayout->addWidget(m_viewMode, 0, 1);
+    propsBoxLayout->addWidget(sortingLabel, 1, 0);
+    propsBoxLayout->addWidget(sortingBox, 1, 1);
+    propsBoxLayout->addWidget(additionalInfoLabel, 2, 0);
+    propsBoxLayout->addWidget(m_additionalInfo, 2, 1);
+    propsBoxLayout->addWidget(m_showPreview, 3, 0);
+    propsBoxLayout->addWidget(m_showInGroups, 4, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 5, 0);
+
+    topLayout->addWidget(propsBox);

 
     connect(m_viewMode, SIGNAL(activated(int)),
             this, SLOT(slotViewModeChanged(int)));
 
     connect(m_viewMode, SIGNAL(activated(int)),
             this, SLOT(slotViewModeChanged(int)));


@@ -125,14 +168,63 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));

+    connect(m_additionalInfo, SIGNAL(activated(int)),
+            this, SLOT(slotAdditionalInfoChanged(int)));
+    connect(m_showPreview, SIGNAL(clicked()),
+            this, SLOT(slotShowPreviewChanged()));
+    connect(m_showInGroups, SIGNAL(clicked()),
+            this, SLOT(slotCategorizedSortingChanged()));

     connect(m_showHiddenFiles, SIGNAL(clicked()),
             this, SLOT(slotShowHiddenFilesChanged()));
     connect(m_showHiddenFiles, SIGNAL(clicked()),
             this, SLOT(slotShowHiddenFilesChanged()));

-    connect(m_applyToCurrentFolder, SIGNAL(clicked()),
-            this, SLOT(slotApplyToCurrentFolder()));
-    connect(m_applyToSubFolders, SIGNAL(clicked()),
-            this, SLOT(slotApplyToSubFolders()));
-    connect(m_applyToAllFolders, SIGNAL(clicked()),
-            this, SLOT(slotApplyToAllFolders()));
+
+    connect(this, SIGNAL(okClicked()), this, SLOT(slotOk()));
+    connect(this, SIGNAL(applyClicked()), this, SLOT(slotApply()));
+
+    // Only show the following settings if the view properties are remembered
+    // for each directory:
+    if (!useGlobalViewProps) {
+        // create 'Apply View Properties To' group
+        QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), main);
+
+        m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                        "Current folder"), applyBox);
+        m_applyToCurrentFolder->setChecked(true);
+        m_applyToSubFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                     "Current folder including all sub folders"), applyBox);
+        m_applyToAllFolders = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                     "All folders"), applyBox);
+
+        QButtonGroup* applyGroup = new QButtonGroup(this);
+        applyGroup->addButton(m_applyToCurrentFolder);
+        applyGroup->addButton(m_applyToSubFolders);
+        applyGroup->addButton(m_applyToAllFolders);
+
+        QVBoxLayout* applyBoxLayout = new QVBoxLayout(applyBox);
+        applyBoxLayout->addWidget(m_applyToCurrentFolder);
+        applyBoxLayout->addWidget(m_applyToSubFolders);
+        applyBoxLayout->addWidget(m_applyToAllFolders);
+
+        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default for new folders"), main);
+
+        topLayout->addWidget(applyBox);
+        topLayout->addWidget(m_useAsDefault);
+
+        connect(m_applyToCurrentFolder, SIGNAL(clicked()),
+                this, SLOT(markAsDirty()));
+        connect(m_applyToSubFolders, SIGNAL(clicked()),
+                this, SLOT(markAsDirty()));
+        connect(m_applyToAllFolders, SIGNAL(clicked()),
+                this, SLOT(markAsDirty()));
+        connect(m_useAsDefault, SIGNAL(clicked()),
+                this, SLOT(markAsDirty()));
+    }
+
+    main->setLayout(topLayout);
+    setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "ViewPropertiesDialog");
+    restoreDialogSize(dialogConfig);

 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()
 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()


@@ -140,97 +232,147 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     m_isDirty = false;
     delete m_viewProps;
     m_viewProps = 0;
     m_isDirty = false;
     delete m_viewProps;
     m_viewProps = 0;

+
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                              "ViewPropertiesDialog");
+    saveDialogSize(dialogConfig, KConfigFlags::Persistent);

 }
 
 void ViewPropertiesDialog::slotOk()
 {
     applyViewProperties();
 }
 
 void ViewPropertiesDialog::slotOk()
 {
     applyViewProperties();

-    // KDE4-TODO: KDialog::slotOk();
+    accept();

 }
 
 void ViewPropertiesDialog::slotApply()
 {
     applyViewProperties();
 }
 
 void ViewPropertiesDialog::slotApply()
 {
     applyViewProperties();

-    // KDE4-TODO: KDialog::slotApply();

 }
 
 void ViewPropertiesDialog::slotViewModeChanged(int index)
 {
 }
 
 void ViewPropertiesDialog::slotViewModeChanged(int index)
 {

-    assert((index >= 0) && (index <= 2));

     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
     m_isDirty = true;
     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
     m_isDirty = true;

+
+    const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView);
+    m_showInGroups->setEnabled(iconsViewEnabled);
+    m_additionalInfo->setEnabled(iconsViewEnabled);

 }
 
 void ViewPropertiesDialog::slotSortingChanged(int index)
 {
 }
 
 void ViewPropertiesDialog::slotSortingChanged(int index)
 {

-    DolphinView::Sorting sorting = DolphinView::SortByName;
-    switch (index) {
-        case 1: sorting = DolphinView::SortBySize; break;
-        case 2: sorting = DolphinView::SortByDate; break;
-        default: break;
-    }
+    const DolphinView::Sorting sorting = DolphinSortFilterProxyModel::sortingForColumn(index);

     m_viewProps->setSorting(sorting);
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {
     m_viewProps->setSorting(sorting);
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {

-    Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending;
+    const Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;

     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotShowHiddenFilesChanged()
+void ViewPropertiesDialog::slotCategorizedSortingChanged()

 {
 {

-    const bool show = m_showHiddenFiles->isChecked();
-    m_viewProps->setShowHiddenFilesEnabled(show);
+    m_viewProps->setCategorizedSorting(m_showInGroups->isChecked());
+    m_isDirty = true;
+}
+
+void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
+{
+    KFileItemDelegate::AdditionalInformation info = KFileItemDelegate::NoInformation;
+    switch (index) {
+    case 1:  info = KFileItemDelegate::FriendlyMimeType; break;
+    case 2:  info = KFileItemDelegate::Size; break;
+    case 3:  info = KFileItemDelegate::ModificationTime; break;
+    default: break;
+    }
+    m_viewProps->setAdditionalInfo(info);

     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotApplyToCurrentFolder()
+void ViewPropertiesDialog::slotShowPreviewChanged()

 {
 {

-    m_viewProps->setValidForSubDirs(false);
+    const bool show = m_showPreview->isChecked();
+    m_viewProps->setShowPreview(show);

     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotApplyToSubFolders()
+void ViewPropertiesDialog::slotShowHiddenFilesChanged()

 {
 {

-    m_viewProps->setValidForSubDirs(true);
+    const bool show = m_showHiddenFiles->isChecked();
+    m_viewProps->setShowHiddenFiles(show);

     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotApplyToAllFolders()
+void ViewPropertiesDialog::markAsDirty()

 {
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::applyViewProperties()
 {
 {
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::applyViewProperties()
 {

-    if (m_applyToAllFolders->isChecked()) {
-        if (m_isDirty) {
-            const QString text(i18n("The view properties of all folders will be replaced. Do you want to continue?"));
-            if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
-                return;
-            }
+    const bool applyToSubFolders = m_isDirty &&
+                                   (m_applyToSubFolders != 0) &&
+                                   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) {
+            return;

         }
 
         }
 

-        ViewProperties props(QDir::homeDirPath());
-        props.setViewMode(m_viewProps->viewMode());
-        props.setSorting(m_viewProps->sorting());
-        props.setSortOrder(m_viewProps->sortOrder());
-        props.setShowHiddenFilesEnabled(m_viewProps->isShowHiddenFilesEnabled());
-        props.setValidForSubDirs(true);
+        ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView,
+                                      m_dolphinView->url(),
+                                      *m_viewProps);
+        info->setWindowModality(Qt::NonModal);
+        info->show();

     }
     }

-    else if (m_applyToSubFolders->isChecked() && m_isDirty) {
-        const QString text(i18n("The view properties of all sub folders will be replaced. Do you want to continue?"));
+
+    const bool applyToAllFolders = m_isDirty &&
+                                   (m_applyToAllFolders != 0) &&
+                                   m_applyToAllFolders->isChecked();
+    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) {
             return;
         }
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }

+
+        // Updating the global view properties time stamp in the general settings makes
+        // all existing viewproperties invalid, as they have a smaller time stamp.
+        GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+        settings->setViewPropsTimestamp(QDateTime::currentDateTime());
+
+        // This is also a good chance to make a cleanup of all mirrored view properties:
+        const KUrl mirroredDir = ViewProperties::mirroredDirectory();
+        KIO::NetAccess::del(mirroredDir, this);

     }
 
     m_viewProps->save();
     }
 
     m_viewProps->save();

-    m_dolphinView->setViewProperties(*m_viewProps);
+
+    m_dolphinView->setMode(m_viewProps->viewMode());
+    m_dolphinView->setSorting(m_viewProps->sorting());
+    m_dolphinView->setSortOrder(m_viewProps->sortOrder());
+    m_dolphinView->setCategorizedSorting(m_viewProps->categorizedSorting());
+    m_dolphinView->setAdditionalInfo(m_viewProps->additionalInfo());
+    m_dolphinView->setShowPreview(m_viewProps->showPreview());
+    m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles());
+

     m_isDirty = false;
     m_isDirty = false;

+
+    if (m_useAsDefault->isChecked()) {
+        // For directories where no .directory file is available, the .directory
+        // file stored for the global view properties is used as fallback. To update
+        // this file we temporary turn on the global view properties mode.
+        GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+        Q_ASSERT(!settings->globalViewProps());
+
+        settings->setGlobalViewProps(true);
+        ViewProperties defaultProps(m_dolphinView->url());
+        defaultProps.setDirProperties(*m_viewProps);
+        defaultProps.save();
+        settings->setGlobalViewProps(false);
+    }

 }
 
 #include "viewpropertiesdialog.moc"
 }
 
 #include "viewpropertiesdialog.moc"