diff --git a/src/qtgui/advsearch.ui b/src/qtgui/advsearch.ui
index d67295fb..d5342b9d 100644
--- a/src/qtgui/advsearch.ui
+++ b/src/qtgui/advsearch.ui
@@ -24,7 +24,7 @@
- layout28
+ layout13
@@ -145,135 +145,147 @@
Horizontal
+
+
+ restrictFtCB
+
+
+ Restrict file types
+
+
- layout19
+ layout12
-
+
unnamed
-
+
- restrictFtCB
-
-
- Restrict file types
+ layout9
+
+
+ unnamed
+
+
+
+ textLabel2_2
+
+
+ Searched file types
+
+
+
+
+ yesFiltypsLB
+
+
+ false
+
+
+
+ 200
+ 100
+
+
+
+ Extended
+
+
+
layout11
-
+
unnamed
-
+
- layout9
+ delAFiltypPB
+
+
+ false
+
+
+ All ---->
-
-
- unnamed
-
-
-
- textLabel2_2
-
-
- Searched file types
-
-
-
-
- yesFiltypsLB
-
-
- false
-
-
-
- 200
- 100
-
-
-
- Extended
-
-
-
-
+
- layout11
+ delFiltypPB
+
+
+ false
+
+
+ Sel ----->
-
-
- unnamed
-
-
-
- delFiltypPB
-
-
- false
-
-
- -------->
-
-
-
-
- addFiltypPB
-
-
- false
-
-
- <---------
-
-
-
-
+
- layout10
+ addFiltypPB
+
+
+ false
+
+
+ <----- Sel
-
-
- unnamed
-
-
-
- textLabel3
-
-
- Ignored file types
-
-
-
-
- noFiltypsLB
-
-
- false
-
-
-
- 200
- 100
-
-
-
- Extended
-
-
-
-
+
+
+ addAFiltypPB
+
+
+ false
+
+
+ <----- All
+
+
+
-
+
+
+ layout10
+
+
+
+ unnamed
+
+
+
+ textLabel3
+
+
+ Ignored file types
+
+
+
+
+ noFiltypsLB
+
+
+ false
+
+
+
+ 200
+ 100
+
+
+
+ Extended
+
+
+
+
+
@@ -437,6 +449,18 @@
advsearch
searchPB_clicked()
+
+ delAFiltypPB
+ clicked()
+ advsearch
+ delAFiltypPB_clicked()
+
+
+ addAFiltypPB
+ clicked()
+ advsearch
+ addAFiltypPB_clicked()
+
recoll.h
@@ -447,7 +471,9 @@
delFiltypPB_clicked()
+ delAFiltypPB_clicked()
addFiltypPB_clicked()
+ addAFiltypPB_clicked()
restrictFtCB_toggled( bool on )
searchPB_clicked()
browsePB_clicked()
diff --git a/src/qtgui/advsearch.ui.h b/src/qtgui/advsearch.ui.h
index b453bf2f..615e577f 100644
--- a/src/qtgui/advsearch.ui.h
+++ b/src/qtgui/advsearch.ui.h
@@ -59,6 +59,13 @@ void advsearch::delFiltypPB_clicked()
noFiltypsLB->sort();
}
+void advsearch::delAFiltypPB_clicked()
+{
+ for (unsigned int i = 0; i < yesFiltypsLB->count();i++) {
+ yesFiltypsLB->setSelected(i, true);
+ }
+ delFiltypPB_clicked();
+}
// Move selected file types from the ignored to the searched box
void advsearch::addFiltypPB_clicked()
@@ -81,6 +88,14 @@ void advsearch::addFiltypPB_clicked()
noFiltypsLB->sort();
}
+void advsearch::addAFiltypPB_clicked()
+{
+ for (unsigned int i = 0; i < noFiltypsLB->count();i++) {
+ noFiltypsLB->setSelected(i, true);
+ }
+ addFiltypPB_clicked();
+}
+
// Activate file type selection
void advsearch::restrictFtCB_toggled(bool on)
@@ -88,6 +103,8 @@ void advsearch::restrictFtCB_toggled(bool on)
yesFiltypsLB->setEnabled(on);
delFiltypPB->setEnabled(on);
addFiltypPB->setEnabled(on);
+ delAFiltypPB->setEnabled(on);
+ addAFiltypPB->setEnabled(on);
noFiltypsLB->setEnabled(on);
}
@@ -116,3 +133,4 @@ void advsearch::browsePB_clicked()
QString dir = QFileDialog::getExistingDirectory();
subtreeLE->setText(dir);
}
+
diff --git a/src/sampleconf/mimeconf b/src/sampleconf/mimeconf
index fec72c92..c745bd68 100644
--- a/src/sampleconf/mimeconf
+++ b/src/sampleconf/mimeconf
@@ -1,4 +1,4 @@
-# @(#$Id: mimeconf,v 1.11 2005-11-25 09:14:14 dockes Exp $ (C) 2004 J.F.Dockes
+# @(#$Id: mimeconf,v 1.12 2005-11-30 09:46:48 dockes Exp $ (C) 2004 J.F.Dockes
# Recoll : associations of mime types to processing filters.
# There are different sections for decompression, 'interning' for indexing
@@ -55,17 +55,17 @@ text/plain = xemacs %f
text/html = firefox %u
application/pdf = xpdf %f
application/postscript = gv %f
-application/msword = openoffice-1.1.3-swriter %f
-application/vnd.sun.xml.calc = openoffice-1.1.3 %f
-application/vnd.sun.xml.calc.template = openoffice-1.1.3 %f
-application/vnd.sun.xml.draw = openoffice-1.1.3 %f
-application/vnd.sun.xml.draw.template = openoffice-1.1.3 %f
-application/vnd.sun.xml.impress = openoffice-1.1.3 %f
-application/vnd.sun.xml.impress.template = openoffice-1.1.3 %f
-application/vnd.sun.xml.math = openoffice-1.1.3 %f
-application/vnd.sun.xml.writer = openoffice-1.1.3 %f
-application/vnd.sun.xml.writer.global = openoffice-1.1.3 %f
-application/vnd.sun.xml.writer.template = openoffice-1.1.3 %f
+application/msword = openoffice %f
+application/vnd.sun.xml.calc = openoffice %f
+application/vnd.sun.xml.calc.template = openoffice %f
+application/vnd.sun.xml.draw = openoffice %f
+application/vnd.sun.xml.draw.template = openoffice %f
+application/vnd.sun.xml.impress = openoffice %f
+application/vnd.sun.xml.impress.template = openoffice %f
+application/vnd.sun.xml.math = openoffice %f
+application/vnd.sun.xml.writer = openoffice %f
+application/vnd.sun.xml.writer.global = openoffice %f
+application/vnd.sun.xml.writer.template = openoffice %f
# Icons to be used in the result list.
[icons]