From cd3abe7d416dcd028d6e122f972ec21cc0545b0c Mon Sep 17 00:00:00 2001 From: Jean-Francois Dockes Date: Wed, 10 Feb 2021 15:40:17 +0100 Subject: [PATCH] Clarify the shortcuts descriptions --- src/qtgui/advsearch_w.cpp | 12 ++++++------ src/qtgui/preview_w.cpp | 16 ++++++++-------- src/qtgui/rclmain_w.cpp | 16 +++++++++------- src/qtgui/restable.cpp | 13 +++++++------ src/qtgui/snippets_w.cpp | 12 ++++++------ 5 files changed, 36 insertions(+), 33 deletions(-) diff --git a/src/qtgui/advsearch_w.cpp b/src/qtgui/advsearch_w.cpp index e2438b26..45aea6eb 100644 --- a/src/qtgui/advsearch_w.cpp +++ b/src/qtgui/advsearch_w.cpp @@ -168,18 +168,18 @@ void AdvSearch::saveCnf() void AdvSearch::onNewShortcuts() { - SETSHORTCUT(this, tr("Advanced Search"), tr("History Next"), + SETSHORTCUT(this, tr("Advanced Search"), tr("Load next stored search"), "Up", m_histnextsc, slotHistoryNext); - SETSHORTCUT(this, tr("Advanced Search"), tr("History Prev"), + SETSHORTCUT(this, tr("Advanced Search"), tr("Load previous stored search"), "Down", m_histprevsc, slotHistoryPrev); } void AdvSearch::listShortcuts() { - LISTSHORTCUT(this, tr("Advanced Search"), tr("History Next"), - "Up", m_histnextsc, slotHistoryNext); - LISTSHORTCUT(this, tr("Advanced Search"), tr("History Prev"), - "Down", m_histprevsc, slotHistoryPrev); + LISTSHORTCUT(this, tr("Advanced Search"), tr("Load next stored search"), + "Up", m_histnextsc, slotHistoryNext); + LISTSHORTCUT(this, tr("Advanced Search"), tr("Load previous stored search"), + "Down", m_histprevsc, slotHistoryPrev); } void AdvSearch::addClause(bool updsaved) diff --git a/src/qtgui/preview_w.cpp b/src/qtgui/preview_w.cpp index 96d7cc8c..8274cd10 100644 --- a/src/qtgui/preview_w.cpp +++ b/src/qtgui/preview_w.cpp @@ -148,16 +148,16 @@ void Preview::init() void Preview::onNewShortcuts() { - SETSHORTCUT(this, tr("Preview Window"), tr("Close Window"), + SETSHORTCUT(this, tr("Preview Window"), tr("Close preview window"), "Esc", m_closewinsc, close); - SETSHORTCUT(this, tr("Preview Window"), tr("Next doc in tab"), + SETSHORTCUT(this, tr("Preview Window"), tr("Show next result"), "Shift+Down", m_nextdocsc, emitShowNext); - SETSHORTCUT(this, tr("Preview Window"), tr("Previous doc in tab"), + SETSHORTCUT(this, tr("Preview Window"), tr("Show previous result"), "Shift+Up", m_prevdocsc, emitShowPrev); SETSHORTCUT(this, tr("Preview Window"), tr("Close tab"), "Ctrl+W", m_closetabsc, closeCurrentTab); QKeySequence ks = - SCBase::scBase().get(tr("Preview Window"),tr("Print tab"), "Ctrl+P"); + SCBase::scBase().get(tr("Preview Window"),tr("Print"), "Ctrl+P"); if (!ks.isEmpty()) { delete m_printtabsc; m_printtabsc = new QShortcut( @@ -167,15 +167,15 @@ void Preview::onNewShortcuts() void Preview::listShortcuts() { - LISTSHORTCUT(null, tr("Preview Window"), tr("Close Window"), + LISTSHORTCUT(null, tr("Preview Window"), tr("Close preview window"), "Esc", m_closewinsc, close); - LISTSHORTCUT(null, tr("Preview Window"), tr("Next doc in tab"), + LISTSHORTCUT(null, tr("Preview Window"), tr("Show next result"), "Shift+Down", m_nextdocsc, emitShowNext); - LISTSHORTCUT(null, tr("Preview Window"), tr("Previous doc in tab"), + LISTSHORTCUT(null, tr("Preview Window"), tr("Show previous result"), "Shift+Up",m_prevdocsc, emitShowPrev); LISTSHORTCUT(null, tr("Preview Window"), tr("Close tab"), "Ctrl+W", m_closetabsc, closeCurrentTab); - LISTSHORTCUT(null, tr("Preview Window"), tr("Print tab"), "Ctrl+P", + LISTSHORTCUT(null, tr("Preview Window"), tr("Print"), "Ctrl+P", m_printtabsc, print); } diff --git a/src/qtgui/rclmain_w.cpp b/src/qtgui/rclmain_w.cpp index 550c9abf..ded0eae2 100644 --- a/src/qtgui/rclmain_w.cpp +++ b/src/qtgui/rclmain_w.cpp @@ -344,18 +344,20 @@ void RclMain::onNewShortcuts() SCBase& scb = SCBase::scBase(); QKeySequence ks; - SETSHORTCUT(sSearch, tr("Main Window"), tr("Focus to Search"), - "Ctrl+L", m_focustosearchsc, takeFocus); - SETSHORTCUT(sSearch, tr("Main Window"), tr("Focus to Search, alt."), - "Ctrl+Shift+S", m_focustosearcholdsc, takeFocus); - SETSHORTCUT(sSearch, tr("Main Window"), tr("Clear Search"), + SETSHORTCUT(sSearch, tr("Main Window"), tr("Clear search"), "Ctrl+S", m_clearsearchsc, clearAll); + SETSHORTCUT(sSearch, tr("Main Window"), + tr("Move keyboard focus to search entry"), + "Ctrl+L", m_focustosearchsc, takeFocus); + SETSHORTCUT(sSearch, tr("Main Window"), + tr("Move keyboard focus to search, alt."), + "Ctrl+Shift+S", m_focustosearcholdsc, takeFocus); // We could set this as an action shortcut, but then, it would not // be editable - SETSHORTCUT(this, tr("Main Window"), tr("Toggle table display"), + SETSHORTCUT(this, tr("Main Window"), tr("Toggle tabular display"), "Ctrl+T", m_toggletablesc, toggleTable); - ks = scb.get(tr("Main Window"), tr("Focus to Result Table"), "Ctrl+R"); + ks = scb.get(tr("Main Window"), tr("Move keyboard focus to table"),"Ctrl+R"); if (!ks.isEmpty()) { delete m_focustotablesc; m_focustotablesc = new QShortcut(ks, this); diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp index f45f20cf..e3ecf696 100644 --- a/src/qtgui/restable.cpp +++ b/src/qtgui/restable.cpp @@ -688,19 +688,20 @@ void ResTable::init() void ResTable::onNewShortcuts() { - SETSHORTCUT(this, tr("Result Table"), tr("Open"), + SETSHORTCUT(this, tr("Result Table"), tr("Open current result document"), "Ctrl+O", m_opensc, menuEdit); - SETSHORTCUT(this, tr("Result Table"), tr("Open and Quit"), + SETSHORTCUT(this, tr("Result Table"), tr("Open current result and quit"), "Ctrl+Shift+O", m_openquitsc, menuEditAndQuit); SETSHORTCUT(this, tr("Result Table"), tr("Preview"), "Ctrl+D", m_previewsc, menuPreview); - SETSHORTCUT(this, tr("Result Table"), tr("Show Snippets"), + SETSHORTCUT(this, tr("Result Table"), tr("Show snippets"), "Ctrl+E", m_showsnipssc, menuShowSnippets); - SETSHORTCUT(this, tr("Result Table"), tr("Show Header"), + SETSHORTCUT(this, tr("Result Table"), tr("Show header"), "Ctrl+H", m_showheadersc, toggleHeader); - SETSHORTCUT(this, tr("Result Table"), tr("Show Vertical Header"), + SETSHORTCUT(this, tr("Result Table"), tr("Show vertical header"), "Ctrl+V", m_showvheadersc, toggleVHeader); - SETSHORTCUT(this, tr("Result Table"), tr("Copy current document text"), + SETSHORTCUT(this, tr("Result Table"), + tr("Copy current result text to clipboard"), "Ctrl+G", m_copycurtextsc, copyCurrentRowText); std::vector scps={ m_opensc, m_openquitsc, m_previewsc, m_showsnipssc, m_showheadersc, diff --git a/src/qtgui/snippets_w.cpp b/src/qtgui/snippets_w.cpp index 6699d727..61d1246d 100644 --- a/src/qtgui/snippets_w.cpp +++ b/src/qtgui/snippets_w.cpp @@ -157,11 +157,11 @@ void SnippetsW::onNewShortcuts() "Ctrl+F", m_find1sc, slotEditFind); SETSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"), "/", m_find2sc, slotEditFind); - SETSHORTCUT(this, tr("Snippets Window"), tr("Find Next"), + SETSHORTCUT(this, tr("Snippets Window"), tr("Find next"), "F3", m_findnextsc, slotEditFindNext); - SETSHORTCUT(this, tr("Snippets Window"), tr("Find Previous"), + SETSHORTCUT(this, tr("Snippets Window"), tr("Find previous"), "Shift+F3", m_findprevsc, slotEditFindPrevious); - SETSHORTCUT(this, tr("Snippets Window"), tr("Hide"), + SETSHORTCUT(this, tr("Snippets Window"), tr("Close window"), "Esc", m_hidesc, hide); } @@ -171,11 +171,11 @@ void SnippetsW::listShortcuts() m_find1sc, slotEditFind); LISTSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"), "/", m_find2sc, slotEditFind); - LISTSHORTCUT(this, tr("Snippets Window"), tr("Find Next"), "F3", + LISTSHORTCUT(this, tr("Snippets Window"), tr("Find next"), "F3", m_find2sc, slotEditFindNext); - LISTSHORTCUT(this, tr("Snippets Window"), tr("Find Previous"), + LISTSHORTCUT(this, tr("Snippets Window"), tr("Find previous"), "Shift+F3", m_find2sc, slotEditFindPrevious); - LISTSHORTCUT(this, tr("Snippets Window"), tr("Hide"), + LISTSHORTCUT(this, tr("Snippets Window"), tr("Close window"), "Esc", m_hidesc, hide); }