summaryrefslogtreecommitdiff
authortille <tille>2003-05-16 15:18:21 (UTC)
committer tille <tille>2003-05-16 15:18:21 (UTC)
commit75f1e9815410e75a6f9ae76d8db716c0c315ea45 (patch) (side-by-side diff)
treef21eea4fb09db52644dc0141f8d368997ec322f0
parent708f1846703c3f13f7c9ac67130b6930f9607523 (diff)
downloadopie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.zip
opie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.tar.gz
opie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.tar.bz2
search in text documents
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/applnksearch.cpp4
-rw-r--r--core/pim/osearch/applnksearch.h6
-rw-r--r--core/pim/osearch/doclnksearch.cpp56
-rw-r--r--core/pim/osearch/doclnksearch.h13
-rw-r--r--core/pim/osearch/mainwindow.cpp10
-rw-r--r--core/pim/osearch/searchgroup.cpp15
-rw-r--r--core/pim/osearch/searchgroup.h3
7 files changed, 87 insertions, 20 deletions
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 5fa36bb..403c719 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -38,25 +38,27 @@ void AppLnkSearch::load()
{
_apps = new AppLnkSet(QPEApplication::qpeDir());
}
int AppLnkSearch::search()
{
QList<AppLnk> appList = _apps->children();
for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
if ( (_search.match( app->name() ) != -1)
|| (_search.match(app->comment()) != -1)
|| (_search.match(app->exec()) != -1) ) {
insertItem( app );
- }
+ }else
+ if (searchFile( app ))
+ insertItem( app );
qApp->processEvents( 100 );
}
return _resultCount;
}
void AppLnkSearch::insertItem( void *rec )
{
new AppLnkItem( this, (AppLnk*)rec );
_resultCount++;
}
void AppLnkSearch::setSearch(QRegExp re)
diff --git a/core/pim/osearch/applnksearch.h b/core/pim/osearch/applnksearch.h
index 6bb7486..853064d 100644
--- a/core/pim/osearch/applnksearch.h
+++ b/core/pim/osearch/applnksearch.h
@@ -7,32 +7,34 @@
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef APPLNKSEARCH_H
#define APPLNKSEARCH_H
#include "searchgroup.h"
class AppLnkSet;
+class AppLnk;
/**
@author Patrick S. Vogt
*/
class AppLnkSearch : public SearchGroup
{
public:
AppLnkSearch(QListView* parent, QString name);
-
~AppLnkSearch();
virtual void setSearch(QRegExp);
+
+protected:
virtual void load();
virtual int search();
virtual void insertItem( void* );
-
+ virtual bool searchFile(AppLnk*) { return false; };
AppLnkSet *_apps;
};
#endif
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index d97eeb8..321d011 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -1,43 +1,91 @@
//
//
// C++ Implementation: $MODULE$
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
-#include "doclnksearch.h"
-#include <qpe/applnk.h>
-#include <qpe/qpeapplication.h>
+#include <qaction.h>
+#include <qfile.h>
#include <qiconset.h>
+#include <qpopupmenu.h>
+#include <qtextstream.h>
+#include <qpe/applnk.h>
+#include <qpe/config.h>
#include <qpe/resource.h>
+#include <qpe/qpeapplication.h>
+#include <opie/owait.h>
#include "doclnkitem.h"
+#include "doclnksearch.h"
DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
-: AppLnkSearch(parent, name)
+: AppLnkSearch(parent, name), _popupMenu(0)
{
QIconSet is = Resource::loadIconSet( "osearch/documents" );
setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+
+ actionSearchInFiles = new QAction( QObject::tr("search content"),QString::null, 0, 0, 0, true );
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "doclnk_settings" );
+ actionSearchInFiles->setOn( cfg.readBoolEntry( "search_content", false ) );
}
DocLnkSearch::~DocLnkSearch()
{
+ Config cfg( "osearch", Config::User );
+ cfg.setGroup( "doclnk_settings" );
+ cfg.writeEntry( "search_content", actionSearchInFiles->isOn() );
}
void DocLnkSearch::load()
{
_apps = new DocLnkSet(QPEApplication::documentDir());
}
+bool DocLnkSearch::searchFile( AppLnk *app )
+{
+ if (!actionSearchInFiles->isOn()) return false;
+ DocLnk *doc = (DocLnk*)app;
+ bool found = false;
+ if ( doc->type().contains( "text" ) ){
+#ifdef NEW_OWAIT
+ QString ouput = QObject::tr("searching %1").arg(doc->file());
+ OWait( output );
+#endif
+ QFile f(doc->file());
+ if ( f.open(IO_ReadOnly) ) {
+ QTextStream t( &f );
+ while ( !t.eof() )
+ if (_search.match( t.readLine()) != -1) {
+ found = true;
+ break;
+ }
+ }
+ f.close();
+ }
+ return found;
+}
+
void DocLnkSearch::insertItem( void *rec )
{
new DocLnkItem( this, (DocLnk*)rec );
_resultCount++;
}
+
+
+QPopupMenu* DocLnkSearch::popupMenu()
+{
+ if (!_popupMenu){
+ _popupMenu = new QPopupMenu( 0 );
+ actionSearchInFiles->addTo( _popupMenu );
+ }
+ return _popupMenu;
+}
diff --git a/core/pim/osearch/doclnksearch.h b/core/pim/osearch/doclnksearch.h
index e2ac40b..81a8e62 100644
--- a/core/pim/osearch/doclnksearch.h
+++ b/core/pim/osearch/doclnksearch.h
@@ -1,33 +1,42 @@
//
//
// C++ Interface: $MODULE$
//
-// Description:
+// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
#ifndef DOCLNKSEARCH_H
#define DOCLNKSEARCH_H
#include "applnksearch.h"
+class QAction;
+class QPopupMenu;
+
/**
@author Patrick S. Vogt
*/
-class DocLnkSearch : public AppLnkSearch
+class DocLnkSearch : public AppLnkSearch
{
public:
DocLnkSearch(QListView* parent, QString name);
~DocLnkSearch();
+ virtual QPopupMenu* popupMenu();
+
protected:
virtual void load();
+ virtual bool searchFile(AppLnk*);
virtual void insertItem( void* );
+private:
+ QAction *actionSearchInFiles;
+ QPopupMenu *_popupMenu;
};
#endif
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 89ab690..6070fdf 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -11,24 +11,25 @@
#include "mainwindow.h"
#include <qpe/qpemenubar.h>
#include <qpe/qpemessagebox.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <qpe/qpetoolbar.h>
#include <qpe/qpeapplication.h>
#include <qpe/config.h>
#include <qpe/global.h>
+#include <opie/owait.h>
#include <qaction.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>
#include <qtoolbutton.h>
#include <qstring.h>
#include <qlabel.h>
#include <qfile.h>
#include <qhbuttongroup.h>
#include <qpushbutton.h>
#include <qintdict.h>
#include <qlayout.h>
#include <qlineedit.h>
@@ -202,55 +203,60 @@ void MainWindow::setCurrent(QListViewItem *item)
detailsFrame->show();
}else detailsFrame->hide();
popupTimer->start( 300, true );
}
void MainWindow::stopTimer(QListViewItem*)
{
popupTimer->stop();
}
void MainWindow::showPopup()
{
- qDebug("showPopup");
popupTimer->stop();
if (!_currentItem) return;
QPopupMenu *pop = _currentItem->popupMenu();
if (pop) pop->popup( QCursor::pos() );
}
void MainWindow::setSearch( const QString &key )
{
searchTimer->stop();
_searchString = key;
searchTimer->start( 300 );
}
void MainWindow::searchStringChanged()
{
+#ifdef NEW_OWAIT
+ OWait("setting search string");
+#endif
searchTimer->stop();
QString ss = _searchString;
//ss = Global::stringQuote( _searchString );
// if (actionWholeWordsOnly->isOn())
// ss = "\\s"+_searchString+"\\s";
- qDebug(" set searchString >%s<",ss.latin1());
+// qDebug(" set searchString >%s<",ss.latin1());
QRegExp re( ss );
re.setCaseSensitive( actionCaseSensitiv->isOn() );
re.setWildcard( actionWildcards->isOn() );
for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
s->setSearch( re );
}
void MainWindow::searchAll()
{
+#ifdef NEW_OWAIT
+ OWait("searching...");
+#endif
for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
s->doSearch();
//resultsList->repaint();
}
}
void MainWindow::slotAction( int act )
{
if (_currentItem->rtti() == OListViewItem::Result){
ResultItem *res = (ResultItem*)_currentItem;
// ResultItem *res = dynamic_cast<ResultItem*>(item);
res->action(act);
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index e307696..0b58176 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -1,54 +1,54 @@
//
//
// C++ Implementation: $MODULE$
//
// Description:
//
//
// Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
//
// Copyright: See COPYING file that comes with this distribution
//
//
-#include "searchgroup.h"
+#include <qobject.h>
#include <qregexp.h>
#include <qapplication.h>
#include <opie/owait.h>
#include "olistviewitem.h"
+#include "searchgroup.h"
-//#define NEW_OWAIT
#ifndef NEW_OWAIT
static OWait *wait = 0;
#endif
SearchGroup::SearchGroup(QListView* parent, QString name)
: OListViewItem(parent, name)
{
_name = name;
loaded = false;
}
SearchGroup::~SearchGroup()
{
}
void SearchGroup::expand()
{
//expanded = true;
- clearList();
+ if (_lastSearch != _search) clearList();
if (_search.isEmpty()) return;
OListViewItem *dummy = new OListViewItem( this, "searching...");
setOpen( true );
repaint();
int res_count = realSearch();
setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
delete dummy;
repaint();
}
void SearchGroup::doSearch()
{
@@ -60,34 +60,33 @@ void SearchGroup::doSearch()
void SearchGroup::setSearch(QRegExp re)
{
if (re == _search) return;
setText(0, _name+" - "+re.pattern() );
_search = re;
if (isOpen()) expand();
else new OListViewItem( this, "searching...");
}
int SearchGroup::realSearch()
{
+ if (_lastSearch == _search) return _resultCount;
#ifndef NEW_OWAIT
- qDebug("NOT using NEW_OWAIT");
if (!wait) wait = new OWait( qApp->mainWidget(), "osearch" );
wait->show();
qApp->processEvents();
#else
- qDebug("using NEW_OWAIT");
- OWait::start( "osearch" );
+ qDebug("********** NEW_OWAIT *************");
+ OWait( "searching" );
#endif
if (!loaded) load();
_resultCount = 0;
_resultCount = search();
+ _lastSearch = _search;
setText(0, _name + " - " + _search.pattern() + " (" + QString::number( _resultCount ) + ")");
#ifndef NEW_OWAIT
wait->hide();
-#else
- OWait::stop();
#endif
return _resultCount;
}
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index a755e06..ad37d4e 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -25,24 +25,25 @@ class SearchGroup : public OListViewItem
{
public:
SearchGroup(QListView* parent, QString name);
~SearchGroup();
virtual void expand();
virtual void doSearch();
virtual void setSearch(QRegExp);
virtual int rtti() { return Searchgroup;}
protected:
- QRegExp _search;
virtual void load() = 0;
virtual int search() = 0;
virtual void insertItem( void* ) = 0;
+ QRegExp _search;
+ QRegExp _lastSearch;
QString _name;
bool loaded;
int _resultCount;
private:
int realSearch();
};
#endif