use a smaller step size when using the scroll wheel

[dolphin.git] / src / viewpropertiesdialog.cpp

diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp
index 36fe0a9542e393cf376a002cf1895cdeae7ea4f9..9302ba138f1e733fc689c4504cae89d09bdaec6c 100644 (file)
--- a/src/viewpropertiesdialog.cpp
+++ b/src/viewpropertiesdialog.cpp
@@ -19,12 +19,15 @@
  ***************************************************************************/
 
 #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 "dolphinview.h"
 #include "dolphinsettings.h"
 #include "dolphinsortfilterproxymodel.h"
 #include "dolphin_generalsettings.h"

+#include "dolphin_iconsmodesettings.h"

 #include "viewproperties.h"
 #include "viewproperties.h"

+#include "viewpropsprogressinfo.h"

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


@@ -38,11 +41,11 @@
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>
 #include <kmessagebox.h>
 #include <kstandarddirs.h>
 #include <kurl.h>

+#include <kcombobox.h>

 
 #include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>
 
 #include <QAction>
 #include <QButtonGroup>
 #include <QCheckBox>

-#include <QComboBox>

 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QGridLayout>
 #include <QGroupBox>
 #include <QLabel>


@@ -59,12 +62,13 @@ 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_applyToCurrentFolder(0),
     m_applyToSubFolders(0),

+    m_applyToAllFolders(0),

     m_useAsDefault(0)
 {
     Q_ASSERT(dolphinView != 0);
     m_useAsDefault(0)
 {
     Q_ASSERT(dolphinView != 0);


@@ -86,20 +90,22 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
         propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);
     }
 
         propsBox = new QGroupBox(i18nc("@title:group", "Properties"), main);
     }
 

-    QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsBox);
-    m_viewMode = new QComboBox(propsBox);
-    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"));
+    QWidget* propsGrid = new QWidget();
+
+    QLabel* viewModeLabel = new QLabel(i18nc("@label:listbox", "View mode:"), propsGrid);
+    m_viewMode = new KComboBox(propsGrid);
+    m_viewMode->addItem(KIcon("view-list-icons"), i18nc("@item:inlistbox", "Icons"));
+    m_viewMode->addItem(KIcon("view-list-details"), i18nc("@item:inlistbox", "Details"));
+    m_viewMode->addItem(KIcon("view-file-columns"), i18nc("@item:inlistbox", "Column"));

 
 

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

 
 

-    m_sortOrder = new QComboBox(sortingBox);
-    m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending"));
-    m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending"));
+    m_sortOrder = new KComboBox(sortingBox);
+    m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Ascending"));
+    m_sortOrder->addItem(i18nc("@item:inlistbox Sort", "Descending"));

 
 

-    m_sorting = new QComboBox(sortingBox);
+    m_sorting = new KComboBox(sortingBox);

     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 Name"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Size"));
     m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Date"));


@@ -108,11 +114,19 @@ 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
 #endif

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

 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
     sortingLayout->setMargin(0);
 
     QHBoxLayout* sortingLayout = new QHBoxLayout();
     sortingLayout->setMargin(0);


@@ -120,31 +134,18 @@ 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);
-    m_additionalInfo = new QComboBox(propsBox);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "No Information"),
-                              KFileItemDelegate::NoInformation);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Type"),
-                              KFileItemDelegate::FriendlyMimeType);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Size"),
-                              KFileItemDelegate::Size);
-    m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info", "Date"),
-                              KFileItemDelegate::ModificationTime);
+    QGridLayout* propsGridLayout = new QGridLayout(propsGrid);
+    propsGridLayout->addWidget(viewModeLabel, 0, 0, Qt::AlignRight);
+    propsGridLayout->addWidget(m_viewMode, 0, 1);
+    propsGridLayout->addWidget(sortingLabel, 1, 0, Qt::AlignRight);
+    propsGridLayout->addWidget(sortingBox, 1, 1);

 
 

-    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);
-
-    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);
+    QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
+    propsBoxLayout->addWidget(propsGrid);
+    propsBoxLayout->addWidget(m_showPreview);
+    propsBoxLayout->addWidget(m_showInGroups);
+    propsBoxLayout->addWidget(m_showHiddenFiles);
+    propsBoxLayout->addWidget(m_additionalInfo);

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


@@ -154,8 +155,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) :
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));
             this, SLOT(slotSortingChanged(int)));
     connect(m_sortOrder, SIGNAL(activated(int)),
             this, SLOT(slotSortOrderChanged(int)));

