Merge branch 'master' into frameworks

[dolphin.git] / src / settings / general / confirmationssettingspage.cpp

diff --git a/src/settings/general/confirmationssettingspage.cpp b/src/settings/general/confirmationssettingspage.cpp
index 07ca5237bd6203cb4de14fd6054aead4ef099cdb..53282115975c8a55231e48b6e31f90c8673304c4 100644 (file)
--- a/src/settings/general/confirmationssettingspage.cpp
+++ b/src/settings/general/confirmationssettingspage.cpp
@@ -41,28 +41,36 @@ ConfirmationsSettingsPage::ConfirmationsSettingsPage(QWidget* parent) :
 {
     QVBoxLayout* topLayout = new QVBoxLayout(this);
 
-    QLabel* confirmLabel = new QLabel(i18nc("@title:group", "Ask for confirmation when:"), this);
+    QLabel* confirmLabelKde = new QLabel(i18nc("@title:group", "Ask for confirmation in all KDE applications when:"), this);
+    confirmLabelKde->setWordWrap(true);
 
     m_confirmMoveToTrash = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                                "Moving files or folders to trash"), this);
     m_confirmDelete = new QCheckBox(i18nc("@option:check Ask for confirmation when",
                                           "Deleting files or folders"), this);
+
+    QLabel* confirmLabelDolphin = new QLabel(i18nc("@title:group", "Ask for confirmation when:"), this);
+    confirmLabelDolphin->setWordWrap(true);
+
     m_confirmClosingMultipleTabs = new QCheckBox(i18nc("@option:check Ask for confirmation when",
-                                                       "Closing windows with multiple tabs"), this);
+                                                       "Closing Dolphin windows with multiple tabs"), this);
 
     topLayout->addSpacing(KDialog::spacingHint());
-    topLayout->addWidget(confirmLabel);
+    topLayout->addWidget(confirmLabelKde);
     topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_confirmMoveToTrash);
     topLayout->addWidget(m_confirmDelete);
+    topLayout->addSpacing(KDialog::spacingHint());
+    topLayout->addWidget(confirmLabelDolphin);
+    topLayout->addSpacing(KDialog::spacingHint());
     topLayout->addWidget(m_confirmClosingMultipleTabs);
     topLayout->addStretch();
 
     loadSettings();
 
-    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_confirmMoveToTrash, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
+    connect(m_confirmDelete, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
+    connect(m_confirmClosingMultipleTabs, &QCheckBox::toggled, this, &ConfirmationsSettingsPage::changed);
 }
 
 ConfirmationsSettingsPage::~ConfirmationsSettingsPage()
@@ -103,4 +111,3 @@ void ConfirmationsSettingsPage::loadSettings()
     m_confirmClosingMultipleTabs->setChecked(GeneralSettings::confirmClosingMultipleTabs());
 }
 
-#include "confirmationssettingspage.moc"