kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed issue that "Apply to all folders" in the view properties dialog might forget some settings when pressing first "Apply" and then "OK"

Browse source 
BUG: 163366

svn path=/trunk/KDE/kdebase/apps/; revision=818368
This commit is contained in:
Peter Penz 2008-06-08 12:43:10 +00:00
parent adc6cdde31
commit 6b21b18331
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
dolphin/src/viewpropertiesdialog.cpp
View file

@ -330,6 +330,25 @@ void ViewPropertiesDialog::applyViewProperties()
const bool applyToAllFolders = m_isDirty &&
(m_applyToAllFolders != 0) &&
m_applyToAllFolders->isChecked();
// If the user selected 'Apply To All Folders' the view properties implicitely
// are also used as default for new folders.
const bool useAsDefault = applyToAllFolders ||
(m_useAsDefault != 0) && m_useAsDefault->isChecked();
if (useAsDefault) {
// 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);
}
if (applyToAllFolders) {
const QString text(i18nc("@info", "The view properties of all folders will be changed. Do you want to continue?"));
if (KMessageBox::questionYesNo(this, text) == KMessageBox::No) {
@ -346,8 +365,6 @@ void ViewPropertiesDialog::applyViewProperties()
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());
@ -356,21 +373,9 @@ void ViewPropertiesDialog::applyViewProperties()
m_dolphinView->setShowPreview(m_viewProps->showPreview());
m_dolphinView->setShowHiddenFiles(m_viewProps->showHiddenFiles());
m_viewProps->save();
m_isDirty = false;
if (m_useAsDefault && 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);
}
}
void ViewPropertiesDialog::loadSettings()