X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/238eb86db70416aa665aa11d10861669ffe604c1..8a0003bfbcc87068737ab1e2b94ae7b2ba73eca1:/src/settings/dolphinsettingsdialog.cpp diff --git a/src/settings/dolphinsettingsdialog.cpp b/src/settings/dolphinsettingsdialog.cpp index 4d759c911..ea32065e0 100644 --- a/src/settings/dolphinsettingsdialog.cpp +++ b/src/settings/dolphinsettingsdialog.cpp @@ -14,7 +14,7 @@ #include "startup/startupsettingspage.h" #include "trash/trashsettingspage.h" #include "viewmodes/viewsettingspage.h" -#include "config-kuserfeedback.h" +#include "config-dolphin.h" #ifdef HAVE_KUSERFEEDBACK #include "userfeedback/dolphinfeedbackprovider.h" #include "userfeedback/userfeedbacksettingspage.h" @@ -38,7 +38,7 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K setMinimumSize(QSize(540, minSize.height())); setFaceType(List); - setWindowTitle(i18nc("@title:window", "Dolphin Preferences")); + setWindowTitle(i18nc("@title:window", "Configure")); QDialogButtonBox* box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Apply | QDialogButtonBox::Cancel | QDialogButtonBox::RestoreDefaults); box->button(QDialogButtonBox::Apply)->setEnabled(false); @@ -85,11 +85,12 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K QStringLiteral("open_in_new_tab"), QStringLiteral("open_in_new_window"), QStringLiteral("copy_location"), - QStringLiteral("duplicate") + QStringLiteral("duplicate"), + QStringLiteral("open_terminal_here") }); KPageWidgetItem* contextMenuSettingsFrame = addPage(contextMenuSettingsPage, i18nc("@title:group", "Context Menu")); - contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("application-menu"))); + contextMenuSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-menu-edit"))); connect(contextMenuSettingsPage, &ContextMenuSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); // Trash @@ -98,9 +99,9 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K trashSettingsPage = createTrashSettingsPage(this); #endif if (trashSettingsPage) { - KPageWidgetItem* trashSettingsFrame = addPage(trashSettingsPage, + trashSettings = addPage(trashSettingsPage, i18nc("@title:group", "Trash")); - trashSettingsFrame->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); + trashSettings->setIcon(QIcon::fromTheme(QStringLiteral("user-trash"))); connect(trashSettingsPage, &TrashSettingsPage::changed, this, &DolphinSettingsDialog::enableApply); } @@ -129,13 +130,13 @@ DolphinSettingsDialog::DolphinSettingsDialog(const QUrl& url, QWidget* parent, K } #endif - const KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); + const KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog"); KWindowConfig::restoreWindowSize(windowHandle(), dialogConfig); } DolphinSettingsDialog::~DolphinSettingsDialog() { - KConfigGroup dialogConfig(KSharedConfig::openConfig(QStringLiteral("dolphinrc")), "SettingsDialog"); + KConfigGroup dialogConfig(KSharedConfig::openStateConfig(), "SettingsDialog"); KWindowConfig::saveWindowSize(windowHandle(), dialogConfig); }