Windows: GUI working ok AFAICS

This commit is contained in:
Jean-Francois Dockes 2015-10-07 18:02:13 +02:00
parent 601effdaf8
commit bdf5cb8755
3 changed files with 27 additions and 9 deletions

View file

@ -267,6 +267,13 @@ void RclMain::rebuildIndex()
QMessageBox::Cancel, QMessageBox::Cancel,
QMessageBox::NoButton); QMessageBox::NoButton);
if (rep == QMessageBox::Ok) { if (rep == QMessageBox::Ok) {
#ifdef _WIN32
// Under windows, it's necessary to close the db here, else Xapian
// won't be able to do what it wants with the (open) files. Of course
// if there are several GUI instances, this won't work...
if (rcldb)
rcldb->close();
#endif // _WIN32
// Could also mean that no helpers are missing, but then we // Could also mean that no helpers are missing, but then we
// won't try to show a message anyway (which is what // won't try to show a message anyway (which is what
// firstIndexing is used for) // firstIndexing is used for)

View file

@ -146,6 +146,12 @@ void RclMain::execIndexSched()
} }
void RclMain::showIndexSched(bool modal) void RclMain::showIndexSched(bool modal)
{ {
#ifdef _WIN32
QMessageBox::information(this, tr("Index scheduling"),
tr("Sorry, not available under Windows for now, use the File menu entries "
"to update the index"));
return;
#endif
LOGDEB(("showIndexSched()\n")); LOGDEB(("showIndexSched()\n"));
if (indexSched == 0) { if (indexSched == 0) {
indexSched = new IdxSchedW(this); indexSched = new IdxSchedW(this);

View file

@ -6,13 +6,13 @@
############## ##############
# Local values (to be adjusted) # Local values (to be adjusted)
# Target directory where we copy things. # Target directory where we copy things.
DESTDIR=/cygdrive/c/recollinst DESTDIR=c:/recollinst
# Recoll src/build tree # Recoll src/build tree
RECOLL=/cygdrive/c/recoll/src RECOLL=c:/recoll/src
UNRTF=/cygdrive/c/unrtf UNRTF=c:/unrtf
ANTIWORD=/cygdrive/c/recolldeps/antiword ANTIWORD=c:/recolldeps/antiword
CONFIGURATION=Debug CONFIGURATION=Debug
PLATFORM=x64 PLATFORM=x64
@ -52,8 +52,12 @@ copyrecoll()
cc $RECOLL/sampleconf/recoll.conf $DESTDIR/Share/examples cc $RECOLL/sampleconf/recoll.conf $DESTDIR/Share/examples
cc $RECOLL/sampleconf/recoll.qss $DESTDIR/Share/examples cc $RECOLL/sampleconf/recoll.qss $DESTDIR/Share/examples
cp $RECOLL/filters/* $FILTERS || exit 1 cp $RECOLL/filters/* $FILTERS || fatal Copy Filters failed
cp $RECOLL/python/recoll/recoll/rclconfig.py $FILTERS || exit 1 cp $RECOLL/python/recoll/recoll/rclconfig.py $FILTERS || fatal Copy rclconfig.py failed
cp $RECOLL/qtgui/mtpics/* $DESTDIR/Share/images
cp $RECOLL/qtgui/i18n/*.qm $DESTDIR/Share/translations
} }
copyantiword() copyantiword()
@ -79,9 +83,10 @@ copyunrtf()
} }
test -d $DESTDIR || mkdir -p $DESTDIR || exit 1 for d in doc examples filters images translations; do
test -d $DESTDIR/Share/examples || mkdir -p $DESTDIR/Share/examples || exit 1 test -d $DESTDIR/Share/$d || mkdir -p $DESTDIR/Share/$d || exit 1
test -d $FILTERS || mkdir -p $FILTERS || exit 1 done
copyrecoll copyrecoll
copyunrtf copyunrtf
copyantiword copyantiword