X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6422ae393ed378f8dcde0bf35e1f8d67a5df2295..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 61fd38476..34adabaf5 100644
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -34,30 +34,30 @@
 #include <kstandarddirs.h>
 #include <kurl.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGridLayout>
-#include <QGroupBox>
-#include <QLabel>
-#include <QRadioButton>
-#include <QVBoxLayout>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QGroupBox>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QBoxLayout>
 
 ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
-        KDialog(dolphinView),
-        m_isDirty(false),
-        m_dolphinView(dolphinView),
-        m_viewProps(0),
-        m_viewMode(0),
-        m_sorting(0),
-        m_sortOrder(0),
-        m_categorizedSorting(0),
-        m_additionalInfo(0),
-        m_showPreview(0),
-        m_showHiddenFiles(0),
-        m_applyToCurrentFolder(0),
-        m_applyToSubFolders(0),
-        m_useAsDefault(0)
+    KDialog(dolphinView),
+    m_isDirty(false),
+    m_dolphinView(dolphinView),
+    m_viewProps(0),
+    m_viewMode(0),
+    m_sorting(0),
+    m_sortOrder(0),
+    m_categorizedSorting(0),
+    m_additionalInfo(0),
+    m_showPreview(0),
+    m_showHiddenFiles(0),
+    m_applyToCurrentFolder(0),
+    m_applyToSubFolders(0),
+    m_useAsDefault(0)
 {
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
@@ -82,9 +82,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode = new QComboBox(propsBox);
     m_viewMode->addItem(KIcon("view-icon"), i18n("Icons"));
     m_viewMode->addItem(KIcon("fileview-text"), i18n("Details"));
-    m_viewMode->addItem(KIcon("view-tree"), i18n("Column"));
+    m_viewMode->addItem(KIcon("fileview-column"), i18n("Column"));
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
+    const bool iconsViewEnabled = (index == DolphinView::IconsView);
 
     QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox);
     QWidget* sortingBox = new QWidget(propsBox);
@@ -96,9 +97,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sortOrder->setCurrentIndex(sortOrderIdx);
 
     m_categorizedSorting = new QComboBox(sortingBox);
-    m_categorizedSorting->addItem(i18n("Uncategorized"));
-    m_categorizedSorting->addItem(i18n("Categorized"));
+    m_categorizedSorting->addItem(i18n("Ungrouped"));
+    m_categorizedSorting->addItem(i18n("Show in Groups"));
     m_categorizedSorting->setCurrentIndex(m_viewProps->categorizedSorting() ? 1 : 0);
+    m_categorizedSorting->setEnabled(iconsViewEnabled);
 
     m_sorting = new QComboBox(sortingBox);
     m_sorting->addItem("By Name");
@@ -107,6 +109,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sorting->addItem("By Permissions");
     m_sorting->addItem("By Owner");
     m_sorting->addItem("By Group");
+    m_sorting->addItem("By Type");
     m_sorting->setCurrentIndex(m_viewProps->sorting());
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
@@ -124,7 +127,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
     const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
     m_additionalInfo->setCurrentIndex(addInfoIndex);
-    m_additionalInfo->setEnabled(m_viewProps->viewMode() == DolphinView::IconsView);
+    m_additionalInfo->setEnabled(iconsViewEnabled);
 
     m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
     m_showPreview->setChecked(m_viewProps->showPreview());
@@ -200,6 +203,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     main->setLayout(topLayout);
     setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "ViewPropertiesDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()
@@ -207,6 +214,10 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
     m_isDirty = false;
     delete m_viewProps;
     m_viewProps = 0;
+
+    KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                              "ViewPropertiesDialog");
+    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
 }
 
 void ViewPropertiesDialog::slotOk()