author | tille <tille> | 2003-05-16 15:18:21 (UTC) |
---|---|---|
committer | tille <tille> | 2003-05-16 15:18:21 (UTC) |
commit | 75f1e9815410e75a6f9ae76d8db716c0c315ea45 (patch) (side-by-side diff) | |
tree | f21eea4fb09db52644dc0141f8d368997ec322f0 | |
parent | 708f1846703c3f13f7c9ac67130b6930f9607523 (diff) | |
download | opie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.zip opie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.tar.gz opie-75f1e9815410e75a6f9ae76d8db716c0c315ea45.tar.bz2 |
search in text documents
-rw-r--r-- | core/pim/osearch/applnksearch.cpp | 4 | ||||
-rw-r--r-- | core/pim/osearch/applnksearch.h | 6 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.cpp | 56 | ||||
-rw-r--r-- | core/pim/osearch/doclnksearch.h | 9 | ||||
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 10 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.cpp | 15 | ||||
-rw-r--r-- | core/pim/osearch/searchgroup.h | 3 |
7 files changed, 85 insertions, 18 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 @@ -48,5 +48,7 @@ int AppLnkSearch::search() || (_search.match(app->exec()) != -1) ) { insertItem( app ); - } + }else + if (searchFile( app )) + insertItem( app ); qApp->processEvents( 100 ); } 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 @@ -17,4 +17,5 @@ class AppLnkSet; +class AppLnk; /** @@ -25,12 +26,13 @@ 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; }; 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 @@ -11,18 +11,29 @@ // // -#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 ) ); } @@ -30,4 +41,7 @@ DocLnkSearch::DocLnkSearch(QListView* parent, QString name) DocLnkSearch::~DocLnkSearch() { + Config cfg( "osearch", Config::User ); + cfg.setGroup( "doclnk_settings" ); + cfg.writeEntry( "search_content", actionSearchInFiles->isOn() ); } @@ -37,4 +51,28 @@ void DocLnkSearch::load() } +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 ) { @@ -42,2 +80,12 @@ void DocLnkSearch::insertItem( void *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 @@ -16,4 +16,7 @@ #include "applnksearch.h" +class QAction; +class QPopupMenu; + /** @author Patrick S. Vogt @@ -25,7 +28,13 @@ public: ~DocLnkSearch(); + virtual QPopupMenu* popupMenu(); + protected: virtual void load(); + virtual bool searchFile(AppLnk*); virtual void insertItem( void* ); +private: + QAction *actionSearchInFiles; + QPopupMenu *_popupMenu; }; 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 @@ -21,4 +21,5 @@ #include <qpe/config.h> #include <qpe/global.h> +#include <opie/owait.h> #include <qaction.h> #include <qmessagebox.h> @@ -212,5 +213,4 @@ void MainWindow::stopTimer(QListViewItem*) void MainWindow::showPopup() { - qDebug("showPopup"); popupTimer->stop(); if (!_currentItem) return; @@ -228,4 +228,7 @@ void MainWindow::setSearch( const QString &key ) void MainWindow::searchStringChanged() { +#ifdef NEW_OWAIT + OWait("setting search string"); +#endif searchTimer->stop(); QString ss = _searchString; @@ -233,5 +236,5 @@ void MainWindow::searchStringChanged() // 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() ); @@ -243,4 +246,7 @@ void MainWindow::searchStringChanged() void MainWindow::searchAll() { +#ifdef NEW_OWAIT + OWait("searching..."); +#endif for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ s->doSearch(); 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 @@ -11,6 +11,6 @@ // // -#include "searchgroup.h" +#include <qobject.h> #include <qregexp.h> #include <qapplication.h> @@ -18,6 +18,6 @@ #include "olistviewitem.h" +#include "searchgroup.h" -//#define NEW_OWAIT #ifndef NEW_OWAIT static OWait *wait = 0; @@ -40,5 +40,5 @@ void SearchGroup::expand() { //expanded = true; - clearList(); + if (_lastSearch != _search) clearList(); if (_search.isEmpty()) return; OListViewItem *dummy = new OListViewItem( this, "searching..."); @@ -70,22 +70,21 @@ void SearchGroup::setSearch(QRegExp re) 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 @@ -35,8 +35,9 @@ public: protected: - QRegExp _search; virtual void load() = 0; virtual int search() = 0; virtual void insertItem( void* ) = 0; + QRegExp _search; + QRegExp _lastSearch; QString _name; bool loaded; |