***************************************************************************/
#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 <config-nepomuk.h>
#ifdef HAVE_NEPOMUK
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)
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"));
+ 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);
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();
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"), NoInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Type"), TypeInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Size"), SizeInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Date"), DateInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Type, Size"), TypeInfo | SizeInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Type, Date"), TypeInfo | DateInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Size, Date"), SizeInfo | DateInfo);
- m_additionalInfo->addItem(i18nc("@item:inlistbox Additional info",
- "Type, Size, Date"),TypeInfo | SizeInfo | DateInfo);
-
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);
- 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);
KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"),
"ViewPropertiesDialog");
- saveDialogSize(dialogConfig, KConfigFlags::Persistent);
+ saveDialogSize(dialogConfig, KConfigBase::Persistent);
}
void ViewPropertiesDialog::slotOk()
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)
m_isDirty = true;
}
-void ViewPropertiesDialog::slotAdditionalInfoChanged(int index)
-{
- const int info = m_additionalInfo->itemData(index).toInt();
-
- KFileItemDelegate::InformationList list;
- if (info & TypeInfo) {
- list.append(KFileItemDelegate::FriendlyMimeType);
- }
- if (info & SizeInfo) {
- list.append(KFileItemDelegate::Size);
- }
- if (info & DateInfo) {
- list.append(KFileItemDelegate::ModificationTime);
- }
-
- m_viewProps->setAdditionalInfo(list);
- m_isDirty = true;
-}
-
void ViewPropertiesDialog::slotShowPreviewChanged()
{
const bool show = m_showPreview->isChecked();
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_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.
// 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 additional info
- const KFileItemDelegate::InformationList list = m_viewProps->additionalInfo();
- int info = NoInfo;
- foreach (KFileItemDelegate::Information currentInfo, list) {
- switch (currentInfo) {
- case KFileItemDelegate::FriendlyMimeType:
- info = info | TypeInfo;
- break;
- case KFileItemDelegate::Size:
- info = info | SizeInfo;
- break;
- case KFileItemDelegate::ModificationTime:
- info = info | DateInfo;
- break;
- default:
- break;
- }
- }
-
- const int addInfoIndex = m_additionalInfo->findData(info);
- m_additionalInfo->setCurrentIndex(addInfoIndex);
- m_additionalInfo->setEnabled(iconsViewEnabled);
+ 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(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());
}
projects / dolphin.git / blobdiff