X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8072005fada01d772595ec64adca449134f421e..fe09a37c59f3f326556b31e76974758badcc1dad:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 040e9f6be..fc670e3eb 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -19,12 +19,15 @@ ***************************************************************************/ #include "viewpropertiesdialog.h" -#include "viewpropsprogressinfo.h" + +#include "additionalinfodialog.h" #include "dolphinview.h" #include "dolphinsettings.h" #include "dolphinsortfilterproxymodel.h" #include "dolphin_generalsettings.h" +#include "dolphin_iconsmodesettings.h" #include "viewproperties.h" +#include "viewpropsprogressinfo.h" #include #ifdef HAVE_NEPOMUK @@ -59,10 +62,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_viewMode(0), m_sortOrder(0), m_sorting(0), - m_additionalInfo(0), m_showPreview(0), m_showInGroups(0), m_showHiddenFiles(0), + m_additionalInfo(0), m_applyToCurrentFolder(0), m_applyToSubFolders(0), m_useAsDefault(0) @@ -91,9 +94,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : 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")); - const int index = static_cast(m_viewProps->viewMode()); - m_viewMode->setCurrentIndex(index); - const bool iconsViewEnabled = (index == DolphinView::IconsView); QLabel* sortingLabel = new QLabel(i18nc("@label:listbox", "Sorting:"), propsBox); QWidget* sortingBox = new QWidget(propsBox); @@ -101,8 +101,6 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sortOrder = new QComboBox(sortingBox); m_sortOrder->addItem(i18nc("@item:inlistbox", "Ascending")); m_sortOrder->addItem(i18nc("@item:inlistbox", "Descending")); - const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1; - m_sortOrder->setCurrentIndex(sortOrderIndex); m_sorting = new QComboBox(sortingBox); m_sorting->addItem(i18nc("@item:inlistbox Sort", "By Name")); @@ -113,12 +111,14 @@ 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 - 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 - m_sorting->setCurrentIndex(m_viewProps->sorting()); QHBoxLayout* sortingLayout = new QHBoxLayout(); sortingLayout->setMargin(0); @@ -126,39 +126,23 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : 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); - const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo()); - m_additionalInfo->setCurrentIndex(addInfoIndex); - m_additionalInfo->setEnabled(iconsViewEnabled); - m_showPreview = new QCheckBox(i18nc("@option:check", "Show preview"), propsBox); - m_showPreview->setChecked(m_viewProps->showPreview()); - m_showInGroups = new QCheckBox(i18nc("@option:check", "Show in Groups"), propsBox); - m_showInGroups->setChecked(m_viewProps->categorizedSorting()); - m_showHiddenFiles = new QCheckBox(i18nc("@option:check", "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); - 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); @@ -225,6 +209,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog"); restoreDialogSize(dialogConfig); + + loadSettings(); } ViewPropertiesDialog::~ViewPropertiesDialog() @@ -235,7 +221,7 @@ ViewPropertiesDialog::~ViewPropertiesDialog() KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), "ViewPropertiesDialog"); - saveDialogSize(dialogConfig, KConfigFlags::Persistent); + saveDialogSize(dialogConfig, KConfigBase::Persistent); } void ViewPropertiesDialog::slotOk() @@ -254,9 +240,9 @@ void ViewPropertiesDialog::slotViewModeChanged(int index) m_viewProps->setViewMode(static_cast(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) @@ -279,19 +265,6 @@ void ViewPropertiesDialog::slotCategorizedSortingChanged() 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_isDirty = true; -} - void ViewPropertiesDialog::slotShowPreviewChanged() { const bool show = m_showPreview->isChecked(); @@ -311,6 +284,28 @@ void ViewPropertiesDialog::markAsDirty() 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 && @@ -360,7 +355,7 @@ void ViewPropertiesDialog::applyViewProperties() 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. @@ -375,4 +370,29 @@ void ViewPropertiesDialog::applyViewProperties() } } +void ViewPropertiesDialog::loadSettings() +{ + // load view mode + const int index = static_cast(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()); + + const IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + const bool enabled = (index == DolphinView::DetailsView) || + ((index == DolphinView::IconsView) && settings->showAdditionalInfo()); + 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()); + m_showInGroups->setEnabled(index == DolphinView::IconsView); // only the icons view supports categorized sorting + + m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles()); +} + #include "viewpropertiesdialog.moc"