X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bf50ced73473a225d681de6b62bc05571d969664..e92bbbe27ca39a1329ae3f2d6ecae128dd71855b:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index f6578a511..2aa1ced6d 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -26,8 +26,6 @@ #include "dolphin_generalsettings.h" #include "viewproperties.h" -#include - #include #include #include @@ -36,14 +34,17 @@ #include #include +#include #include #include #include #include #include #include +#include +#include #include -#include +#include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : KDialog(dolphinView), @@ -52,14 +53,16 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_viewProps(0), m_viewMode(0), m_sorting(0), - m_sortOrder(0), + m_descendingAction(0), + m_showInGroupsAction(0), + m_additionalInfo(0), m_showPreview(0), m_showHiddenFiles(0), m_applyToCurrentFolder(0), m_applyToSubFolders(0), m_useAsDefault(0) { - assert(dolphinView != 0); + Q_ASSERT(dolphinView != 0); const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps(); setCaption(i18n("View Properties")); @@ -80,27 +83,52 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QLabel* viewModeLabel = new QLabel(i18n("View mode:"), propsBox); m_viewMode = new QComboBox(propsBox); - m_viewMode->addItem(SmallIcon("view_icon"), i18n("Icons")); - m_viewMode->addItem(SmallIcon("view_text"), i18n("Details")); + 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(m_viewProps->viewMode()); m_viewMode->setCurrentIndex(index); + const bool iconsViewEnabled = (index == DolphinView::IconsView); QLabel* sortingLabel = new QLabel(i18n("Sorting:"), propsBox); - m_sorting = new QComboBox(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_sorting = new QComboBox(sortingBox); m_sorting->addItem("By Name"); m_sorting->addItem("By Size"); m_sorting->addItem("By Date"); m_sorting->addItem("By Permissions"); m_sorting->addItem("By Owner"); m_sorting->addItem("By Group"); + m_sorting->addItem("By Type"); m_sorting->setCurrentIndex(m_viewProps->sorting()); - QLabel* sortOrderLabel = new QLabel(i18n("Sort order:"), propsBox); - m_sortOrder = new QComboBox(propsBox); - m_sortOrder->addItem(i18n("Ascending")); - m_sortOrder->addItem(i18n("Descending")); - const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1; - m_sortOrder->setCurrentIndex(sortOrderIdx); + QHBoxLayout* sortingLayout = new QHBoxLayout(); + sortingLayout->setMargin(0); + sortingLayout->addWidget(m_sorting); + sortingLayout->addWidget(sortFlagsButton); + 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()); @@ -111,11 +139,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QGridLayout* propsBoxLayout = new QGridLayout(propsBox); propsBoxLayout->addWidget(viewModeLabel, 0, 0); propsBoxLayout->addWidget(m_viewMode, 0, 1); - propsBoxLayout->addWidget(m_sorting, 1, 1); propsBoxLayout->addWidget(sortingLabel, 1, 0); - propsBoxLayout->addWidget(m_sorting, 1, 1); - propsBoxLayout->addWidget(sortOrderLabel, 2, 0); - propsBoxLayout->addWidget(m_sortOrder, 2, 1); + 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_showHiddenFiles, 4, 0); @@ -125,8 +152,12 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(slotViewModeChanged(int))); connect(m_sorting, SIGNAL(activated(int)), this, SLOT(slotSortingChanged(int))); - connect(m_sortOrder, SIGNAL(activated(int)), - this, SLOT(slotSortOrderChanged(int))); + connect(m_descendingAction, SIGNAL(changed()), + this, SLOT(slotSortOrderChanged())); + connect(m_showInGroupsAction, SIGNAL(changed()), + this, SLOT(slotCategorizedSortingChanged())); + connect(m_additionalInfo, SIGNAL(activated(int)), + this, SLOT(slotAdditionalInfoChanged(int))); connect(m_showPreview, SIGNAL(clicked()), this, SLOT(slotShowPreviewChanged())); connect(m_showHiddenFiles, SIGNAL(clicked()), @@ -138,13 +169,13 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // Only show the following settings if the view properties are remembered // for each directory: if (!useGlobalViewProps) { - // create 'Apply view properties to:' group - QGroupBox* applyBox = new QGroupBox(i18n("Apply view properties to:"), main); + // create 'Apply View Properties To' group + QGroupBox* applyBox = new QGroupBox(i18n("Apply View Properties To"), main); m_applyToCurrentFolder = new QRadioButton(i18n("Current folder"), applyBox); 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_applyToAllFolders = new QRadioButton(i18n("All folders"), applyBox); QButtonGroup* applyGroup = new QButtonGroup(this); applyGroup->addButton(m_applyToCurrentFolder); @@ -173,6 +204,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : main->setLayout(topLayout); setMainWidget(main); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "ViewPropertiesDialog"); + restoreDialogSize(dialogConfig); } ViewPropertiesDialog::~ViewPropertiesDialog() @@ -180,6 +215,10 @@ ViewPropertiesDialog::~ViewPropertiesDialog() m_isDirty = false; delete m_viewProps; m_viewProps = 0; + + KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "ViewPropertiesDialog"); + saveDialogSize(dialogConfig, KConfigFlags::Persistent); } void ViewPropertiesDialog::slotOk() @@ -195,9 +234,12 @@ void ViewPropertiesDialog::slotApply() void ViewPropertiesDialog::slotViewModeChanged(int index) { - assert((index >= 0) && (index <= 2)); m_viewProps->setViewMode(static_cast(index)); m_isDirty = true; + + const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView); + m_showInGroupsAction->setEnabled(iconsViewEnabled); + m_additionalInfo->setEnabled(iconsViewEnabled); } void ViewPropertiesDialog::slotSortingChanged(int index) @@ -207,13 +249,34 @@ void ViewPropertiesDialog::slotSortingChanged(int index) m_isDirty = true; } -void ViewPropertiesDialog::slotSortOrderChanged(int index) +void ViewPropertiesDialog::slotSortOrderChanged() { - Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending; + Qt::SortOrder sortOrder = m_descendingAction->isChecked() ? + Qt::DescendingOrder : + Qt::AscendingOrder; 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_isDirty = true; +} + void ViewPropertiesDialog::slotShowPreviewChanged() { const bool show = m_showPreview->isChecked(); @@ -245,8 +308,8 @@ void ViewPropertiesDialog::applyViewProperties() } ViewPropsProgressInfo* info = new ViewPropsProgressInfo(m_dolphinView, - m_dolphinView->url(), - *m_viewProps); + m_dolphinView->url(), + *m_viewProps); info->setWindowModality(Qt::NonModal); info->show(); } @@ -275,6 +338,8 @@ void ViewPropertiesDialog::applyViewProperties() m_dolphinView->setMode(m_viewProps->viewMode()); m_dolphinView->setSorting(m_viewProps->sorting()); m_dolphinView->setSortOrder(m_viewProps->sortOrder()); + m_dolphinView->setCategorizedSorting(m_viewProps->categorizedSorting()); + m_dolphinView->setAdditionalInfo(m_viewProps->additionalInfo()); m_dolphinView->setShowPreview(m_viewProps->showPreview()); m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles()); @@ -285,7 +350,7 @@ void ViewPropertiesDialog::applyViewProperties() // 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(); - assert(!settings->globalViewProps()); + Q_ASSERT(!settings->globalViewProps()); settings->setGlobalViewProps(true); ViewProperties defaultProps(m_dolphinView->url());