Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 49d42f4ffd06b9eb7c38d0d54982c0d2eacc2880..cd4490aadf386dfc7a547fc0b49d94eaeabd4dac 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -19,12 +19,14 @@
  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"
  ***************************************************************************/
 
 #include "viewpropertiesdialog.h"

-#include "viewpropsprogressinfo.h"
+
+#include "additionalinfodialog.h"

 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"
 #include "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"
 #include "viewproperties.h"

+#include "viewpropsprogressinfo.h"

 
 #include <config-nepomuk.h>
 #ifdef HAVE_NEPOMUK
 
 #include <config-nepomuk.h>
 #ifdef HAVE_NEPOMUK


@@ -59,10 +61,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_viewMode(0),
     m_sortOrder(0),
     m_sorting(0),
     m_viewMode(0),
     m_sortOrder(0),
     m_sorting(0),

-    m_additionalInfo(0),

     m_showPreview(0),
     m_showInGroups(0),
     m_showHiddenFiles(0),
     m_showPreview(0),
     m_showInGroups(0),
     m_showHiddenFiles(0),

+    m_additionalInfo(0),

     m_applyToCurrentFolder(0),
     m_applyToSubFolders(0),
     m_useAsDefault(0)
     m_applyToCurrentFolder(0),
     m_applyToSubFolders(0),
     m_useAsDefault(0)


@@ -108,10 +110,13 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Group"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Type"));
 #ifdef HAVE_NEPOMUK
     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"));
-    }
+    // TODO: Hided "sort by rating" and "sort by tags" as without caching the performance
+    // is too slow currently (Nepomuk will support caching in future releases).
+    //
+    // if (!Nepomuk::ResourceManager::instance()->init()) {
+    //    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Rating"));
+    //    m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Tags"));
+    // }

 #endif
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
 #endif
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();


@@ -120,32 +125,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     sortingLayout->addWidget(m_sorting);
     sortingBox->setLayout(sortingLayout);
 
     sortingLayout->addWidget(m_sorting);
     sortingBox->setLayout(sortingLayout);
 

-    QLabel* additionalInfoLabel = new QLabel(i18nc("@label:listbox", "Additional information:"), propsBox);
-    // TODO: the additional information can be shown in parallel since today
-    m_additionalInfo = new QComboBox(propsBox);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
-                              KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
-                              KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
-                              KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "--- TODO ---"),
-                              KFileItemDelegate::ModificationTime);
-

     m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox);
     m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in Groups"), propsBox);
     m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files"), propsBox);
 
     m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox);
     m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in Groups"), propsBox);
     m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "Show hidden files"), propsBox);
 

+    m_additionalInfo = new QPushButton(i18nc("@action:button", "Additional Information"), propsBox);
+    connect(m_additionalInfo, SIGNAL(clicked()),
+            this, SLOT(configureAdditionalInfo()));
+

     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);
     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);
+    propsBoxLayout->addWidget(m_showPreview, 2, 0);
+    propsBoxLayout->addWidget(m_showInGroups, 3, 0);
+    propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);
+    propsBoxLayout->addWidget(m_additionalInfo, 5, 0);

 
     topLayout->addWidget(propsBox);
 
 
     topLayout->addWidget(propsBox);
 


@@ -224,7 +220,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog()
 
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "ViewPropertiesDialog");
 
     KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                               "ViewPropertiesDialog");

-    saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+    saveDialogSize(dialogConfig, KConfigBase::Persistent);

 }
 
 void ViewPropertiesDialog::slotOk()
 }
 
 void ViewPropertiesDialog::slotOk()


@@ -243,9 +239,9 @@ void ViewPropertiesDialog::slotViewModeChanged(int index)
     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);
+    const DolphinView::Mode mode = m_viewProps->viewMode();
+    m_showInGroups->setEnabled(mode == DolphinView::IconsView);
+    m_additionalInfo->setEnabled(mode != DolphinView::ColumnView);

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


