← Back to branch summary

~ubuntu-branches/debian/sid/kde-baseapps/sid

« back to all changes in this revision

Viewing changes to dolphin/src/settings/general/contextmenusettingspage.cpp

  • Committer: Package Import Robot
  • Author(s): Modestas Vainius, Eshat Cakar, Pino Toscano
  • Date: 2012-06-09 22:18:08 UTC
  • mfrom: (4.2.1) (6.1.1 experimental)
  • Revision ID: package-import@ubuntu.com-20120609221808-h1l0ekd5qmb8nefr
Tags: 4:4.8.4-1
* New upstream release.

[ Eshat Cakar ]
* Add watch file.
* Bump kde-sc-dev-latest build dependency to version 4:4.8.4.
* Update installed files.

[ Pino Toscano ]
* Move files of the konqueror documentation from kde-baseapps-data to
  konqueror itself.

Show diffs side-by-side

added added

removed removed

Lines of Context:
dolphin/src/settings/general/contextmenusettingspage.cpp
19
19
 
20
20
#include "contextmenusettingspage.h"
21
21
 
22
 
#include <settings/dolphinsettings.h>
23
22
#include <dolphin_generalsettings.h>
24
23
 
25
24
#include <KDialog>
68
67
    configGroup.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked());
69
68
    configGroup.sync();
70
69
 
71
 
    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
72
 
    settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
73
 
    settings->writeConfig();
 
70
    GeneralSettings::setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
 
71
    GeneralSettings::self()->writeConfig();
74
72
}
75
73
 
76
74
void ContextMenuSettingsPage::restoreDefaults()
77
75
{
78
 
    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
 
76
    GeneralSettings* settings = GeneralSettings::self();
79
77
    settings->useDefaults(true);
80
78
    loadSettings();
81
79
    settings->useDefaults(false);
88
86
    KConfigGroup configGroup(globalConfig, "KDE");
89
87
    m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", SHOW_DELETE));
90
88
 
91
 
    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
92
 
    m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());
 
89
    m_showCopyMoveMenu->setChecked(GeneralSettings::showCopyMoveMenu());
93
90
}
94
91
 
95
92
#include "contextmenusettingspage.moc"