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

mime categories

Browse Source
This commit is contained in:
dockes
2006-12-20 13:12:49 +00:00
parent 071997c6bb
commit 50174005a1
8 changed files with 206 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/qtgui/advsearch.ui
+19
View File
@@ -223,6 +223,25 @@
<string>Restrict file types</string>
</property>
</widget>
<widget class="QCheckBox">
<property name="name">
<cstring>restrictCtCB</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>By categories</string>
</property>
<property name="enabled">
<bool>false</bool>
</property>
</widget>
<widget class="QPushButton">
<property name="name">
<cstring>saveFileTypesPB</cstring>
src/qtgui/advsearch_w.cpp
+99 -12
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.15 2006-12-04 08:17:24 dockes Exp $ (C) 2005 J.F.Dockes";
static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.16 2006-12-20 13:12:49 dockes Exp $ (C) 2005 J.F.Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -42,10 +42,12 @@ static char rcsid[] = "@(#$Id: advsearch_w.cpp,v 1.15 2006-12-04 08:17:24 dockes
#include <list>
#include <string>
#include <map>
#ifndef NO_NAMESPACES
using std::list;
using std::string;
using std::map;
#endif /* NO_NAMESPACES */
#include "recoll.h"
@@ -66,6 +68,8 @@ void AdvSearch::init()
connect(searchPB, SIGNAL(clicked()), this, SLOT(searchPB_clicked()));
connect(restrictFtCB, SIGNAL(toggled(bool)),
this, SLOT(restrictFtCB_toggled(bool)));
connect(restrictCtCB, SIGNAL(toggled(bool)),
this, SLOT(restrictCtCB_toggled(bool)));
connect(dismissPB, SIGNAL(clicked()), this, SLOT(close()));
connect(browsePB, SIGNAL(clicked()), this, SLOT(browsePB_clicked()));
connect(addFiltypPB, SIGNAL(clicked()), this, SLOT(addFiltypPB_clicked()));
@@ -101,18 +105,12 @@ void AdvSearch::init()
}
}
}
// Initialize lists of accepted and ignored mime types from config
// and settings
list<string> types = rclconfig->getAllMimeTypes();
noFiltypsLB->insertStringList(prefs.asearchIgnFilTyps);
QStringList ql;
for (list<string>::iterator it = types.begin(); it != types.end(); it++) {
if (prefs.asearchIgnFilTyps.findIndex(it->c_str())<0)
ql.append(it->c_str());
}
yesFiltypsLB->insertStringList(ql);
restrictCtCB->setChecked(prefs.fileTypesByCats);
restrictCtCB->setEnabled(false);
fillFileTypes();
subtreeCMB->insertStringList(prefs.asearchSubdirHist);
subtreeCMB->setEditText("");
@@ -268,6 +266,7 @@ void AdvSearch::addAFiltypPB_clicked()
// Activate file type selection
void AdvSearch::restrictFtCB_toggled(bool on)
{
restrictCtCB->setEnabled(on);
yesFiltypsLB->setEnabled(on);
delFiltypPB->setEnabled(on);
addFiltypPB->setEnabled(on);
@@ -277,6 +276,75 @@ void AdvSearch::restrictFtCB_toggled(bool on)
saveFileTypesPB->setEnabled(on);
}
void AdvSearch::restrictCtCB_toggled(bool on)
{
prefs.fileTypesByCats = on;
fillFileTypes();
}
static map<QString,QString> cat_translations;
static map<QString,QString> cat_rtranslations;
void AdvSearch::fillFileTypes()
{
noFiltypsLB->clear();
yesFiltypsLB->clear();
if (prefs.fileTypesByCats == false) {
list<string> types = rclconfig->getAllMimeTypes();
noFiltypsLB->insertStringList(prefs.asearchIgnFilTyps);
QStringList ql;
for (list<string>::iterator it = types.begin();
it != types.end(); it++) {
if (prefs.asearchIgnFilTyps.findIndex(it->c_str())<0)
ql.append(it->c_str());
}
yesFiltypsLB->insertStringList(ql);
} else {
cat_translations.clear();
// Make sure we have entries for all defined categories
// Translations for known cats
cat_translations[QString::fromUtf8("texts")] = tr("texts");
cat_rtranslations[tr("texts")] = QString::fromUtf8("texts");
cat_translations[QString::fromUtf8("spreadsheets")] =
tr("spreadsheets");
cat_rtranslations[tr("spreadsheets")] =
QString::fromUtf8("spreadsheets");
cat_translations[QString::fromUtf8("presentations")] =
tr("presentations");
cat_rtranslations[tr("presentations")] =
QString::fromUtf8("presentations");
cat_translations[QString::fromUtf8("media")] = tr("media");
cat_rtranslations[tr("media")] = QString::fromUtf8("media");
cat_translations[QString::fromUtf8("messages")] = tr("messages");
cat_rtranslations[tr("messages")] = QString::fromUtf8("messages");
cat_translations[QString::fromUtf8("other")] = tr("other");
cat_rtranslations[tr("other")] = QString::fromUtf8("other");
list<string> cats;
rclconfig->getMimeCategories(cats);
QStringList ql;
for (list<string>::const_iterator it = cats.begin();
it != cats.end(); it++) {
map<QString, QString>::const_iterator it1;
if ((it1 =
cat_translations.find(QString::fromUtf8((*it).c_str())))
!= cat_translations.end()) {
ql.append(it1->second);
} else {
ql.append(QString::fromUtf8((*it).c_str()));
}
}
yesFiltypsLB->insertStringList(ql);
}
}
using namespace Rcl;
void AdvSearch::searchPB_clicked()
{
@@ -306,7 +374,26 @@ void AdvSearch::searchPB_clicked()
}
if (restrictFtCB->isOn() && noFiltypsLB->count() > 0) {
for (unsigned int i = 0; i < yesFiltypsLB->count(); i++) {
sdata->addFiletype((const char *)yesFiltypsLB->item(i)->text().utf8());
if (restrictCtCB->isOn()) {
QString qcat = yesFiltypsLB->item(i)->text();
map<QString,QString>::const_iterator qit;
string cat;
if ((qit = cat_rtranslations.find(qcat)) !=
cat_rtranslations.end()) {
cat = (const char *)qit->second.utf8();
} else {
cat = (const char *)qcat.utf8();
}
list<string> types;
rclconfig->getMimeCatTypes(cat, types);
for (list<string>::const_iterator it = types.begin();
it != types.end(); it++) {
sdata->addFiletype(*it);
}
} else {
sdata->addFiletype((const char *)
yesFiltypsLB->item(i)->text().utf8());
}
}
}
src/qtgui/advsearch_w.h
+4 -2
View File
@@ -1,6 +1,6 @@
#ifndef _ADVSEARCH_W_H_INCLUDED_
#define _ADVSEARCH_W_H_INCLUDED_
/* @(#$Id: advsearch_w.h,v 1.10 2006-12-04 09:56:26 dockes Exp $ (C) 2005 J.F.Dockes */
/* @(#$Id: advsearch_w.h,v 1.11 2006-12-20 13:12:49 dockes Exp $ (C) 2005 J.F.Dockes */
/*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -65,7 +65,8 @@ public slots:
virtual void delAFiltypPB_clicked();
virtual void addFiltypPB_clicked();
virtual void addAFiltypPB_clicked();
virtual void restrictFtCB_toggled(bool on);
virtual void restrictFtCB_toggled(bool);
virtual void restrictCtCB_toggled(bool);
virtual void searchPB_clicked();
virtual void browsePB_clicked();
virtual void saveFileTypes();
@@ -84,6 +85,7 @@ private:
virtual void init();
std::list<SearchClauseW *> m_clauseWins;
void saveCnf();
void fillFileTypes();
};
src/qtgui/guiutils.cpp
+4 -2
View File
@@ -1,5 +1,5 @@
#ifndef lint
static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.27 2006-12-04 06:19:11 dockes Exp $ (C) 2005 Jean-Francois Dockes";
static char rcsid[] = "@(#$Id: guiutils.cpp,v 1.28 2006-12-20 13:12:49 dockes Exp $ (C) 2005 Jean-Francois Dockes";
#endif
/*
* This program is free software; you can redistribute it and/or modify
@@ -226,7 +226,7 @@ void rwSettings(bool writing)
SETTING_RW(prefs.ssearchAutoPhrase,
"/Recoll/prefs/query/ssearchAutoPhrase", Bool, false);
// Ssearch combobox history list
// Ignored file types (advanced search)
if (writing) {
settings.writeEntry("/Recoll/prefs/query/asearchIgnFilTyps",
prefs.asearchIgnFilTyps);
@@ -234,6 +234,8 @@ void rwSettings(bool writing)
prefs.asearchIgnFilTyps =
settings.readListEntry("/Recoll/prefs/query/asearchIgnFilTyps");
}
SETTING_RW(prefs.fileTypesByCats, "/Recoll/prefs/query/asearchFilTypByCat",
Bool, false);
// The extra databases settings. These are stored as a list of
// xapian directory names, encoded in base64 to avoid any
src/qtgui/guiutils.h
+3 -2
View File
@@ -17,7 +17,7 @@
#ifndef _GUIUTILS_H_INCLUDED_
#define _GUIUTILS_H_INCLUDED_
/*
* @(#$Id: guiutils.h,v 1.18 2006-11-30 13:38:44 dockes Exp $ (C) 2005 Jean-Francois Dockes
* @(#$Id: guiutils.h,v 1.19 2006-12-20 13:12:49 dockes Exp $ (C) 2005 Jean-Francois Dockes
* jean-francois.dockes@wanadoo.fr
*
* This program is free software; you can redistribute it and/or modify
@@ -92,7 +92,8 @@ class PrefsPack {
bool ssearchAutoPhrase;
// Ignored file types in adv search (startup default)
QStringList asearchIgnFilTyps;
bool fileTypesByCats;
// Synthetized abstract length and word context size
int syntAbsLen;
int syntAbsCtx;