-    connect(m_additionalInfo, SIGNAL(activated(int)),
-            this, SLOT(slotAdditionalInfoChanged(int)));
+    connect(m_additionalInfo, SIGNAL(clicked()),
+            this, SLOT(configureAdditionalInfo()));

     connect(m_showPreview, SIGNAL(clicked()),
             this, SLOT(slotShowPreviewChanged()));
     connect(m_showInGroups, SIGNAL(clicked()),
     connect(m_showPreview, SIGNAL(clicked()),
             this, SLOT(slotShowPreviewChanged()));
     connect(m_showInGroups, SIGNAL(clicked()),


@@ -223,7 +224,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()


@@ -242,9 +243,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)


@@ -267,19 +268,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();


@@ -299,10 +287,36 @@ 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()
 {
 void ViewPropertiesDialog::applyViewProperties()
 {

-    const bool applyToSubFolders = m_isDirty &&
-                                   (m_applyToSubFolders != 0) &&
+    // if nothing changed in the dialog, we have nothing to apply
+    if (!m_isDirty) {
+        return;
+    }
+
+    const bool applyToSubFolders = (m_applyToSubFolders != 0) &&

                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));
                                    m_applyToSubFolders->isChecked();
     if (applyToSubFolders) {
         const QString text(i18nc("@info", "The view properties of all sub folders will be changed. Do you want to continue?"));


@@ -311,15 +325,34 @@ void ViewPropertiesDialog::applyViewProperties()
         }
 
         ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView,
         }
 
         ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView,

-                                      m_dolphinView->url(),
-                                      *m_viewProps);
+                                                                m_dolphinView->url(),
+                                                                *m_viewProps);
+        info->setAttribute(Qt::WA_DeleteOnClose);

         info->setWindowModality(Qt::NonModal);
         info->show();
     }
 
         info->setWindowModality(Qt::NonModal);
         info->show();
     }
 

-    const bool applyToAllFolders = m_isDirty &&
-                                   (m_applyToAllFolders != 0) &&
+    const bool applyToAllFolders = (m_applyToAllFolders != 0) &&

                                    m_applyToAllFolders->isChecked();
                                    m_applyToAllFolders->isChecked();

+
+    // If the user selected 'Apply To All Folders' the view properties implicitely
+    // are also used as default for new folders.
+    const bool useAsDefault = applyToAllFolders ||
+                              ((m_useAsDefault != 0) && m_useAsDefault->isChecked());
+    if (useAsDefault) {
+        // 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.
+        GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+        Q_ASSERT(!settings->globalViewProps());
+
+        settings->setGlobalViewProps(true);
+        ViewProperties defaultProps(m_dolphinView->url());
+        defaultProps.setDirProperties(*m_viewProps);
+        defaultProps.save();
+        settings->setGlobalViewProps(false);
+    }
+

     if (applyToAllFolders) {
         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) {
     if (applyToAllFolders) {
         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) {


@@ -330,14 +363,8 @@ void ViewPropertiesDialog::applyViewProperties()
         // all existing viewproperties invalid, as they have a smaller time stamp.
         GeneralSettings* settings = DolphinSettings::instance().generalSettings();
         settings->setViewPropsTimestamp(QDateTime::currentDateTime());
         // all existing viewproperties invalid, as they have a smaller time stamp.
         GeneralSettings* settings = DolphinSettings::instance().generalSettings();
         settings->setViewPropsTimestamp(QDateTime::currentDateTime());

-
-        // This is also a good chance to make a cleanup of all mirrored view properties:
-        const KUrl mirroredDir = ViewProperties::mirroredDirectory();
-        KIO::NetAccess::del(mirroredDir, this);

     }
 
     }
 

-    m_viewProps->save();
-

     m_dolphinView->setMode(m_viewProps->viewMode());
     m_dolphinView->setSorting(m_viewProps->sorting());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());
     m_dolphinView->setMode(m_viewProps->viewMode());
     m_dolphinView->setSorting(m_viewProps->sorting());
     m_dolphinView->setSortOrder(m_viewProps->sortOrder());


@@ -346,21 +373,9 @@ void ViewPropertiesDialog::applyViewProperties()
     m_dolphinView->setShowPreview(m_viewProps->showPreview());
     m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles());
 
     m_dolphinView->setShowPreview(m_viewProps->showPreview());
     m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles());
 

-    m_isDirty = false;
-
-    if (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.
-        GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-        Q_ASSERT(!settings->globalViewProps());
+    m_viewProps->save();

 
 

-        settings->setGlobalViewProps(true);
-        ViewProperties defaultProps(m_dolphinView->url());
-        defaultProps.setDirProperties(*m_viewProps);
-        defaultProps.save();
-        settings->setGlobalViewProps(false);
-    }
+    m_isDirty = false;

 }
 
 void ViewPropertiesDialog::loadSettings()
 }
 
 void ViewPropertiesDialog::loadSettings()


@@ -368,24 +383,21 @@ 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);
+    const bool enabled = (index == DolphinView::DetailsView) ||
+                         (index == DolphinView::IconsView);
+    m_additionalInfo->setEnabled(enabled);

 
     // 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());
 }