From b64cd45ebb6ca88f6f57acba22c5705899e0eca1 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 16 Nov 2026 12:24:23 +0100 Subject: feat(rules): Move to in the rules dialog TagRule gains move, read and written by TagRules and chosen from a Move to combo whose item data is the wire-format role. An unknown value from the file is kept raw in unknown and the rule still loads, so a save writes it back instead of deleting the rule; a role picked in the dialog replaces it. A move-only rule is valid. Item 214. Co-Authored-By: Claude Opus 5.5 --- src/tagrulesdialog.cpp | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) (limited to 'src/tagrulesdialog.cpp') diff --git a/src/tagrulesdialog.cpp b/src/tagrulesdialog.cpp index e037e37..2e00841 100644 --- a/src/tagrulesdialog.cpp +++ b/src/tagrulesdialog.cpp @@ -162,6 +162,16 @@ TagRulesDialog::TagRulesDialog(const TagRule &seed, QWidget *parent) m_add->setPlaceholderText(tr("comma separated")); m_remove = new QLineEdit(this); m_remove->setPlaceholderText(tr("comma separated")); + // The stored value is the item DATA, the wire-format role. The label is + // translated, and nothing may match on it ("Translating a string that + // something MATCHES on" in AGENTS.md). + m_move = new QComboBox(this); + m_move->addItem(tr("Don't move"), QString()); + m_move->addItem(tr("Spam folder"), QStringLiteral("spam")); + m_move->addItem(tr("Trash folder"), QStringLiteral("trash")); + m_move->setToolTip(tr("Moves matching new mail into the spam or trash " + "folder of the account it arrived in, and takes it " + "out of the inbox. It stays unread.")); m_query = new QLineEdit(this); // Query syntax is wire format, never translated. Only the prose is. m_query->setPlaceholderText(QStringLiteral("from:sender@example.com")); @@ -173,6 +183,7 @@ TagRulesDialog::TagRulesDialog(const TagRule &seed, QWidget *parent) form->addRow(QString(), m_enabled); form->addRow(tr("Add tags"), m_add); form->addRow(tr("Remove tags"), m_remove); + form->addRow(tr("Move to"), m_move); m_builder = new QWidget(this); auto *builderLayout = new QVBoxLayout(m_builder); builderLayout->setContentsMargins(0, 0, 0, 0); @@ -352,6 +363,8 @@ TagRulesDialog::TagRulesDialog(const TagRule &seed, QWidget *parent) this, &TagRulesDialog::applyEditsToCurrentRule); connect(m_remove, &QLineEdit::editingFinished, this, &TagRulesDialog::applyEditsToCurrentRule); + connect(m_move, &QComboBox::currentIndexChanged, + this, &TagRulesDialog::applyEditsToCurrentRule); connect(m_query, &QLineEdit::editingFinished, this, &TagRulesDialog::applyEditsToCurrentRule); connect(m_stage, &QSpinBox::editingFinished, @@ -644,6 +657,7 @@ void TagRulesDialog::onSelectionChanged() m_enabled->setChecked(rule.enabled); m_add->setText(rule.add.join(QStringLiteral(", "))); m_remove->setText(rule.remove.join(QStringLiteral(", "))); + m_move->setCurrentIndex(qMax(0, m_move->findData(rule.move))); m_query->setText(rule.query); m_note->setPlainText(rule.note); @@ -700,6 +714,7 @@ void TagRulesDialog::applyEditsToCurrentRule() rule.enabled = m_enabled->isChecked(); rule.add = splitTags(m_add->text()); rule.remove = splitTags(m_remove->text()); + rule.move = m_move->currentData().toString(); if (m_textMode->isChecked()) { rule.query = m_query->text().trimmed(); } else { @@ -922,6 +937,16 @@ void TagRulesDialog::setTagsForTest(const QString &tags) emit m_add->editingFinished(); } +void TagRulesDialog::setMoveForTest(const QString &role) +{ + m_move->setCurrentIndex(m_move->findData(role)); +} + +QString TagRulesDialog::moveForTest() const +{ + return m_move->currentData().toString(); +} + bool TagRulesDialog::textModeToggleIsReachableForTest() const { // isVisibleTo rather than isVisible: nothing is isVisible() on a dialog -- cgit v1.2.3