1 files changed, 23 insertions, 0 deletions

diff --git a/src/mainwindow.h b/src/mainwindow.h
index d1f7b1c..933c71b 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -33,6 +33,7 @@
 
 class QAction;
 class QLineEdit;
+class QMenu;
 class QTableView;
 class QLabel;
 class QPushButton;
@@ -60,6 +61,12 @@ public:
     /// really registered.
     QStringList registeredActionNames() const;
 
+    /// The thread currently shown in the message pane, empty when it is blank.
+    ///
+    /// Empty is what "the pane is blanked" means internally: a late-arriving
+    /// load is discarded rather than painted, so no thread can reappear.
+    QString currentThreadId() const { return m_currentThreadId; }
+
     /// The cid: namespace prefix for the nth message of a thread.
     ///
     /// MainWindow is the only producer of this value in the application. It
@@ -95,6 +102,14 @@ private slots:
     void onThreadsReady(const QVector<ThreadSummary> &threads, quint64 generation);
     void onQueryFinished(int total, quint64 generation);
     void onThreadSelected(const QModelIndex &current, const QModelIndex &previous);
+
+    /// Keeps the status bar's selection count and the multi-select guard in
+    /// step with selections that never move the current index.
+    void onSelectionChanged();
+
+    /// Pops up the thread-list context menu, preserving a multi-row selection
+    /// the click lands inside.
+    void showThreadContextMenu(const QPoint &pos);
     void onThreadLoaded(const QVector<MessageRef> &messages, quint64 generation);
     void onWorkerError(const QString &message);
     void onSyncFinished(bool success, int exitCode);
@@ -196,6 +211,10 @@ private:
     QLineEdit *m_queryEdit = nullptr;
     QueryCompleter *m_queryCompleter = nullptr;
     QTableView *m_threadView = nullptr;
+
+    /// Right-click menu for the thread list, holding the same QActions the
+    /// menu bar does.
+    QMenu *m_threadContextMenu = nullptr;
     QSplitter *m_splitter = nullptr;
     QComboBox *m_accountBox = nullptr;
     QPushButton *m_syncButton = nullptr;
@@ -230,6 +249,10 @@ private:
     QString m_lastQuery;
     QString m_currentThreadId;
 
+    /// The selection count last written to the status bar, so it can be taken
+    /// back without clobbering a message some other action put there.
+    QString m_selectionMessage;
+
     /// Confirmed tag mutations not yet known to have reached the mail store.
     ///
     /// A count of its own rather than QUndoStack::isClean(), which cannot serve