X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d9c3648d5a4601d8e11e148ca77b3e9d84cf3207..4eec2a77cfa8719f0cf7f6741c8cfa11b23ebf5b:/src/generalsettingspage.cpp diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp index ba5473054..e7e8b23fb 100644 --- a/src/generalsettingspage.cpp +++ b/src/generalsettingspage.cpp @@ -62,7 +62,7 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par new QLabel(i18n("Location:"), homeUrlBox); m_homeUrl = new QLineEdit(settings->homeUrl(), homeUrlBox); - QPushButton* selectHomeUrlButton = new QPushButton(SmallIcon("folder"), QString(), homeUrlBox); + QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder"), QString(), homeUrlBox); connect(selectHomeUrlButton, SIGNAL(clicked()), this, SLOT(selectHomeUrl())); @@ -95,8 +95,9 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin,QWidget* par startBoxLayout->addWidget(m_startEditable); m_showDeleteCommand = new QCheckBox(i18n("Show the command 'Delete' in context menu"), vBox); - // TODO: use global config like in Konqueror or is this a custom setting for Dolphin? - m_showDeleteCommand->setChecked(settings->showDeleteCommand()); + const KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + const KConfigGroup kdeConfig(globalConfig, "KDE"); + m_showDeleteCommand->setChecked(kdeConfig.readEntry("ShowDeleteCommand", false)); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -123,13 +124,17 @@ void GeneralSettingsPage::applySettings() settings->setSplitView(m_startSplit->isChecked()); settings->setEditableUrl(m_startEditable->isChecked()); - settings->setShowDeleteCommand(m_showDeleteCommand->isChecked()); + + KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::NoGlobals); + KConfigGroup kdeConfig(globalConfig, "KDE"); + kdeConfig.writeEntry("ShowDeleteCommand", m_showDeleteCommand->isChecked()); + kdeConfig.sync(); } void GeneralSettingsPage::selectHomeUrl() { const QString homeUrl(m_homeUrl->text()); - KUrl url(KFileDialog::getExistingUrl(homeUrl)); + KUrl url(KFileDialog::getExistingDirectoryUrl(homeUrl)); if (!url.isEmpty()) { m_homeUrl->setText(url.prettyUrl()); }