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
@@ -47,7 +47,9 @@ int AppLnkSearch::search()
                     || (_search.match(app->comment()) != -1)
                     || (_search.match(app->exec()) != -1) ) {
                         insertItem( app );
-                }
+                }else
+                if (searchFile( app ))
+                        insertItem( app );
                 qApp->processEvents( 100 );
         }
         return _resultCount;
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
@@ -16,6 +16,7 @@
 #include "searchgroup.h"
 
 class AppLnkSet;
+class AppLnk;
 
 /**
 @author Patrick S. Vogt
@@ -24,14 +25,15 @@ 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
@@ -10,25 +10,39 @@
 // 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()
@@ -36,8 +50,42 @@ 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
@@ -15,6 +15,9 @@
 
 #include "applnksearch.h"
 
+class QAction;
+class QPopupMenu;
+
 /**
 @author Patrick S. Vogt
 */
@@ -24,9 +27,15 @@ 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;
 
 };
 
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
@@ -20,6 +20,7 @@
 #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>
@@ -211,7 +212,6 @@ void MainWindow::stopTimer(QListViewItem*)
 
 void MainWindow::showPopup()
 {
-        qDebug("showPopup");
         popupTimer->stop();
         if (!_currentItem) return;
         QPopupMenu *pop = _currentItem->popupMenu();
@@ -227,12 +227,15 @@ void MainWindow::setSearch( const QString &key )
 
 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() );
@@ -242,6 +245,9 @@ void MainWindow::searchStringChanged()
 
 void MainWindow::searchAll()
 {
+#ifdef NEW_OWAIT
+        OWait("searching...");
+#endif
         for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
                 s->doSearch();
                 //resultsList->repaint();
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
@@ -10,15 +10,15 @@
 // 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
@@ -39,7 +39,7 @@ SearchGroup::~SearchGroup()
 void SearchGroup::expand()
 {
         //expanded = true;
-        clearList();
+        if (_lastSearch != _search) clearList();
         if (_search.isEmpty()) return;
         OListViewItem *dummy = new OListViewItem( this, "searching...");
         setOpen( true );
@@ -69,24 +69,23 @@ 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
@@ -34,10 +34,11 @@ public:
     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;