added menus

5 files changed, 42 insertions, 36 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
@@ -31,6 +31,7 @@
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qtextbrowser.h>
+#include <qregexp.h>
 
 #include "olistview.h"
 #include "olistviewitem.h"
@@ -66,22 +67,13 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   detailsLayout->addWidget( richEdit, 1 );
 
   buttonGroupActions = new QHButtonGroup( this );
+  buttonGroupActions->hide();
   _buttonCount = 0;
 //  buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   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 );
-*/
+  detailsLayout->addLayout( buttonLayout );
+
   mainLayout->addWidget( detailsFrame );
   detailsFrame->hide();
 
@@ -100,36 +92,40 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
   connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
   connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
-//   connect(buttonEdit, SIGNAL(clicked()), SLOT( editItem() ) );
 
 }
 
 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 );
 //   QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
 //
    setToolBarsMovable( false );
-//   toolBar->setHorizontalStretchable( true );
-//   menuBar->insertItem( tr( "Search" ), searchMenu );
+   toolBar->setHorizontalStretchable( true );
+   menuBar->insertItem( tr( "Search" ), searchMenu );
 //   menuBar->insertItem( tr( "View" ), viewMenu );
 //   menuBar->insertItem( tr( "Settings" ), cfgMenu );
 
   //SEARCH
-  QPEToolBar *searchBar = new QPEToolBar(this);
-  addToolBar( searchBar,  "Search", QMainWindow::Top, TRUE );
-  QLabel *label = new QLabel( tr("Search: "), searchBar );
-//  label->setBackgroundMode( PaletteForeground );
-  searchBar->setHorizontalStretchable( TRUE );
+  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 );
   QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
+  searchBar->setHorizontalStretchable( TRUE );
   searchBar->setStretchableWidget( searchEdit );
   connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
        this, SLOT( setSearch( const QString & ) ) );
 
-
 }
 
 MainWindow::~MainWindow()
@@ -188,10 +184,18 @@ void MainWindow::showPopup()
 
 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();
+        }
+}
 
 void MainWindow::slotAction( int act)
 {
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
@@ -46,6 +46,7 @@ public slots:
   void showPopup();
   void stopTimer( QListViewItem* );
   void setSearch( const QString& );
+  void searchAll();
 
 protected slots:
   void slotAction(int);
@@ -57,11 +58,12 @@ private:
   QVBoxLayout *mainLayout;
   QHBoxLayout *buttonLayout;
   QFrame *detailsFrame;
-//  OListViewItem *_item;
   QTimer *popupTimer;
 
   QList<SearchGroup> searches;
   QHButtonGroup *buttonGroupActions;
+  QAction *actionCaseSensitiv;
+  QAction *actionWildcards;
   uint _buttonCount;
   void makeMenu();
 };
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
@@ -1,6 +1,7 @@
 DEPENDPATH += $(OPIEDIR)/include
 LIBS += -lqpe -lopie
 INTERFACES =
+include ( $(OPIEDIR)/include.pro )
 TEMPLATE = app
 CONFIG += debug warn_on qt
 DESTDIR = $(OPIEDIR)/bin
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
@@ -42,6 +42,14 @@ void SearchGroup::expand()
         delete dummy;
 }
 
+void SearchGroup::doSearch()
+{
+        clearList();
+        if (_search.isEmpty()) return;
+        if (!loaded) load();
+        int res_count = search();
+        setText(0, _name + " - " + _search.pattern() + " (" + QString::number( res_count ) + ")");
+}
 
 void SearchGroup::clearList()
 {
@@ -56,13 +64,6 @@ void SearchGroup::clearList()
         expanded = true;
 }
 
-void SearchGroup::setSearch(QString s)
-{
-        setSearch( QRegExp( s ) );
-        _search.setCaseSensitive(false);
-}
-
-
 void SearchGroup::setSearch(QRegExp re)
 {
         setText(0, _name+" - "+re.pattern() );
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
@@ -28,12 +28,10 @@ public:
     ~SearchGroup();
 
     virtual void expand();
-    virtual void setSearch(QString);
+    virtual void doSearch();
     virtual void setSearch(QRegExp);
     virtual int rtti() { return Searchgroup;}
 
-
-
 protected:
         QRegExp _search;
         virtual void load() = 0;