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

Change message after interrupting indexing from "failed" to "interrupted"

Browse Source
This commit is contained in:
Jean-Francois Dockes 2014-12-18 08:17:20 +01:00
parent bc6e025a0c
commit 94e9567bb6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/qtgui/rclmain_w.cpp
View File

@ -752,8 +752,14 @@ void RclMain::periodic100()
if (exited) { if (exited) {
deleteZ(m_idxproc); deleteZ(m_idxproc);
if (status) { if (status) {
QMessageBox::warning(0, "Recoll", if (m_idxkilled) {
tr("Indexing failed")); QMessageBox::warning(0, "Recoll",
tr("Indexing interrupted"));
m_idxkilled = false;
} else {
QMessageBox::warning(0, "Recoll",
tr("Indexing failed"));
}
} else { } else {
// On the first run, show missing helpers. We only do this once // On the first run, show missing helpers. We only do this once
if (m_firstIndexing) if (m_firstIndexing)
@ -825,8 +831,10 @@ void RclMain::toggleIndexing()
// Indexing was in progress, request stop. Let the periodic // Indexing was in progress, request stop. Let the periodic
// routine check for the results. // routine check for the results.
int pid = m_idxproc->getChildPid(); int pid = m_idxproc->getChildPid();
if (pid > 0) if (pid > 0) {
kill(pid, SIGTERM); kill(pid, SIGTERM);
m_idxkilled = true;
}
} }
break; break;
case IXST_RUNNINGNOTMINE: case IXST_RUNNINGNOTMINE:

2
src/qtgui/rclmain_w.h
View File

@ -74,6 +74,7 @@ public:
m_toolsTB(0), m_resTB(0), m_toolsTB(0), m_resTB(0),
m_filtFRM(0), m_filtCMB(0), m_filtBGRP(0), m_filtMN(0), m_filtFRM(0), m_filtCMB(0), m_filtBGRP(0), m_filtMN(0),
m_idxproc(0), m_idxproc(0),
m_idxkilled(false),
m_catgbutvecidx(0), m_catgbutvecidx(0),
m_sortspecnochange(false), m_sortspecnochange(false),
m_indexerState(IXST_RUNNINGNOTMINE), m_indexerState(IXST_RUNNINGNOTMINE),
@ -197,6 +198,7 @@ private:
QFileSystemWatcher m_watcher; QFileSystemWatcher m_watcher;
vector<ExecCmd*> m_viewers; vector<ExecCmd*> m_viewers;
ExecCmd *m_idxproc; // Indexing process ExecCmd *m_idxproc; // Indexing process
bool m_idxkilled; // Killed my process
map<QString, QAction*> m_stemLangToId; map<QString, QAction*> m_stemLangToId;
vector<string> m_catgbutvec; vector<string> m_catgbutvec;
int m_catgbutvecidx; int m_catgbutvecidx;