Avoid category building problems by removing the natural comparation

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 61fd38476967b2c084e9330fd21a4fd5c4bca60a..2aa1ced6dd307daf17cf158e0a38451717050a28 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -34,30 +34,33 @@
 #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 <QVBoxLayout>
+#include <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_descendingAction(0),
+    m_showInGroupsAction(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();
@@ -80,25 +83,26 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
     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-icon"), i18n("Icons"));
+    m_viewMode->addItem(KIcon("fileview-detailed"), i18n("Details"));
+    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);
 
-    m_sortOrder = new QComboBox(sortingBox);
-    m_sortOrder->addItem(i18n("Ascending"));
-    m_sortOrder->addItem(i18n("Descending"));
-    const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
-    m_sortOrder->setCurrentIndex(sortOrderIdx);
+    QMenu* sortingFlagsMenu = new QMenu(sortingBox);
+    m_descendingAction = sortingFlagsMenu->addAction(i18n("Descending"));
+    m_descendingAction->setCheckable(true);
+    m_descendingAction->setChecked(m_viewProps->sortOrder() == Qt::Descending);
+    m_showInGroupsAction = sortingFlagsMenu->addAction(i18n("Show in Groups"));
+    m_showInGroupsAction->setCheckable(true);
+    m_showInGroupsAction->setChecked(m_viewProps->categorizedSorting());
 
-    m_categorizedSorting = new QComboBox(sortingBox);
-    m_categorizedSorting->addItem(i18n("Uncategorized"));
-    m_categorizedSorting->addItem(i18n("Categorized"));
-    m_categorizedSorting->setCurrentIndex(m_viewProps->categorizedSorting() ? 1 : 0);
+    QPushButton* sortFlagsButton = new QPushButton(KIcon("configure"), QString(), sortingBox);
+    sortFlagsButton->setMenu(sortingFlagsMenu);
 
     m_sorting = new QComboBox(sortingBox);
     m_sorting->addItem("By Name");
@@ -107,13 +111,13 @@ 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();
     sortingLayout->setMargin(0);
-    sortingLayout->addWidget(m_sortOrder);
     sortingLayout->addWidget(m_sorting);
-    sortingLayout->addWidget(m_categorizedSorting);
+    sortingLayout->addWidget(sortFlagsButton);
     sortingBox->setLayout(sortingLayout);
 
     QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
@@ -124,7 +128,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());
@@ -148,10 +152,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotViewModeChanged(int)));
     connect(m_sorting, SIGNAL(activated(int)),
             this, SLOT(slotSortingChanged(int)));
-    connect(m_sortOrder, SIGNAL(activated(int)),
-            this, SLOT(slotSortOrderChanged(int)));
-    connect(m_categorizedSorting, SIGNAL(activated(int)),
-            this, SLOT(slotCategorizedSortingChanged(int)));
+    connect(m_descendingAction, SIGNAL(changed()),
+            this, SLOT(slotSortOrderChanged()));
+    connect(m_showInGroupsAction, SIGNAL(changed()),
+            this, SLOT(slotCategorizedSortingChanged()));
     connect(m_additionalInfo, SIGNAL(activated(int)),
             this, SLOT(slotAdditionalInfoChanged(int)));
     connect(m_showPreview, SIGNAL(clicked()),
@@ -200,6 +204,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     main->setLayout(topLayout);
     setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "ViewPropertiesDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()
@@ -207,6 +215,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()
@@ -226,7 +238,7 @@ void ViewPropertiesDialog::slotViewModeChanged(int index)
     m_isDirty = true;
 
     const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView);
-    m_categorizedSorting->setEnabled(iconsViewEnabled);
+    m_showInGroupsAction->setEnabled(iconsViewEnabled);
     m_additionalInfo->setEnabled(iconsViewEnabled);
 }
 
@@ -237,16 +249,18 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
     m_isDirty = true;
 }
 
-void ViewPropertiesDialog::slotSortOrderChanged(int index)
+void ViewPropertiesDialog::slotSortOrderChanged()
 {
-    Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
+    Qt::SortOrder sortOrder = m_descendingAction->isChecked() ?
+                              Qt::DescendingOrder :
+                              Qt::AscendingOrder;
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 
-void ViewPropertiesDialog::slotCategorizedSortingChanged(int index)
+void ViewPropertiesDialog::slotCategorizedSortingChanged()
 {
-    m_viewProps->setCategorizedSorting(index == 1);
+    m_viewProps->setCategorizedSorting(m_showInGroupsAction->isChecked());
     m_isDirty = true;
 }