@@ -268,19 +264,6 @@ void ViewPropertiesDialog::slotCategorizedSortingChanged()
     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
-{
-    KFileItemDelegate::InformationList info;
-    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;
-}
-

 void ViewPropertiesDialog::slotShowPreviewChanged()
 {
     const bool show = m_showPreview->isChecked();
 void ViewPropertiesDialog::slotShowPreviewChanged()
 {
     const bool show = m_showPreview->isChecked();


@@ -300,6 +283,28 @@ void ViewPropertiesDialog::markAsDirty()
     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

+void ViewPropertiesDialog::configureAdditionalInfo()
+{
+    KFileItemDelegate::InformationList info = m_viewProps->additionalInfo();
+    const bool useDefaultInfo = (m_viewProps->viewMode() == DolphinView::DetailsView) &&
+                                (info.isEmpty() || info.contains(KFileItemDelegate::NoInformation));
+    if (useDefaultInfo) {
+        // Using the details view without any additional information (-> additional column)
+        // makes no sense and leads to a usability problem as no viewport area is available
+        // anymore. Hence as fallback provide at least a size and date column.
+        info.clear();
+        info.append(KFileItemDelegate::Size);
+        info.append(KFileItemDelegate::ModificationTime);
+        m_viewProps->setAdditionalInfo(info);
+    }
+
+    AdditionalInfoDialog dialog(this, info);
+    if (dialog.exec() == QDialog::Accepted) {
+        m_viewProps->setAdditionalInfo(dialog.additionalInfo());
+        m_isDirty = true;
+    }
+}
+

 void ViewPropertiesDialog::applyViewProperties()
 {
     const bool applyToSubFolders = m_isDirty &&
 void ViewPropertiesDialog::applyViewProperties()
 {
     const bool applyToSubFolders = m_isDirty &&


@@ -349,7 +354,7 @@ void ViewPropertiesDialog::applyViewProperties()
 
     m_isDirty = false;
 
 
     m_isDirty = false;
 

-    if (m_useAsDefault->isChecked()) {
+    if (m_useAsDefault && 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.
         // 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.


@@ -369,24 +374,19 @@ void ViewPropertiesDialog::loadSettings()
     // load view mode
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);
     // load view mode
     const int index = static_cast<int>(m_viewProps->viewMode());
     m_viewMode->setCurrentIndex(index);

-    const bool iconsViewEnabled = (index == DolphinView::IconsView);

 
     // load sort order and sorting
     const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIndex);
     m_sorting->setCurrentIndex(m_viewProps->sorting());
 
 
     // load sort order and sorting
     const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1;
     m_sortOrder->setCurrentIndex(sortOrderIndex);
     m_sorting->setCurrentIndex(m_viewProps->sorting());
 

-    // load additional info
-    KFileItemDelegate::InformationList info = m_viewProps->additionalInfo();
-    const int addInfoIndex = m_additionalInfo->findData(info.isEmpty() ? KFileItemDelegate::NoInformation : info.first());
-    m_additionalInfo->setCurrentIndex(addInfoIndex);
-    m_additionalInfo->setEnabled(iconsViewEnabled);
+    m_additionalInfo->setEnabled(index != DolphinView::ColumnView);

 
     // load show preview, show in groups and show hidden files settings
     m_showPreview->setChecked(m_viewProps->showPreview());
 
     m_showInGroups->setChecked(m_viewProps->categorizedSorting());
 
     // load show preview, show in groups and show hidden files settings
     m_showPreview->setChecked(m_viewProps->showPreview());
 
     m_showInGroups->setChecked(m_viewProps->categorizedSorting());

-    m_showInGroups->setEnabled(iconsViewEnabled); // only the icons view supports categorized sorting
+    m_showInGroups->setEnabled(index == DolphinView::IconsView); // only the icons view supports categorized sorting

 
     m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
 }
 
     m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
 }