X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/13f0a26ccd4c2ac8429a7701b9cbc49f2c855f2d..051f0b975d9e20e2cb47fced797726c41db635b2:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 8cedb73cb..5d7fbc59f 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -23,23 +23,28 @@ #include "dolphinview.h" #include "dolphinsettings.h" #include "dolphinsortfilterproxymodel.h" -#include "generalsettings.h" +#include "dolphin_generalsettings.h" #include "viewproperties.h" -#include - +#include #include #include +#include #include +#include +#include +#include #include #include #include #include #include #include +#include +#include #include -#include +#include ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : KDialog(dolphinView), @@ -47,15 +52,18 @@ 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), m_useAsDefault(0) { - assert(dolphinView != 0); + Q_ASSERT(dolphinView != 0); + const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps(); setCaption(i18n("View Properties")); setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply); @@ -68,48 +76,74 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : QVBoxLayout* topLayout = new QVBoxLayout(); // create 'Properties' group containing view mode, sorting, sort order and show hidden files - QGroupBox* propsBox = new QGroupBox(i18n("Properties"), main); + QWidget* propsBox = main; + if (!useGlobalViewProps) { + propsBox = new QGroupBox(i18n("Properties"), main); + } 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); - 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("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()); + 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(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); + propsBoxLayout->addWidget(m_showInGroups, 4, 0); + propsBoxLayout->addWidget(m_showHiddenFiles, 5, 0); topLayout->addWidget(propsBox); @@ -119,8 +153,12 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(slotSortingChanged(int))); connect(m_sortOrder, SIGNAL(activated(int)), this, SLOT(slotSortOrderChanged(int))); + connect(m_additionalInfo, SIGNAL(activated(int)), + 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())); @@ -129,21 +167,24 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // Only show the following settings if the view properties are remembered // for each directory: - if (!DolphinSettings::instance().generalSettings()->globalViewProps()) { - // create 'Apply view properties to:' group - QGroupBox* applyBox = new QGroupBox(i18n("Apply view properties to:"), main); + if (!useGlobalViewProps) { + // 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); QButtonGroup* applyGroup = new QButtonGroup(this); applyGroup->addButton(m_applyToCurrentFolder); applyGroup->addButton(m_applyToSubFolders); + applyGroup->addButton(m_applyToAllFolders); QVBoxLayout* applyBoxLayout = new QVBoxLayout(applyBox); applyBoxLayout->addWidget(m_applyToCurrentFolder); applyBoxLayout->addWidget(m_applyToSubFolders); + applyBoxLayout->addWidget(m_applyToAllFolders); m_useAsDefault = new QCheckBox(i18n("Use as default for new folders"), main); @@ -154,12 +195,18 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : this, SLOT(markAsDirty())); connect(m_applyToSubFolders, SIGNAL(clicked()), this, SLOT(markAsDirty())); + connect(m_applyToAllFolders, SIGNAL(clicked()), + this, SLOT(markAsDirty())); connect(m_useAsDefault, SIGNAL(clicked()), this, SLOT(markAsDirty())); } main->setLayout(topLayout); setMainWidget(main); + + const KConfigGroup dialogConfig(KSharedConfig::openConfig("dolphinrc"), + "ViewPropertiesDialog"); + restoreDialogSize(dialogConfig); } ViewPropertiesDialog::~ViewPropertiesDialog() @@ -167,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() @@ -182,9 +233,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_showInGroups->setEnabled(iconsViewEnabled); + m_additionalInfo->setEnabled(iconsViewEnabled); } void ViewPropertiesDialog::slotSortingChanged(int index) @@ -196,11 +250,30 @@ 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; + } + m_viewProps->setAdditionalInfo(info); + m_isDirty = true; +} + void ViewPropertiesDialog::slotShowPreviewChanged() { const bool show = m_showPreview->isChecked(); @@ -232,23 +305,56 @@ 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(); } + const bool applyToAllFolders = m_isDirty && + (m_applyToAllFolders != 0) && + m_applyToAllFolders->isChecked(); + if (applyToAllFolders) { + const QString text(i18n("The view properties of all folders will be changed. Do you want to continue?")); + if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) { + return; + } + + // Updating the global view properties time stamp in the general settings makes + // all existing viewproperties invalid, as they have a smaller time stamp. + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + settings->setViewPropsTimestamp(QDateTime::currentDateTime()); + + // This is also a good chance to make a cleanup of all mirrored view properties: + const KUrl mirroredDir = ViewProperties::mirroredDirectory(); + KIO::NetAccess::del(mirroredDir, this); + } + m_viewProps->save(); 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()); m_isDirty = false; - // TODO: handle m_useAsDefault setting + if (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. + GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + Q_ASSERT(!settings->globalViewProps()); + + settings->setGlobalViewProps(true); + ViewProperties defaultProps(m_dolphinView->url()); + defaultProps.setDirProperties(*m_viewProps); + defaultProps.save(); + settings->setGlobalViewProps(false); + } } #include "viewpropertiesdialog.moc"