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 9f0a2e27c7b634a55220f7ef031162864b7e7df7..cd4490aadf386dfc7a547fc0b49d94eaeabd4dac 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -19,12 +19,19 @@
  ***************************************************************************/
 
 #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 <nepomuk/resourcemanager.h>
+#endif

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


@@ -52,12 +59,12 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     m_dolphinView(dolphinView),
     m_viewProps(0),
     m_viewMode(0),
     m_dolphinView(dolphinView),
     m_viewProps(0),
     m_viewMode(0),

+    m_sortOrder(0),

     m_sorting(0),
     m_sorting(0),

-    m_descendingAction(0),
-    m_showInGroupsAction(0),
-    m_additionalInfo(0),

     m_showPreview(0),
     m_showPreview(0),

+    m_showInGroups(0),

     m_showHiddenFiles(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)


@@ -65,7 +72,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
 
     Q_ASSERT(dolphinView != 0);
     const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps();
 

-    setCaption(i18n("View Properties"));
+    setCaption(i18nc("@title:window", "View Properties"));

     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
 
     const KUrl& url = dolphinView->url();
     setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply);
 
     const KUrl& url = dolphinView->url();


@@ -78,73 +85,63 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
     QWidget* propsBox = main;
     if (!useGlobalViewProps) {
     // create 'Properties' group containing view mode, sorting, sort order and show hidden files
     QWidget* propsBox = main;
     if (!useGlobalViewProps) {

-        propsBox = new QGroupBox(i18n("Properties"), main);
+        propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);

     }
 
     }
 

-    QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox);
+    QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);

     m_viewMode = new QComboBox(propsBox);
     m_viewMode = new QComboBox(propsBox);

-    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);
+    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"));

 
 

-    QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox);
+    QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox);

     QWidget* sortingBox = new QWidget(propsBox);
 
     QWidget* sortingBox = new QWidget(propsBox);
 

-    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());
-
-    QPushButton* sortFlagsButton = new QPushButton(KIcon("configure"), QString(), sortingBox);
-    sortFlagsButton->setMenu(sortingFlagsMenu);
+    m_sortOrder = new QComboBox(sortingBox);
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending"));
+    m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending"));

 
     m_sorting = new QComboBox(sortingBox);
 
     m_sorting = new QComboBox(sortingBox);

-    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"));
-    m_sorting->setCurrentIndex(m_viewProps->sorting());
+    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
+    // 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();
     sortingLayout->setMargin(0);
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
     sortingLayout->setMargin(0);

+    sortingLayout->addWidget(m_sortOrder);

     sortingLayout->addWidget(m_sorting);
     sortingLayout->addWidget(m_sorting);

-    sortingLayout->addWidget(sortFlagsButton);

     sortingBox->setLayout(sortingLayout);
 
     sortingBox->setLayout(sortingLayout);
 

-    QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox);
-    m_additionalInfo = new QComboBox(propsBox);
-    m_additionalInfo->addItem(i18n("No Information"), KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18n("Type"), KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18n("Size"), KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime);
-    const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo());
-    m_additionalInfo->setCurrentIndex(addInfoIndex);
-    m_additionalInfo->setEnabled(iconsViewEnabled);
-
-    m_showPreview = new QCheckBox(i18n("Show preview"), propsBox);
-    m_showPreview->setChecked(m_viewProps->showPreview());
+    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_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox);
-    m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
+    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_showPreview, 2, 0);
+    propsBoxLayout->addWidget(m_showInGroups, 3, 0);

     propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);
     propsBoxLayout->addWidget(m_showHiddenFiles, 4, 0);

+    propsBoxLayout->addWidget(m_additionalInfo, 5, 0);

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


@@ -152,14 +149,14 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotViewModeChanged(int)));
     connect(m_sorting, SIGNAL(activated(int)),
             this, SLOT(slotSortingChanged(int)));
             this, SLOT(slotViewModeChanged(int)));
     connect(m_sorting, SIGNAL(activated(int)),
             this, SLOT(slotSortingChanged(int)));

-    connect(m_descendingAction, SIGNAL(changed()),
-            this, SLOT(slotSortOrderChanged()));
-    connect(m_showInGroupsAction, SIGNAL(changed()),
-            this, SLOT(slotCategorizedSortingChanged()));
+    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_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()));
 


