tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Clarify the shortcuts descriptions

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-02-10 15:40:17 +01:00
parent 52613ff79f
commit cd3abe7d41
5 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/qtgui/advsearch_w.cpp
View File

@ -168,18 +168,18 @@ void AdvSearch::saveCnf()
void AdvSearch::onNewShortcuts() 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); "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); "Down", m_histprevsc, slotHistoryPrev);
} }
void AdvSearch::listShortcuts() void AdvSearch::listShortcuts()
{ {
LISTSHORTCUT(this, tr("Advanced Search"), tr("History Next"), LISTSHORTCUT(this, tr("Advanced Search"), tr("Load next stored search"),
"Up", m_histnextsc, slotHistoryNext); "Up", m_histnextsc, slotHistoryNext);
LISTSHORTCUT(this, tr("Advanced Search"), tr("History Prev"), LISTSHORTCUT(this, tr("Advanced Search"), tr("Load previous stored search"),
"Down", m_histprevsc, slotHistoryPrev); "Down", m_histprevsc, slotHistoryPrev);
} }
void AdvSearch::addClause(bool updsaved) void AdvSearch::addClause(bool updsaved)

16
src/qtgui/preview_w.cpp
View File

@ -148,16 +148,16 @@ void Preview::init()
void Preview::onNewShortcuts() void Preview::onNewShortcuts()
{ {
SETSHORTCUT(this, tr("Preview Window"), tr("Close Window"), SETSHORTCUT(this, tr("Preview Window"), tr("Close preview window"),
"Esc", m_closewinsc, close); "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); "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); "Shift+Up", m_prevdocsc, emitShowPrev);
SETSHORTCUT(this, tr("Preview Window"), tr("Close tab"), SETSHORTCUT(this, tr("Preview Window"), tr("Close tab"),
"Ctrl+W", m_closetabsc, closeCurrentTab); "Ctrl+W", m_closetabsc, closeCurrentTab);
QKeySequence ks = 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()) { if (!ks.isEmpty()) {
delete m_printtabsc; delete m_printtabsc;
m_printtabsc = new QShortcut( m_printtabsc = new QShortcut(
@ -167,15 +167,15 @@ void Preview::onNewShortcuts()
void Preview::listShortcuts() void Preview::listShortcuts()
{ {
LISTSHORTCUT(null, tr("Preview Window"), tr("Close Window"), LISTSHORTCUT(null, tr("Preview Window"), tr("Close preview window"),
"Esc", m_closewinsc, close); "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); "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); "Shift+Up",m_prevdocsc, emitShowPrev);
LISTSHORTCUT(null, tr("Preview Window"), tr("Close tab"), "Ctrl+W", LISTSHORTCUT(null, tr("Preview Window"), tr("Close tab"), "Ctrl+W",
m_closetabsc, closeCurrentTab); 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); m_printtabsc, print);
} }

16
src/qtgui/rclmain_w.cpp
View File

@ -344,18 +344,20 @@ void RclMain::onNewShortcuts()
SCBase& scb = SCBase::scBase(); SCBase& scb = SCBase::scBase();
QKeySequence ks; QKeySequence ks;
SETSHORTCUT(sSearch, tr("Main Window"), tr("Focus to Search"), SETSHORTCUT(sSearch, tr("Main Window"), tr("Clear 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"),
"Ctrl+S", m_clearsearchsc, clearAll); "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 // We could set this as an action shortcut, but then, it would not
// be editable // 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); "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()) { if (!ks.isEmpty()) {
delete m_focustotablesc; delete m_focustotablesc;
m_focustotablesc = new QShortcut(ks, this); m_focustotablesc = new QShortcut(ks, this);

13
src/qtgui/restable.cpp
View File

@ -688,19 +688,20 @@ void ResTable::init()
void ResTable::onNewShortcuts() 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); "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); "Ctrl+Shift+O", m_openquitsc, menuEditAndQuit);
SETSHORTCUT(this, tr("Result Table"), tr("Preview"), SETSHORTCUT(this, tr("Result Table"), tr("Preview"),
"Ctrl+D", m_previewsc, menuPreview); "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); "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); "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); "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); "Ctrl+G", m_copycurtextsc, copyCurrentRowText);
std::vector<QShortcut*> scps={ std::vector<QShortcut*> scps={
m_opensc, m_openquitsc, m_previewsc, m_showsnipssc, m_showheadersc, m_opensc, m_openquitsc, m_previewsc, m_showsnipssc, m_showheadersc,

12
src/qtgui/snippets_w.cpp
View File

@ -157,11 +157,11 @@ void SnippetsW::onNewShortcuts()
"Ctrl+F", m_find1sc, slotEditFind); "Ctrl+F", m_find1sc, slotEditFind);
SETSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"), SETSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"),
"/", m_find2sc, slotEditFind); "/", m_find2sc, slotEditFind);
SETSHORTCUT(this, tr("Snippets Window"), tr("Find Next"), SETSHORTCUT(this, tr("Snippets Window"), tr("Find next"),
"F3", m_findnextsc, slotEditFindNext); "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); "Shift+F3", m_findprevsc, slotEditFindPrevious);
SETSHORTCUT(this, tr("Snippets Window"), tr("Hide"), SETSHORTCUT(this, tr("Snippets Window"), tr("Close window"),
"Esc", m_hidesc, hide); "Esc", m_hidesc, hide);
} }
@ -171,11 +171,11 @@ void SnippetsW::listShortcuts()
m_find1sc, slotEditFind); m_find1sc, slotEditFind);
LISTSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"), "/", LISTSHORTCUT(this, tr("Snippets Window"), tr("Find (alt)"), "/",
m_find2sc, slotEditFind); m_find2sc, slotEditFind);
LISTSHORTCUT(this, tr("Snippets Window"), tr("Find Next"), "F3", LISTSHORTCUT(this, tr("Snippets Window"), tr("Find next"), "F3",
m_find2sc, slotEditFindNext); m_find2sc, slotEditFindNext);
LISTSHORTCUT(this, tr("Snippets Window"), tr("Find Previous"), LISTSHORTCUT(this, tr("Snippets Window"), tr("Find previous"),
"Shift+F3", m_find2sc, slotEditFindPrevious); "Shift+F3", m_find2sc, slotEditFindPrevious);
LISTSHORTCUT(this, tr("Snippets Window"), tr("Hide"), LISTSHORTCUT(this, tr("Snippets Window"), tr("Close window"),
"Esc", m_hidesc, hide); "Esc", m_hidesc, hide);
} }