X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/13f0a26ccd4c2ac8429a7701b9cbc49f2c855f2d..b5cc2a6924cfd8f59611d3cec2edbb00a08b4ff1:/src/viewpropertiesdialog.cpp diff --git a/src/viewpropertiesdialog.cpp b/src/viewpropertiesdialog.cpp index 8cedb73cb..ecb27db15 100644 --- a/src/viewpropertiesdialog.cpp +++ b/src/viewpropertiesdialog.cpp @@ -23,14 +23,18 @@ #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 @@ -56,6 +60,7 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : m_useAsDefault(0) { assert(dolphinView != 0); + const bool useGlobalViewProps = DolphinSettings::instance().generalSettings()->globalViewProps(); setCaption(i18n("View Properties")); setButtons(KDialog::Ok | KDialog::Cancel | KDialog::Apply); @@ -68,12 +73,15 @@ 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(SmallIcon("fileview-text"), i18n("Details")); const int index = static_cast(m_viewProps->viewMode()); m_viewMode->setCurrentIndex(index); @@ -129,21 +137,24 @@ ViewPropertiesDialog::ViewPropertiesDialog(DolphinView* dolphinView) : // Only show the following settings if the view properties are remembered // for each directory: - if (!DolphinSettings::instance().generalSettings()->globalViewProps()) { + 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,6 +165,8 @@ 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())); } @@ -238,6 +251,25 @@ void ViewPropertiesDialog::applyViewProperties() 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()); @@ -248,7 +280,19 @@ void ViewPropertiesDialog::applyViewProperties() 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(); + assert(!settings->globalViewProps()); + + settings->setGlobalViewProps(true); + ViewProperties defaultProps(m_dolphinView->url()); + defaultProps.setDirProperties(*m_viewProps); + defaultProps.save(); + settings->setGlobalViewProps(false); + } } #include "viewpropertiesdialog.moc"