X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d6f4e13fbdb286b63a7eea5b72a37a69c18c2b48..da795d20e2f2fa57ac9cafdffcfac4d092d8eaea:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 41e9cfac5..34adabaf5 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -34,14 +34,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : KDialog(dolphinView), @@ -51,6 +51,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_viewMode(0), m_sorting(0), m_sortOrder(0), + m_categorizedSorting(0), m_additionalInfo(0), m_showPreview(0), m_showHiddenFiles(0), @@ -81,9 +82,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_viewMode = new QComboBox(propsBox); m_viewMode->addItem(KIcon("view-icon"), i18n("Icons")); m_viewMode->addItem(KIcon("fileview-text"), i18n("Details")); - m_viewMode->addItem(KIcon("view-tree"), i18n("Column")); + 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); QWidget* sortingBox = new QWidget(propsBox); @@ -91,9 +93,15 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_sortOrder = new QComboBox(sortingBox); m_sortOrder->addItem(i18n("Ascending")); m_sortOrder->addItem(i18n("Descending")); - const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::Ascending) ? 0 : 1; + const int sortOrderIdx = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1; m_sortOrder->setCurrentIndex(sortOrderIdx); + m_categorizedSorting = new QComboBox(sortingBox); + m_categorizedSorting->addItem(i18n("Ungrouped")); + m_categorizedSorting->addItem(i18n("Show in Groups")); + m_categorizedSorting->setCurrentIndex(m_viewProps->categorizedSorting() ? 1 : 0); + m_categorizedSorting->setEnabled(iconsViewEnabled); + m_sorting = new QComboBox(sortingBox); m_sorting->addItem("By Name"); m_sorting->addItem("By Size"); @@ -101,12 +109,14 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : 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()); QHBoxLayout* sortingLayout = new QHBoxLayout(); sortingLayout->setMargin(0); sortingLayout->addWidget(m_sortOrder); sortingLayout->addWidget(m_sorting); + sortingLayout->addWidget(m_categorizedSorting); sortingBox->setLayout(sortingLayout); QLabel* additionalInfoLabel = new QLabel(i18n("Additional information:"), propsBox); @@ -117,7 +127,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_additionalInfo->addItem(i18n("Date"), KFileItemDelegate::ModificationTime); const int addInfoIndex = m_additionalInfo->findData(m_viewProps->additionalInfo()); m_additionalInfo->setCurrentIndex(addInfoIndex); - m_additionalInfo->setEnabled(m_viewProps->viewMode() == DolphinView::IconsView); + m_additionalInfo->setEnabled(iconsViewEnabled); m_showPreview = new QCheckBox(i18n("Show preview"), propsBox); m_showPreview->setChecked(m_viewProps->showPreview()); @@ -143,6 +153,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(slotSortingChanged(int))); connect(m_sortOrder, SIGNAL(activated(int)), this, SLOT(slotSortOrderChanged(int))); + connect(m_categorizedSorting, SIGNAL(activated(int)), + this, SLOT(slotCategorizedSortingChanged(int))); connect(m_additionalInfo, SIGNAL(activated(int)), this, SLOT(slotAdditionalInfoChanged(int))); connect(m_showPreview, SIGNAL(clicked()), @@ -156,13 +168,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); @@ -191,6 +203,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : main->setLayout(topLayout); setMainWidget(main); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "ViewPropertiesDialog"); + restoreDialogSize(dialogConfig); } ViewPropertiesDialog::~ViewPropertiesDialog() @@ -198,6 +214,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() @@ -216,7 +236,9 @@ void ViewPropertiesDialog::slotViewModeChanged(int index) m_viewProps->setViewMode(static_cast(index)); m_isDirty = true; - m_additionalInfo->setEnabled(m_viewProps->viewMode() == DolphinView::IconsView); + const bool iconsViewEnabled = (m_viewProps->viewMode() == DolphinView::IconsView); + m_categorizedSorting->setEnabled(iconsViewEnabled); + m_additionalInfo->setEnabled(iconsViewEnabled); } void ViewPropertiesDialog::slotSortingChanged(int index) @@ -228,19 +250,25 @@ void ViewPropertiesDialog::slotSortingChanged(int index) void ViewPropertiesDialog::slotSortOrderChanged(int index) { - Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending; + Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder; m_viewProps->setSortOrder(sortOrder); m_isDirty = true; } +void ViewPropertiesDialog::slotCategorizedSortingChanged(int index) +{ + m_viewProps->setCategorizedSorting(index == 1); + 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; + 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; @@ -277,8 +305,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(); } @@ -307,6 +335,7 @@ 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());