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

add keyboard accelerators for the result table Ctrl+r -> switch focus to results. Ctrl+o Open current result. Ctrl+Shft+o Open and close recoll. Ctrl+d preview (draft)

Browse Source
This commit is contained in:
Jean-Francois Dockes 2014-12-15 16:13:30 +01:00
parent 47cbf44d19
commit 51b7f63c00
3 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/qtgui/rclmain_w.cpp
View File

@ -1639,10 +1639,14 @@ void RclMain::on_actionShowResultsAsTable_toggled(bool on)
restable->setVisible(on); restable->setVisible(on);
reslist->setVisible(!on); reslist->setVisible(!on);
actionSaveResultsAsCSV->setEnabled(on); actionSaveResultsAsCSV->setEnabled(on);
static QShortcut tablefocseq(QKeySequence("Ctrl+r"), this);
if (!on) { if (!on) {
int docnum = restable->getDetailDocNumOrTopRow(); int docnum = restable->getDetailDocNumOrTopRow();
if (docnum >= 0) if (docnum >= 0)
reslist->resultPageFor(docnum); reslist->resultPageFor(docnum);
disconnect(&tablefocseq, SIGNAL(activated()),
restable, SLOT(takeFocus()));
sSearch->takeFocus();
} else { } else {
int docnum = reslist->pageFirstDocNum(); int docnum = reslist->pageFirstDocNum();
if (docnum >= 0) { if (docnum >= 0) {
@ -1651,6 +1655,8 @@ void RclMain::on_actionShowResultsAsTable_toggled(bool on)
nextPageAction->setEnabled(false); nextPageAction->setEnabled(false);
prevPageAction->setEnabled(false); prevPageAction->setEnabled(false);
firstPageAction->setEnabled(false); firstPageAction->setEnabled(false);
connect(&tablefocseq, SIGNAL(activated()),
restable, SLOT(takeFocus()));
} }
} }

16
src/qtgui/restable.cpp
View File

@ -486,6 +486,9 @@ void ResTable::init()
tableView->setSelectionBehavior(QAbstractItemView::SelectRows); tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
tableView->setItemDelegate(new ResTableDelegate(this)); tableView->setItemDelegate(new ResTableDelegate(this));
tableView->setContextMenuPolicy(Qt::CustomContextMenu); tableView->setContextMenuPolicy(Qt::CustomContextMenu);
new QShortcut(QKeySequence("Ctrl+o"), this, SLOT(menuEdit()));
new QShortcut(QKeySequence("Ctrl+Shift+o"), this, SLOT(menuEditAndQuit()));
new QShortcut(QKeySequence("Ctrl+p"), this, SLOT(menuPreview()));
connect(tableView, SIGNAL(customContextMenuRequested(const QPoint&)), connect(tableView, SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(createPopupMenu(const QPoint&))); this, SLOT(createPopupMenu(const QPoint&)));
@ -651,6 +654,12 @@ void ResTable::on_tableView_entered(const QModelIndex& index)
onTableView_currentChanged(index); onTableView_currentChanged(index);
} }
void ResTable::takeFocus()
{
// LOGDEB(("resTable: take focus\n"));
tableView->setFocus(Qt::ShortcutFocusReason);
}
void ResTable::setDocSource(RefCntr<DocSequence> nsource) void ResTable::setDocSource(RefCntr<DocSequence> nsource)
{ {
LOGDEB(("ResTable::setDocSource\n")); LOGDEB(("ResTable::setDocSource\n"));
@ -908,6 +917,13 @@ void ResTable::menuEdit()
if (m_detaildocnum >= 0) if (m_detaildocnum >= 0)
emit editRequested(m_detaildoc); emit editRequested(m_detaildoc);
} }
void ResTable::menuEditAndQuit()
{
if (m_detaildocnum >= 0) {
emit editRequested(m_detaildoc);
m_rclmain->fileExit();
}
}
void ResTable::menuOpenWith(QAction *act) void ResTable::menuOpenWith(QAction *act)
{ {
if (act == 0) if (act == 0)

2
src/qtgui/restable.h
View File

@ -137,6 +137,7 @@ public slots:
virtual void menuSaveToFile(); virtual void menuSaveToFile();
virtual void menuSaveSelection(); virtual void menuSaveSelection();
virtual void menuEdit(); virtual void menuEdit();
virtual void menuEditAndQuit();
virtual void menuOpenWith(QAction *); virtual void menuOpenWith(QAction *);
virtual void menuCopyFN(); virtual void menuCopyFN();
virtual void menuCopyURL(); virtual void menuCopyURL();
@ -152,6 +153,7 @@ public slots:
virtual void saveAsCSV(); virtual void saveAsCSV();
virtual void linkWasClicked(const QUrl&); virtual void linkWasClicked(const QUrl&);
virtual void makeRowVisible(int row); virtual void makeRowVisible(int row);
virtual void takeFocus();
signals: signals:
void docPreviewClicked(int, Rcl::Doc, int); void docPreviewClicked(int, Rcl::Doc, int);