@@ -170,12 +167,15 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     // for each directory:
     if (!useGlobalViewProps) {
         // create 'Apply View Properties To' group
     // for each directory:
     if (!useGlobalViewProps) {
         // create 'Apply View Properties To' group

-        QGroupBox* applyBox = new QGroupBox(i18n("Apply View Properties To"), main);
+        QGroupBox* applyBox = new QGroupBox(i18nc("@title:group", "Apply View Properties To"), main);

 
 

-        m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), applyBox);
+        m_applyToCurrentFolder = new QRadioButton(i18nc("@option:radio Apply View Properties To",
+                                                        "Current folder"), applyBox);

         m_applyToCurrentFolder->setChecked(true);
         m_applyToCurrentFolder->setChecked(true);

-        m_applyToSubFolders = new QRadioButton(i18n("Current folder including all sub folders"), applyBox);
-        m_applyToAllFolders = new QRadioButton(i18n("All folders"), applyBox);
+        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);
 
         QButtonGroup* applyGroup = new QButtonGroup(this);
         applyGroup->addButton(m_applyToCurrentFolder);


@@ -187,7 +187,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         applyBoxLayout->addWidget(m_applyToSubFolders);
         applyBoxLayout->addWidget(m_applyToAllFolders);
 
         applyBoxLayout->addWidget(m_applyToSubFolders);
         applyBoxLayout->addWidget(m_applyToAllFolders);
 

-        m_useAsDefault = new QCheckBox(i18n("Use as default for new folders"), main);
+        m_useAsDefault = new QCheckBox(i18nc("@option:check", "Use as default for new folders"), main);

 
         topLayout->addWidget(applyBox);
         topLayout->addWidget(m_useAsDefault);
 
         topLayout->addWidget(applyBox);
         topLayout->addWidget(m_useAsDefault);


@@ -208,6 +208,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                                     "ViewPropertiesDialog");
     restoreDialogSize(dialogConfig);
     const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
                                     "ViewPropertiesDialog");
     restoreDialogSize(dialogConfig);

+
+    loadSettings();

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


@@ -218,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()


@@ -237,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_showInGroupsAction->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)


@@ -249,31 +251,16 @@ void ViewPropertiesDialog::slotSortingChanged(int index)
     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 

-void ViewPropertiesDialog::slotSortOrderChanged()
+void ViewPropertiesDialog::slotSortOrderChanged(int index)

 {
 {

-    Qt::SortOrder sortOrder = m_descendingAction->isChecked() ?
-                              Qt::DescendingOrder :
-                              Qt::AscendingOrder;
+    const Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder;

     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::slotCategorizedSortingChanged()
 {
     m_viewProps->setSortOrder(sortOrder);
     m_isDirty = true;
 }
 
 void ViewPropertiesDialog::slotCategorizedSortingChanged()
 {

-    m_viewProps->setCategorizedSorting(m_showInGroupsAction->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_viewProps->setCategorizedSorting(m_showInGroups->isChecked());

     m_isDirty = true;
 }
 
     m_isDirty = true;
 }
 


@@ -296,13 +283,35 @@ 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 &&
                                    (m_applyToSubFolders != 0) &&
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
 void ViewPropertiesDialog::applyViewProperties()
 {
     const bool applyToSubFolders = m_isDirty &&
                                    (m_applyToSubFolders != 0) &&
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {

-        const QString text(i18n("The view properties of all sub folders will be changed. Do you want to continue?"));
+        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;
         }
         if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
             return;
         }


@@ -318,7 +327,7 @@ void ViewPropertiesDialog::applyViewProperties()
                                    (m_applyToAllFolders != 0) &&
                                    m_applyToAllFolders->isChecked();
     if (applyToAllFolders) {
                                    (m_applyToAllFolders != 0) &&
                                    m_applyToAllFolders->isChecked();
     if (applyToAllFolders) {

-        const QString text(i18n("The view properties of all folders will be changed. Do you want to continue?"));
+        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;
         }


@@ -345,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.


@@ -360,4 +369,26 @@ void ViewPropertiesDialog::applyViewProperties()
     }
 }
 
     }
 }
 

+void ViewPropertiesDialog::loadSettings()
+{
+    // load view mode
+    const int index = static_cast<int>(m_viewProps->viewMode());
+    m_viewMode->setCurrentIndex(index);
+
+    // 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());
+
+    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());
+    m_showInGroups->setEnabled(index == DolphinView::IconsView); // only the icons view supports categorized sorting
+
+    m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles());
+}
+

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