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

Result table: selecting a row with Shift pressed displays the text in the detail area instead of the result list paragraph

Browse Source
This commit is contained in:
Jean-Francois Dockes 2021-03-15 18:03:04 +01:00
parent 64005ac734
commit d3790c0f5e
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/qtgui/restable.cpp
View File

@ -643,6 +643,8 @@ void ResTable::init()
this, SLOT(onTableView_currentChanged(const QModelIndex&)));
connect(tableView, SIGNAL(doubleClicked(const QModelIndex&)),
this, SLOT(onDoubleClick(const QModelIndex&)));
connect(tableView, SIGNAL(clicked(const QModelIndex&)),
this, SLOT(onClicked(const QModelIndex&)));
m_pager = new ResTablePager(this);
m_pager->setHighLighter(&g_hiliter);
@ -726,18 +728,14 @@ void ResTable::onNewShortcuts()
}
}
bool ResTable::eventFilter(QObject* obj, QEvent* event)
bool ResTable::eventFilter(QObject*, QEvent *event)
{
if (event->type() == QEvent::KeyPress) {
QKeyEvent* key = static_cast<QKeyEvent*>(event);
if ((key->key() == Qt::Key_Enter) || (key->key() == Qt::Key_Return)) {
menuEdit();
return true;
} else {
return QObject::eventFilter(obj, event);
}
} else {
return QObject::eventFilter(obj, event);
}
return false;
}
@ -882,8 +880,16 @@ void ResTable::onTableView_currentChanged(const QModelIndex& index)
m_detail->init();
m_detaildocnum = index.row();
m_detaildoc = doc;
Qt::KeyboardModifiers mods = QApplication::keyboardModifiers();
if (tableView->selectionModel()->hasSelection() && (mods &= Qt::ShiftModifier)) {
bool loadok = rcldb->getDocRawText(m_detaildoc);
if (loadok) {
m_detail->setText(u8s2qs(m_detaildoc.text));
}
} else {
m_pager->displaySingleDoc(theconfig, m_detaildocnum, m_detaildoc,
m_model->m_hdata);
}
emit(detailDocChanged(doc, m_model->getDocSource()));
} else {
m_detaildocnum = -1;
@ -1073,6 +1079,16 @@ void ResTable::linkWasClicked(const QUrl &url)
}
}
void ResTable::onClicked(const QModelIndex& index)
{
// If the current row is the one clicked, currentChanged is not
// called so that we would not do the text display if we did not
// call it from here
if (index.row() == m_detaildocnum) {
onTableView_currentChanged(index);
}
}
void ResTable::onDoubleClick(const QModelIndex& index)
{
if (!m_model || !m_model->getDocSource())

1
src/qtgui/restable.h
View File

@ -160,6 +160,7 @@ public slots:
virtual void readDocSource(bool resetPos = true);
virtual void onSortDataChanged(DocSeqSortSpec);
virtual void createPopupMenu(const QPoint& pos);
virtual void onClicked(const QModelIndex&);
virtual void onDoubleClick(const QModelIndex&);
virtual void menuPreview();
virtual void menuSaveToFile();