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

restable: add shortcut to open snippets window (ctrl+e). connections cleanup

Browse Source
This commit is contained in:
Jean-Francois Dockes 2019-11-22 18:22:47 +01:00
parent 021941bf6f
commit fdd653a2cf
2 changed files with 289 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/qtgui/rclmain_w.cpp
View File

@ -278,11 +278,6 @@ void RclMain::init()
actionShowResultsAsTable->setChecked(prefs.showResultsAsTable); actionShowResultsAsTable->setChecked(prefs.showResultsAsTable);
on_actionShowResultsAsTable_toggled(prefs.showResultsAsTable); on_actionShowResultsAsTable_toggled(prefs.showResultsAsTable);
// Must not do this when restable is a child of rclmain
// sc = new QShortcut(quitKeySeq, restable);
// connect(sc, SIGNAL (activated()), this, SLOT (fileExit()));
// A shortcut to get the focus back to the search entry. // A shortcut to get the focus back to the search entry.
QKeySequence seq("Ctrl+Shift+s"); QKeySequence seq("Ctrl+Shift+s");
QShortcut *sc = new QShortcut(seq, this); QShortcut *sc = new QShortcut(seq, this);
@ -389,16 +384,8 @@ void RclMain::init()
this, SLOT(docExpand(Rcl::Doc))); this, SLOT(docExpand(Rcl::Doc)));
connect(restable, SIGNAL(showSubDocs(Rcl::Doc)), connect(restable, SIGNAL(showSubDocs(Rcl::Doc)),
this, SLOT(showSubDocs(Rcl::Doc))); this, SLOT(showSubDocs(Rcl::Doc)));
connect(restable, SIGNAL(previewRequested(Rcl::Doc)),
this, SLOT(startPreview(Rcl::Doc)));
connect(restable, SIGNAL(editRequested(Rcl::Doc)),
this, SLOT(startNativeViewer(Rcl::Doc)));
connect(restable, SIGNAL(openWithRequested(Rcl::Doc, string)), connect(restable, SIGNAL(openWithRequested(Rcl::Doc, string)),
this, SLOT(openWith(Rcl::Doc, string))); this, SLOT(openWith(Rcl::Doc, string)));
connect(restable, SIGNAL(docSaveToFileClicked(Rcl::Doc)),
this, SLOT(saveDocToFile(Rcl::Doc)));
connect(restable, SIGNAL(showSnippets(Rcl::Doc)),
this, SLOT(showSnippets(Rcl::Doc)));
reslist->setRclMain(this, true); reslist->setRclMain(this, true);
connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)), connect(this, SIGNAL(docSourceChanged(std::shared_ptr<DocSequence>)),

26
src/qtgui/restable.cpp
View File

@ -512,6 +512,8 @@ void ResTable::init()
new QShortcut(QKeySequence("Ctrl+o"), this, SLOT(menuEdit())); new QShortcut(QKeySequence("Ctrl+o"), this, SLOT(menuEdit()));
new QShortcut(QKeySequence("Ctrl+Shift+o"), this, SLOT(menuEditAndQuit())); new QShortcut(QKeySequence("Ctrl+Shift+o"), this, SLOT(menuEditAndQuit()));
new QShortcut(QKeySequence("Ctrl+d"), this, SLOT(menuPreview())); new QShortcut(QKeySequence("Ctrl+d"), this, SLOT(menuPreview()));
new QShortcut(QKeySequence("Ctrl+e"), this, SLOT(menuShowSnippets()));
connect(tableView, SIGNAL(customContextMenuRequested(const QPoint&)), connect(tableView, SIGNAL(customContextMenuRequested(const QPoint&)),
this, SLOT(createPopupMenu(const QPoint&))); this, SLOT(createPopupMenu(const QPoint&)));
@ -543,10 +545,8 @@ void ResTable::init()
ROWHEIGHTPAD); ROWHEIGHTPAD);
} }
QKeySequence seq("Esc"); QShortcut *sc = new QShortcut(QKeySequence(Qt::Key_Escape), this);
QShortcut *sc = new QShortcut(seq, this); connect(sc, SIGNAL(activated()), tableView->selectionModel(), SLOT(clear()));
connect(sc, SIGNAL(activated()),
tableView->selectionModel(), SLOT(clear()));
connect(tableView->selectionModel(), connect(tableView->selectionModel(),
SIGNAL(currentChanged(const QModelIndex&, const QModelIndex &)), SIGNAL(currentChanged(const QModelIndex&, const QModelIndex &)),
this, SLOT(onTableView_currentChanged(const QModelIndex&))); this, SLOT(onTableView_currentChanged(const QModelIndex&)));
@ -609,17 +609,21 @@ void ResTable::setRclMain(RclMain *m, bool ismain)
tableView->setSelectionMode(QAbstractItemView::ExtendedSelection); tableView->setSelectionMode(QAbstractItemView::ExtendedSelection);
if (!m_ismainres) { if (!m_ismainres) {
connect(new QShortcut(closeKeySeq, this), SIGNAL (activated()), // don't set this shortcut when we are a child of main, would
this, SLOT (close())); // be duplicate/ambiguous
connect(new QShortcut(quitKeySeq, this), SIGNAL (activated()), connect(new QShortcut(quitKeySeq, this), SIGNAL(activated()),
m_rclmain, SLOT (fileExit())); m_rclmain, SLOT (fileExit()));
}
new QShortcut(closeKeySeq, this, SLOT (close()));
connect(this, SIGNAL(previewRequested(Rcl::Doc)), connect(this, SIGNAL(previewRequested(Rcl::Doc)),
m_rclmain, SLOT(startPreview(Rcl::Doc))); m_rclmain, SLOT(startPreview(Rcl::Doc)));
connect(this, SIGNAL(docSaveToFileClicked(Rcl::Doc)),
m_rclmain, SLOT(saveDocToFile(Rcl::Doc)));
connect(this, SIGNAL(editRequested(Rcl::Doc)), connect(this, SIGNAL(editRequested(Rcl::Doc)),
m_rclmain, SLOT(startNativeViewer(Rcl::Doc))); m_rclmain, SLOT(startNativeViewer(Rcl::Doc)));
} connect(this, SIGNAL(docSaveToFileClicked(Rcl::Doc)),
m_rclmain, SLOT(saveDocToFile(Rcl::Doc)));
connect(this, SIGNAL(showSnippets(Rcl::Doc)),
m_rclmain, SLOT(showSnippets(Rcl::Doc)));
} }
int ResTable::getDetailDocNumOrTopRow() int ResTable::getDetailDocNumOrTopRow()
@ -638,7 +642,7 @@ void ResTable::makeRowVisible(int row)
tableView->selectionModel()->clear(); tableView->selectionModel()->clear();
m_detail->clear(); m_detail->clear();
m_detaildocnum = -1; m_detaildocnum = -1;
} }
// This is called by rclmain_w prior to exiting // This is called by rclmain_w prior to exiting
void ResTable::saveColState() void ResTable::saveColState()