X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/a5cf21ff06aff44cde563eaceae3c6cef452ee48..c8d8556950005dfd96ebdb41d2f43ad90356367c:/src/settings/general/behaviorsettingspage.cpp diff --git a/src/settings/general/behaviorsettingspage.cpp b/src/settings/general/behaviorsettingspage.cpp index f1f05b8bd..4ed98e5d7 100644 --- a/src/settings/general/behaviorsettingspage.cpp +++ b/src/settings/general/behaviorsettingspage.cpp @@ -21,11 +21,9 @@ #include "behaviorsettingspage.h" #include "dolphin_generalsettings.h" -#include -#include -#include -#include +#include +#include #include #include @@ -46,9 +44,7 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : m_globalProps(0), m_confirmMoveToTrash(0), m_confirmDelete(0), - m_renameInline(0), m_showToolTips(0), - m_configureToolTips(0), m_showSelectionToggle(0), m_naturalSorting(0) { @@ -59,10 +55,8 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : propsBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox); - connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed())); m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox); - connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed())); QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox); propsBoxLayout->addWidget(m_localProps); @@ -73,55 +67,42 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : confirmBox->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Maximum); m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for Confirmation When", "Moving files or folders to trash"), confirmBox); - connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed())); m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for Confirmation When", "Deleting files or folders"), confirmBox); - connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed())); m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for Confirmation When", "Closing windows with multiple tabs"), confirmBox); - connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed())); QVBoxLayout* confirmBoxLayout = new QVBoxLayout(confirmBox); confirmBoxLayout->addWidget(m_confirmMoveToTrash); confirmBoxLayout->addWidget(m_confirmDelete); confirmBoxLayout->addWidget(m_confirmClosingMultipleTabs); - // 'Rename inline' - m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), this); - connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed())); - // 'Show tooltips' - QWidget* toolTipContainer = new QWidget(this); - QHBoxLayout* toolTipsLayout = new QHBoxLayout(toolTipContainer); - toolTipsLayout->setMargin(0); - m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), toolTipContainer); - connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed())); - connect(m_showToolTips, SIGNAL(toggled(bool)), this, SLOT(updateConfigureButton())); - - m_configureToolTips = new QLabel(toolTipContainer); - connect(m_configureToolTips, SIGNAL(linkActivated(const QString&)), - this, SLOT(configureToolTips())); - - toolTipsLayout->addWidget(m_showToolTips); - toolTipsLayout->addWidget(m_configureToolTips, 1, Qt::AlignLeft); + m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this); // 'Show selection marker' m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection marker"), this); - connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed())); // 'Natural sorting of items' m_naturalSorting = new QCheckBox(i18nc("option:check", "Natural sorting of items"), this); - connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed())); topLayout->addWidget(propsBox); topLayout->addWidget(confirmBox); - topLayout->addWidget(m_renameInline); - topLayout->addWidget(toolTipContainer); + topLayout->addWidget(m_showToolTips); topLayout->addWidget(m_showSelectionToggle); topLayout->addWidget(m_naturalSorting); topLayout->addStretch(); loadSettings(); + + connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_confirmMoveToTrash, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_confirmDelete, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_confirmClosingMultipleTabs, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_showToolTips, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + connect(m_naturalSorting, SIGNAL(toggled(bool)), this, SIGNAL(changed())); } BehaviorSettingsPage::~BehaviorSettingsPage() @@ -134,7 +115,7 @@ void BehaviorSettingsPage::applySettings() const bool useGlobalProps = m_globalProps->isChecked(); - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + GeneralSettings* settings = GeneralSettings::self(); settings->setGlobalViewProps(useGlobalProps); if (useGlobalProps) { @@ -153,7 +134,6 @@ void BehaviorSettingsPage::applySettings() confirmationGroup.sync(); settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked()); - settings->setRenameInline(m_renameInline->isChecked()); settings->setShowToolTips(m_showToolTips->isChecked()); settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); settings->writeConfig(); @@ -168,7 +148,7 @@ void BehaviorSettingsPage::applySettings() void BehaviorSettingsPage::restoreDefaults() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); + GeneralSettings* settings = GeneralSettings::self(); settings->useDefaults(true); loadSettings(); settings->useDefaults(false); @@ -176,32 +156,9 @@ void BehaviorSettingsPage::restoreDefaults() m_confirmDelete->setChecked(CONFIRM_DELETE); } -void BehaviorSettingsPage::updateConfigureButton() -{ - if (m_showToolTips->isChecked()) { - m_configureToolTips->setText("" + - i18nc("@action:button", "Configure...") + - ""); - } else { - m_configureToolTips->setText(QString()); - } -} - -void BehaviorSettingsPage::configureToolTips() -{ - FileMetaDataConfigurationDialog* dialog = new FileMetaDataConfigurationDialog(); - dialog->setDescription(i18nc("@label::textbox", - "Select which data should be shown in the tooltip.")); - dialog->setAttribute(Qt::WA_DeleteOnClose); - dialog->show(); - dialog->raise(); - dialog->activateWindow(); -} - void BehaviorSettingsPage::loadSettings() { - GeneralSettings* settings = DolphinSettings::instance().generalSettings(); - if (settings->globalViewProps()) { + if (GeneralSettings::globalViewProps()) { m_globalProps->setChecked(true); } else { m_localProps->setChecked(true); @@ -212,13 +169,10 @@ void BehaviorSettingsPage::loadSettings() m_confirmMoveToTrash->setChecked(confirmationGroup.readEntry("ConfirmTrash", CONFIRM_TRASH)); m_confirmDelete->setChecked(confirmationGroup.readEntry("ConfirmDelete", CONFIRM_DELETE)); - m_confirmClosingMultipleTabs->setChecked(settings->confirmClosingMultipleTabs()); - m_renameInline->setChecked(settings->renameInline()); - m_showToolTips->setChecked(settings->showToolTips()); - m_showSelectionToggle->setChecked(settings->showSelectionToggle()); + m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs()); + m_showToolTips->setChecked(GeneralSettings::showToolTips()); + m_showSelectionToggle->setChecked(GeneralSettings::showSelectionToggle()); m_naturalSorting->setChecked(KGlobalSettings::naturalSorting()); - - updateConfigureButton(); } #include "behaviorsettingspage.moc"