From 6b22d38a3e47b43f67c060b6e36fe0409a5f4b73 Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Mon, 30 Aug 2021 10:28:15 +0200 Subject: [PATCH] simple search: add Ctrl+H as keyboard shortcut for "show history" --- src/qtgui/ssearch_w.cpp | 10 ++++++++++ src/qtgui/ssearch_w.h | 3 +++ 2 files changed, 13 insertions(+) diff --git a/src/qtgui/ssearch_w.cpp b/src/qtgui/ssearch_w.cpp index adb249cb..8f5be51d 100644 --- a/src/qtgui/ssearch_w.cpp +++ b/src/qtgui/ssearch_w.cpp @@ -38,6 +38,7 @@ #include #include #include +#include #include "log.h" #include "guiutils.h" @@ -50,6 +51,7 @@ #include "smallut.h" #include "rcldb.h" #include "recoll.h" +#include "scbase.h" using namespace std; @@ -188,6 +190,14 @@ void SSearch::init() SLOT(onCompletionActivated(const QString&))); connect(historyPB, SIGNAL(clicked()), this, SLOT(onHistoryClicked())); setupButtons(); + onNewShortcuts(); + connect(&SCBase::scBase(), SIGNAL(shortcutsChanged()),this, SLOT(onNewShortcuts())); +} + +void SSearch::onNewShortcuts() +{ + SETSHORTCUT(this, "ssearch:197", tr("Simple search"), tr("History"), + "Ctrl+H", m_histsc, onHistoryClicked); } void SSearch::setupButtons() diff --git a/src/qtgui/ssearch_w.h b/src/qtgui/ssearch_w.h index 861701ab..3a1e5f66 100644 --- a/src/qtgui/ssearch_w.h +++ b/src/qtgui/ssearch_w.h @@ -27,6 +27,7 @@ #include class QTimer; +class QShortcut; #include "recoll.h" #include "searchdata.h" @@ -96,6 +97,7 @@ public slots: // Forget current entry and any state (history) virtual void clearAll(); virtual void setPrefs(); + virtual void onNewShortcuts(); private slots: virtual void searchTextChanged(const QString&); @@ -118,6 +120,7 @@ private: RclCompleterModel *m_completermodel{nullptr}; QCompleter *m_completer{nullptr}; + QShortcut *m_histsc{nullptr}; /* We save multiword entries because the completer replaces them with the completion */ QString m_savedEditText;