5 files changed, 40 insertions, 34 deletions

diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index a0b7b23..e15cc7e 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -33,2 +33,3 @@
 #include <qtextbrowser.h>
+#include <qregexp.h>
 
@@ -68,2 +69,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   buttonGroupActions = new QHButtonGroup( this );
+  buttonGroupActions->hide();
   _buttonCount = 0;
@@ -72,14 +74,4 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   buttonLayout = new QHBoxLayout( detailsFrame );
-  buttonGroupActions->hide();
-  //buttonLayout->addWidget( buttonGroupActions, 0 );
-
    detailsLayout->addLayout( buttonLayout );
-   /*
-   QPushButton *buttonShow = new QPushButton( detailsFrame, "Show" );
-   buttonShow->setText( tr("show") );
-   QPushButton *buttonEdit = new QPushButton( detailsFrame, "Edit" );
-   buttonEdit->setText( tr("edit") );
-   buttonLayout->addWidget( buttonShow, 0 );
-   buttonLayout->addWidget( buttonEdit, 0 );
-*/
+
   mainLayout->addWidget( detailsFrame );
@@ -102,3 +94,2 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
-//   connect(buttonEdit, SIGNAL(clicked()), SLOT( editItem() ) );
 
@@ -108,5 +99,6 @@ void MainWindow::makeMenu()
 {
-//   QPEToolBar *toolBar = new QPEToolBar( this );
-//   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
-//   QPopupMenu *searchMenu = new QPopupMenu( menuBar );
+   QPEToolBar *toolBar = new QPEToolBar( this );
+   QPEToolBar *searchBar = new QPEToolBar(this);
+   QPEMenuBar *menuBar = new QPEMenuBar( toolBar );
+   QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
@@ -115,4 +107,4 @@ void MainWindow::makeMenu()
    setToolBarsMovable( false );
-//   toolBar->setHorizontalStretchable( true );
-//   menuBar->insertItem( tr( "Search" ), searchMenu );
+   toolBar->setHorizontalStretchable( true );
+   menuBar->insertItem( tr( "Search" ), searchMenu );
 //   menuBar->insertItem( tr( "View" ), viewMenu );
@@ -121,8 +113,13 @@ void MainWindow::makeMenu()
   //SEARCH
-  QPEToolBar *searchBar = new QPEToolBar(this);
+  QAction *action = new QAction( tr("Search all"),QString::null,  0, this, 0 );
+  connect( action, SIGNAL(activated()), this, SLOT(searchAll()) );
+  action->addTo( searchMenu );
+  actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null,  0, this, 0, true );
+  actionCaseSensitiv->addTo( searchMenu );
+  actionWildcards = new QAction( tr("Use wildcards"),QString::null,  0, this, 0, true );
+  actionWildcards->addTo( searchMenu );
+
   addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
-  QLabel *label = new QLabel( tr("Search: "), searchBar );
-//  label->setBackgroundMode( PaletteForeground );
-  searchBar->setHorizontalStretchable( TRUE );
   QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
+  searchBar->setHorizontalStretchable( TRUE );
   searchBar->setStretchableWidget( searchEdit );
@@ -131,3 +128,2 @@ void MainWindow::makeMenu()
 
-
 }
@@ -190,6 +186,14 @@ void MainWindow::setSearch( const QString &key )
 {
+	QRegExp re( key, actionCaseSensitiv->isOn(), actionWildcards->isOn() );
 	for (SearchGroup *s = searches.first(); s != 0; s = searches.next() )
-		s->setSearch( key );
+		s->setSearch( re );
 }
 
+void MainWindow::searchAll()
+{
+	bool openState;
+	for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
+		s->doSearch();
+	}
+}
 
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index f6ae0a4..2773205 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -48,2 +48,3 @@ public slots:
   void setSearch( const QString& );
+  void searchAll();
 
@@ -59,3 +60,2 @@ private:
   QFrame *detailsFrame;
-//  OListViewItem *_item;
   QTimer *popupTimer;
@@ -64,2 +64,4 @@ private:
   QHButtonGroup *buttonGroupActions;
+  QAction *actionCaseSensitiv;
+  QAction *actionWildcards;
   uint _buttonCount;
diff --git a/core/pim/osearch/osearch.pro b/core/pim/osearch/osearch.pro
index d5dcda2..2e571e3 100644
--- a/core/pim/osearch/osearch.pro
+++ b/core/pim/osearch/osearch.pro
@@ -3,2 +3,3 @@ LIBS += -lqpe -lopie
 INTERFACES =
+include ( $(OPIEDIR)/include.pro )
 TEMPLATE = app
diff --git a/core/pim/osearch/searchgroup.cpp b/core/pim/osearch/searchgroup.cpp
index d062207..3159984 100644
--- a/core/pim/osearch/searchgroup.cpp
+++ b/core/pim/osearch/searchgroup.cpp
@@ -44,2 +44,10 @@ void SearchGroup::expand()
 
+void SearchGroup::doSearch()
+{
+	clearList();
+	if (_search.isEmpty()) return;
+	if (!loaded) load();
+	int res_count = search();
+	setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
+}
 
@@ -58,9 +66,2 @@ void SearchGroup::clearList()
 
-void SearchGroup::setSearch(QString s)
-{
-	setSearch( QRegExp( s ) );
-	_search.setCaseSensitive(false);
-}
-
-
 void SearchGroup::setSearch(QRegExp re)
diff --git a/core/pim/osearch/searchgroup.h b/core/pim/osearch/searchgroup.h
index 35949f0..bf5dc67 100644
--- a/core/pim/osearch/searchgroup.h
+++ b/core/pim/osearch/searchgroup.h
@@ -30,3 +30,3 @@ public:
     virtual void expand();
-    virtual void setSearch(QString);
+    virtual void doSearch();
     virtual void setSearch(QRegExp);
@@ -34,4 +34,2 @@ public:
 
-
-
 protected: