diff --git a/src/qtgui/guiutils.cpp b/src/qtgui/guiutils.cpp
index 7b51f6b6..66910fd8 100644
--- a/src/qtgui/guiutils.cpp
+++ b/src/qtgui/guiutils.cpp
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.18 2006-09-13 15:31:06 dockes Exp $ (C) 2005 Jean-Francois Dockes";
+static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.19 2006-09-15 16:49:27 dockes Exp $ (C) 2005 Jean-Francois Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -135,12 +135,11 @@ void rwSettings(bool writing)
"/Recoll/prefs/startWithAdvSearchOpen", Bool, false);
SETTING_RW(prefs.startWithSortToolOpen,
"/Recoll/prefs/startWithSortToolOpen", Bool, false);
-
SETTING_RW(prefs.showicons, "/Recoll/prefs/reslist/showicons", Bool, true);
SETTING_RW(prefs.autoSearchOnWS, "/Recoll/prefs/reslist/autoSearchOnWS",
Bool, false);
SETTING_RW(prefs.ssearchAutoPhrase,
- "/Recoll/prefs/startWithSortToolOpen", Bool, false);
+ "/Recoll/prefs/ssearchAutoPhrase", Bool, false);
SETTING_RW(prefs.respagesize, "/Recoll/prefs/reslist/pagelen", Num, 8);
SETTING_RW(prefs.reslistfontfamily, "/Recoll/prefs/reslist/fontFamily", ,
"");
@@ -216,7 +215,7 @@ void rwSettings(bool writing)
prefs.allExtraDbs.end())
continue;
if (!Rcl::Db::testDbDir(dbdir)) {
- LOGERR(("Not a xapian database: [%s]\n", dbdir.c_str()));
+ LOGERR(("Not a xapian index: [%s]\n", dbdir.c_str()));
continue;
}
prefs.allExtraDbs.push_back(dbdir);
diff --git a/src/qtgui/guiutils.h b/src/qtgui/guiutils.h
index a0d0fdd7..b663f835 100644
--- a/src/qtgui/guiutils.h
+++ b/src/qtgui/guiutils.h
@@ -17,7 +17,7 @@
#ifndef _GUIUTILS_H_INCLUDED_
#define _GUIUTILS_H_INCLUDED_
/*
- * @(#$Id: guiutils.h,v 1.10 2006-09-13 15:31:06 dockes Exp $ (C) 2005 Jean-Francois Dockes
+ * @(#$Id: guiutils.h,v 1.11 2006-09-15 16:49:27 dockes Exp $ (C) 2005 Jean-Francois Dockes
* jean-francois.dockes@wanadoo.fr
*
* This program is free software; you can redistribute it and/or modify
@@ -66,7 +66,7 @@ class PrefsPack {
bool queryReplaceAbstract;
bool startWithAdvSearchOpen;
bool startWithSortToolOpen;
- // Extra query databases. This are encoded to base64 before storing
+ // Extra query indexes. This are encoded to base64 before storing
// to the qt settings file to avoid any bin string/ charset conv issues
list allExtraDbs;
list activeExtraDbs;
diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in
index 711615bd..8036695c 100644
--- a/src/qtgui/recoll.pro.in
+++ b/src/qtgui/recoll.pro.in
@@ -3,21 +3,36 @@ LANGUAGE = C++
CONFIG += qt warn_on thread release debug
-HEADERS += rclmain.h rclreslist.h
+HEADERS += \
+ advsearch_w.h \
+ preview_w.h \
+ rclmain.h \
+ rclreslist.h \
+ sort_w.h \
+ ssearch_w.h \
+ uiprefs_w.h
-SOURCES += main.cpp \
- rclmain.cpp \
- idxthread.cpp \
- plaintorich.cpp \
+
+SOURCES += \
guiutils.cpp \
- rclreslist.cpp
+ idxthread.cpp \
+ main.cpp \
+ plaintorich.cpp \
+ rclmain.cpp \
+ rclreslist.cpp \
+ advsearch_w.cpp \
+ preview_w.cpp \
+ sort_w.cpp \
+ ssearch_w.cpp \
+ uiprefs_w.cpp
-FORMS = recollmain.ui \
+FORMS = \
advsearch.ui \
preview.ui \
+ recollmain.ui \
sort.ui \
- uiprefs.ui \
- ssearchb.ui
+ ssearchb.ui \
+ uiprefs.ui
IMAGES = images/asearch.png \
images/history.png \
diff --git a/src/qtgui/uiprefs.ui b/src/qtgui/uiprefs.ui
index 0dba266b..888ccf6c 100644
--- a/src/qtgui/uiprefs.ui
+++ b/src/qtgui/uiprefs.ui
@@ -260,6 +260,20 @@
A search for [rolling stones] (2 terms) will be changed to [rolling or stones or (rolling phrase 2 stones)].
+
+
+ line2
+
+
+ HLine
+
+
+ Sunken
+
+
+ Horizontal
+
+
buildAbsCB
@@ -400,7 +414,7 @@ May be slow for big documents.
ExtraDb
- External Databases
+ External Indexes
@@ -422,10 +436,10 @@ May be slow for big documents.
false
- Add database
+ Add index
- Select the xapiandb directory for the database you want to add, then click Add Database
+ Select the xapiandb directory for the index you want to add, then click Add Index
@@ -439,7 +453,7 @@ May be slow for big documents.
- Select the xapiandb directory for the database you want to add, then click Add Database
+ Select the xapiandb directory for the index you want to add, then click Add Index
@@ -450,7 +464,7 @@ May be slow for big documents.
Browse
- Select the xapiandb directory for the database you want to add, then click Add Database
+ Select the xapiandb directory for the index you want to add, then click Add Index
@@ -476,10 +490,10 @@ May be slow for big documents.
textLabel2_2
- All databases
+ All indexes
- Databases currently not used
+ Indexes currently not used
@@ -580,10 +594,10 @@ May be slow for big documents.
textLabel5
- Active databases
+ Active indexes
- Databases that will be searched in addition to the main one
+ Indexes that will be searched in addition to the main one
diff --git a/src/qtgui/uiprefs_w.cpp b/src/qtgui/uiprefs_w.cpp
index 9b07078b..1dd3b659 100644
--- a/src/qtgui/uiprefs_w.cpp
+++ b/src/qtgui/uiprefs_w.cpp
@@ -1,5 +1,5 @@
#ifndef lint
-static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.5 2006-09-13 15:31:07 dockes Exp $ (C) 2005 J.F.Dockes";
+static char rcsid[] = "@(#$Id: uiprefs_w.cpp,v 1.6 2006-09-15 16:49:27 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -105,7 +105,7 @@ void UIPrefsDialog::init()
}
replAbsCB->setChecked(prefs.queryReplaceAbstract);
- // Initialize the extra databases listboxes
+ // Initialize the extra indexes listboxes
QStringList ql;
for (list::iterator it = prefs.allExtraDbs.begin();
it != prefs.allExtraDbs.end(); it++) {
@@ -233,7 +233,7 @@ void UIPrefsDialog::showBrowserDialog()
}
////////////////////////////////////////////
-// External / extra search databases setup
+// External / extra search indexes setup
// TBD: a way to remove entry from 'all' list (del button?)
void UIPrefsDialog::extraDbTextChanged(const QString &text)
@@ -292,7 +292,7 @@ void UIPrefsDialog::delADbPB_clicked()
}
/**
- * Remove all extra search databases from the active list
+ * Remove all extra search indexes from the active list
*/
void UIPrefsDialog::delAADbPB_clicked()
{
@@ -313,7 +313,7 @@ void UIPrefsDialog::addExtraDbPB_clicked()
path_catslash(dbdir);
if (!Rcl::Db::testDbDir(dbdir)) {
QMessageBox::warning(0, "Recoll",
- tr("The selected directory does not appear to be a Xapian database"));
+ tr("The selected directory does not appear to be a Xapian index"));
return;
}
struct stat st1, st2;
@@ -326,13 +326,13 @@ void UIPrefsDialog::addExtraDbPB_clicked()
fprintf(stderr, "rcldbdir: [%s]\n", rcldbdir.c_str());
if (st1.st_dev == st2.st_dev && st1.st_ino == st2.st_ino) {
QMessageBox::warning(0, "Recoll",
- tr("This is the main/local database!"));
+ tr("This is the main/local index!"));
return;
}
if (allDbsLB->findItem(extraDbLE->text(),
Qt::CaseSensitive|Qt::ExactMatch)) {
QMessageBox::warning(0, "Recoll",
- tr("The selected directory is already in the database list"));
+ tr("The selected directory is already in the index list"));
return;
}
allDbsLB->insertItem(extraDbLE->text());
@@ -345,7 +345,7 @@ void UIPrefsDialog::browseDbPB_clicked()
bool savedh = fdia.showHiddenFiles();
fdia.setShowHiddenFiles(true);
QString s = QFileDialog::getExistingDirectory("", this, 0,
-tr("Select directory holding xapian database (ie: /home/someone/.recoll/xapiandb)"));
+ tr("Select xapian index directory (ie: /home/buddy/.recoll/xapiandb)"));
fdia.setShowHiddenFiles(savedh);
if (s)