X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/f768cbd235c069c506ecc7ad01685ce115d0c1d2..051f0b975d9e20e2cb47fced797726c41db635b2:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 4c87397e8..5d7fbc59f 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -34,14 +34,17 @@ #include #include +#include #include #include #include #include #include #include +#include +#include #include -#include +#include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : KDialog(dolphinView), @@ -49,10 +52,11 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_dolphinView(dolphinView), m_viewProps(0), m_viewMode(0), - m_sorting(0), m_sortOrder(0), + m_sorting(0), m_additionalInfo(0), m_showPreview(0), + m_showInGroups(0), m_showHiddenFiles(0), m_applyToCurrentFolder(0), m_applyToSubFolders(0), @@ -79,55 +83,66 @@ 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("fileview-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); - 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->setCurrentIndex(m_viewProps->sorting()); + QWidget* sortingBox = new QWidget(propsBox); - QLabel* sortOrderLabel = new QLabel(i18n("Sort order:"), propsBox); - m_sortOrder = new QComboBox(propsBox); + 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; - m_sortOrder->setCurrentIndex(sortOrderIdx); + const int sortOrderIndex = (m_viewProps->sortOrder() == Qt::AscendingOrder) ? 0 : 1; + m_sortOrder->setCurrentIndex(sortOrderIndex); + + m_sorting = new QComboBox(sortingBox); + m_sorting->addItem(i18n("By Name")); + m_sorting->addItem(i18n("By Size")); + m_sorting->addItem(i18n("By Date")); + m_sorting->addItem(i18n("By Permissions")); + m_sorting->addItem(i18n("By Owner")); + m_sorting->addItem(i18n("By Group")); + m_sorting->addItem(i18n("By Type")); + m_sorting->setCurrentIndex(m_viewProps->sorting()); + + QHBoxLayout* sortingLayout = new QHBoxLayout(); + sortingLayout->setMargin(0); + sortingLayout->addWidget(m_sortOrder); + sortingLayout->addWidget(m_sorting); + 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("MIME Type"), KFileItemDelegate::FriendlyMimeType); + 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(m_viewProps->viewMode() == DolphinView::IconsView); + m_additionalInfo->setEnabled(iconsViewEnabled); m_showPreview = new QCheckBox(i18n("Show preview"), propsBox); m_showPreview->setChecked(m_viewProps->showPreview()); + m_showInGroups = new QCheckBox(i18n("Show in Groups"), propsBox); + m_showInGroups->setChecked(m_viewProps->categorizedSorting()); + m_showHiddenFiles = new QCheckBox(i18n("Show hidden files"), propsBox); m_showHiddenFiles->setChecked(m_viewProps->showHiddenFiles()); 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(additionalInfoLabel, 3, 0); - propsBoxLayout->addWidget(m_additionalInfo, 3, 1); - propsBoxLayout->addWidget(m_showPreview, 4, 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); topLayout->addWidget(propsBox); @@ -142,6 +157,8 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(slotAdditionalInfoChanged(int))); connect(m_showPreview, SIGNAL(clicked()), this, SLOT(slotShowPreviewChanged())); + connect(m_showInGroups, SIGNAL(clicked()), + this, SLOT(slotCategorizedSortingChanged())); connect(m_showHiddenFiles, SIGNAL(clicked()), this, SLOT(slotShowHiddenFilesChanged())); @@ -151,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); @@ -186,6 +203,10 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : main->setLayout(topLayout); setMainWidget(main); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "ViewPropertiesDialog"); + restoreDialogSize(dialogConfig); } ViewPropertiesDialog::~ViewPropertiesDialog() @@ -193,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() @@ -208,11 +233,12 @@ void ViewPropertiesDialog::slotApply() void ViewPropertiesDialog::slotViewModeChanged(int index) { - Q_ASSERT((index >= 0) && (index <= 1)); 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_showInGroups->setEnabled(iconsViewEnabled); + m_additionalInfo->setEnabled(iconsViewEnabled); } void ViewPropertiesDialog::slotSortingChanged(int index) @@ -224,19 +250,25 @@ void ViewPropertiesDialog::slotSortingChanged(int index) void ViewPropertiesDialog::slotSortOrderChanged(int index) { - Qt::SortOrder sortOrder = (index == 0) ? Qt::Ascending : Qt::Descending; + const Qt::SortOrder sortOrder = (index == 0) ? Qt::AscendingOrder : Qt::DescendingOrder; m_viewProps->setSortOrder(sortOrder); m_isDirty = true; } +void ViewPropertiesDialog::slotCategorizedSortingChanged() +{ + m_viewProps->setCategorizedSorting(m_showInGroups->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; + 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; @@ -273,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(); } @@ -303,6 +335,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());