From b9b9df729649b17290fc574cf617f53722583f03 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Thu, 12 Mar 2009 22:40:32 +0000 Subject: Ask for confirmation when closing a Dolphin window with more than one tab. This can be disabled by checking the "Do not ask again" checkbox in the confirmation dialog or in Dolphin's settings dialog. FEATURE: 168417 svn path=/trunk/KDE/kdebase/apps/; revision=938767 --- src/settings/behaviorsettingspage.cpp | 6 ++++++ src/settings/behaviorsettingspage.h | 1 + src/settings/dolphin_generalsettings.kcfg | 4 ++++ 3 files changed, 11 insertions(+) (limited to 'src/settings') diff --git a/src/settings/behaviorsettingspage.cpp b/src/settings/behaviorsettingspage.cpp index 440c73680..8f156933b 100644 --- a/src/settings/behaviorsettingspage.cpp +++ b/src/settings/behaviorsettingspage.cpp @@ -78,10 +78,14 @@ BehaviorSettingsPage::BehaviorSettingsPage(const KUrl& url, QWidget* parent) : 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); m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox); connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed())); @@ -130,6 +134,7 @@ void BehaviorSettingsPage::applySettings() confirmationGroup.writeEntry("ConfirmDelete", m_confirmDelete->isChecked()); confirmationGroup.sync(); + settings->setConfirmClosingMultipleTabs(m_confirmClosingMultipleTabs->isChecked()); settings->setRenameInline(m_renameInline->isChecked()); settings->setShowToolTips(m_showToolTips->isChecked()); settings->setShowSelectionToggle(m_showSelectionToggle->isChecked()); @@ -159,6 +164,7 @@ 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()); diff --git a/src/settings/behaviorsettingspage.h b/src/settings/behaviorsettingspage.h index 401f2240a..fecbe08a3 100644 --- a/src/settings/behaviorsettingspage.h +++ b/src/settings/behaviorsettingspage.h @@ -55,6 +55,7 @@ private: QCheckBox* m_confirmMoveToTrash; QCheckBox* m_confirmDelete; + QCheckBox* m_confirmClosingMultipleTabs; QCheckBox* m_renameInline; QCheckBox* m_showToolTips; diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg index 0f3c67700..0222fa89c 100644 --- a/src/settings/dolphin_generalsettings.kcfg +++ b/src/settings/dolphin_generalsettings.kcfg @@ -41,6 +41,10 @@ false + + + true + false -- cgit v1.3