diff options
| author | Danilo M. <danix@danix.xyz> | 2026-08-15 11:39:11 +0200 |
|---|---|---|
| committer | Danilo M. <danix@danix.xyz> | 2026-08-15 11:39:11 +0200 |
| commit | aecb22de0c6644380ea3b1e909c864fd24501dc7 (patch) | |
| tree | 646136145d61381248691b94c8b83615e42f6e61 /src/mainwindow.cpp | |
| parent | a15505d408895d53f2fb4321836931a1b0742b7d (diff) | |
| download | qtmaildir-aecb22de0c6644380ea3b1e909c864fd24501dc7.tar.gz qtmaildir-aecb22de0c6644380ea3b1e909c864fd24501dc7.zip | |
fix(startup): let startup_query name a built-in filter, and run it
Two defects, both reachable only after item 93.
startupSavedQuery() searched the saved queries alone, so a startup_query of
"Inbox" matched nothing once Inbox shipped as a built-in filter and the
duplicated entry was removed from queries.json. It then fell back to
m_savedQueries.first(), which is an arbitrary choice that used to look
reasonable while every install carried an Inbox entry: with the duplicates gone
it opened on a leftover search for one sender, and an empty queries.json opened
on nothing at all. The search now covers the saved queries first, so the user's
own entry wins a name collision, then the built-in filters; the fallback is the
Unread filter, which is always present.
The default startup name has always been "Unread" and now resolves for the
first time: before this it named nothing unless the user happened to have such
an entry.
The constructor also read startup.query directly, and a generated entry stores
no query at all, so even a matching filter opened an empty bar. It resolves
through Config::resolvedQuery() now, unscoped, since the account dropdown
starts on "All accounts".
Icons per the user's choices: a star for Important rather than the flag
action's own icon, since on the query row an icon reads as a category rather
than as an instruction, and mail-folder-sent rather than mail-sent.
Three tests changed rather than adapted, because their premises were the
defect. Two asserted the first-saved-query fallback.
aCronSyncDoesNotRefreshBeforeAnyQueryHasRun assumed a fresh window had run no
query, which is no longer true; it is now
aCronSyncRefreshesTheLastRunQueryNotTheQueryBar and asserts the property that
actually matters on a cron timer, through a new lastRunQueryForTesting() seam,
since a legitimate refresh bumps the generation and the counter cannot tell the
two apart.
Diffstat (limited to 'src/mainwindow.cpp')
| -rw-r--r-- | src/mainwindow.cpp | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 4343479..3ebcbc4 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -404,9 +404,18 @@ MainWindow::MainWindow(const Config &config, QWidget *parent) // Not savedQueries().first(): [queries] is read through childKeys(), which // sorts alphabetically, so "first" means whatever happens to sort first // rather than anything the user chose. Config resolves the name. + // resolvedQuery(), not startup.query: a generated entry stores no query at + // all, since its text is composed from the accounts at run time. Reading + // the field directly meant a startup_query naming a built-in filter opened + // an empty bar and ran nothing. + // + // No account scope here. The dropdown starts on "All accounts", which is + // the empty key, so this is the unscoped form either way; passing the + // selection would be reading a widget the user has not touched yet. const SavedQuery startup = m_config.startupSavedQuery(); - if (!startup.query.isEmpty()) { - m_queryEdit->setText(startup.query); + const QString startupQuery = m_config.resolvedQuery(startup, QString()); + if (!startupQuery.isEmpty()) { + m_queryEdit->setText(startupQuery); runCurrentQuery(); } } @@ -1746,13 +1755,19 @@ void MainWindow::buildSavedQueryRow(QWidget *parent, QVBoxLayout *layout) // is chrome. A name the running theme lacks degrades to text on its // own, which is why nothing here checks whether it resolved. // - // mail-mark-important matches the `flag` action's own icon, since both - // reach the same tag: the filter finds what the action marks. + // A STAR for Important, not mail-mark-important, which the `flag` + // action uses. Item 57 recorded the user asking for a star when the + // action was renamed, and on the query row the icon is read as a + // category rather than as "do this to the selection", so the two can + // differ. Chosen by the user on sight, 2026-08-15. + // + // mail-folder-sent, not mail-sent: the former is the folder shape every + // theme ships, the latter is the envelope-in-flight some do not. static const QHash<QString, QString> filterIcons = { { QStringLiteral("unread"), QStringLiteral("mail-mark-unread") }, { QStringLiteral("inbox"), QStringLiteral("mail-inbox") }, - { QStringLiteral("flagged"), QStringLiteral("mail-mark-important") }, - { QStringLiteral("sent"), QStringLiteral("mail-sent") }, + { QStringLiteral("flagged"), QStringLiteral("starred") }, + { QStringLiteral("sent"), QStringLiteral("mail-folder-sent") }, }; button->setIcon( QIcon::fromTheme(filterIcons.value(filter.generated))); |
