Draw dragged items. Better conditions (more accurate to our behavior, hey ! we have...

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 9a721e2bc2c15dabea5deec0b495594d87fb89a6..d907bbfe79deb3d029d256a7b0a51a803b0389d6 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -26,6 +26,11 @@
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 
+#ifdef HAVE_NEPOMUK
+#include <config-nepomuk.h>
+#include <nepomuk/resourcemanager.h>
+#endif
+
 #include <kcomponentdata.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -34,29 +39,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_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_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)
 {
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
@@ -79,11 +88,12 @@ 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);
@@ -91,16 +101,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     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);
+    const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
+    m_sortOrder->setCurrentIndex(sortOrderIndex);
 
     m_sorting = new QComboBox(sortingBox);
-    m_sorting->addItem("By Name");
-    m_sorting->addItem("By Size");
-    m_sorting->addItem("By Date");
-    m_sorting->addItem("By Permissions");
-    m_sorting->addItem("By Owner");
-    m_sorting->addItem("By Group");
+    m_sorting->addItem(i18n("By Name"));
+    m_sorting->addItem(i18n("By Size"));
+    m_sorting->addItem(i18n("By Date"));
+    m_sorting->addItem(i18n("By Permissions"));
+    m_sorting->addItem(i18n("By Owner"));
+    m_sorting->addItem(i18n("By Group"));
+    m_sorting->addItem(i18n("By Type"));
+#ifdef HAVE_NEPOMUK
+    if (!Nepomuk::ResourceManager::instance()->init()) {
+        m_sorting->addItem(i18n("By Rating"));
+        m_sorting->addItem(i18n("By Tags"));
+    }
+#endif
     m_sorting->setCurrentIndex(m_viewProps->sorting());
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
@@ -117,11 +134,14 @@ 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());
 
+    m_showInGroups = new QCheckBox(i18n("Show in Groups"), propsBox);
+    m_showInGroups->setChecked(m_viewProps->categorizedSorting());
+
     m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);
     m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
 
@@ -133,7 +153,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     propsBoxLayout->addWidget(additionalInfoLabel, 2, 0);
     propsBoxLayout->addWidget(m_additionalInfo, 2, 1);
     propsBoxLayout->addWidget(m_showPreview, 3, 0);
-    propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);
+    propsBoxLayout->addWidget(m_showInGroups, 4, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 5, 0);
 
     topLayout->addWidget(propsBox);
 
@@ -147,6 +168,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             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()));
 
@@ -191,6 +214,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
 
     main->setLayout(topLayout);
     setMainWidget(main);
+
+    const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
+                                    "ViewPropertiesDialog");
+    restoreDialogSize(dialogConfig);
 }
 
 ViewPropertiesDialog::~ViewPropertiesDialog()
@@ -198,6 +225,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()
@@ -216,7 +247,9 @@ void ViewPropertiesDialog::slotViewModeChanged(int index)
     m_viewProps->setViewMode(static_cast<DolphinView::Mode>(index));
     m_isDirty = true;
 
-    m_additionalInfo->setEnabled(m_viewProps->viewMode() == DolphinView::IconsView);
+    const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView);
+    m_showInGroups->setEnabled(iconsViewEnabled);
+    m_additionalInfo->setEnabled(iconsViewEnabled);
 }
 
 void ViewPropertiesDialog::slotSortingChanged(int index)
@@ -228,11 +261,17 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
 
 void ViewPropertiesDialog::slotSortOrderChanged(int index)
 {
-    Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
+    const Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 
+void ViewPropertiesDialog::slotCategorizedSortingChanged()
+{
+    m_viewProps->setCategorizedSorting(m_showInGroups->isChecked());
+    m_isDirty = true;
+}
+
 void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
 {
     KFileItemDelegate::AdditionalInformation info = KFileItemDelegate::NoInformation;
@@ -307,6 +346,7 @@ void ViewPropertiesDialog::applyViewProperties()
     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());