Add label

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/autotests/confirmbeforedeletingcreaterulewidgettest.cpp

@@ -32,6 +32,9 @@ void ConfirmBeforeDeletingCreateRuleWidgetTest::shouldHaveDefaultValues()
     QVERIFY(mRuleTypeComboBox);
     QVERIFY(mRuleTypeComboBox->count() > 0);
 
-    auto label = w.findChild<QLabel *>(QStringLiteral("label"));
+    auto label = w.findChild<QLabel *>(QStringLiteral("typeLabel"));
+    QVERIFY(!label->text().isEmpty());
+
+    label = w.findChild<QLabel *>(QStringLiteral("containsLabel"));
     QVERIFY(!label->text().isEmpty());
 }

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletingcreaterulewidget.cpp

@@ -20,11 +20,15 @@ ConfirmBeforeDeletingCreateRuleWidget::ConfirmBeforeDeletingCreateRuleWidget(QWi
     mainLayout->setContentsMargins({});
     mainLayout->setObjectName(QStringLiteral("mainLayout"));
 
+    auto label = new QLabel(i18n("Type:"), this);
+    label->setObjectName(QStringLiteral("typeLabel"));
+    mainLayout->addWidget(label);
+
     mRuleTypeComboBox->setObjectName(QStringLiteral("mRuleTypeComboBox"));
     mainLayout->addWidget(mRuleTypeComboBox);
 
-    auto label = new QLabel(i18n("Contains:"), this);
-    label->setObjectName(QStringLiteral("label"));
+    label = new QLabel(i18n("Contains:"), this);
+    label->setObjectName(QStringLiteral("containsLabel"));
     mainLayout->addWidget(label);
 
     mPatternLineEdit->setObjectName(QStringLiteral("mPatternLineEdit"));

kmail/checkbeforedeletemailplugins/confirmbeforedeleting/confirmbeforedeletinginterface.cpp

@@ -23,7 +23,6 @@ Akonadi::Item::List ConfirmBeforeDeletingInterface::exec(const Akonadi::Item::Li
     QString checkFoundStr;
     for (const auto &item : list) {
         if (ConfirmBeforeDeletingManager::self()->deletingNeedToConfirm(item, checkFoundStr)) {
-            // Use subject ?
             if (KMessageBox::questionYesNo(parentWidget(), i18n("Do you want to delete this email?\n%1", checkFoundStr), i18n("Confirm Delete Mail"))
                 == KMessageBox::Yes) {
                 lst << item;