8 files changed, 64 insertions, 19 deletions

diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index f117fe6..7681ea2 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -1,60 +1,62 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "adresssearch.h"
 
 #include <qstring.h>
 #include <qiconset.h>
 //#include <qwhatsthis.h>
 #include <qpe/resource.h>
 #include <opie/ocontactaccess.h>
 
 #include "contactitem.h"
 
 AdressSearch::AdressSearch(QListView* parent, QString name):
         SearchGroup(parent, name)
 {
         _contacts = 0;
-        QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" );
-        setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+                QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
+        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
+        
+        
         //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
         /*QPixmap pix = Resource::loadPixmap( "addressbook/AddressBook" );
         QImage img = pix.convertToImage();
         img.smoothScale( 14, 14 );
         pix.convertFromImage( img );
         setPixmap( 0, pix );*/
 }
 
 
 AdressSearch::~AdressSearch()
 {
         delete _contacts;
 }
 
 void AdressSearch::load()
 {
         _contacts = new OContactAccess("osearch");
 }
 
 int AdressSearch::search()
 {
         ORecordList<OContact> results = _contacts->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++) {
                 (void)new ContactItem( this, new OContact( results[i] ));
         }
         return results.count();
 }
 
 void AdressSearch::insertItem( void* )
 {
 
 }
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index b15275a..e8170c5 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -1,69 +1,71 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "applnksearch.h"
 
 #include <qpe/applnk.h>
 #include <qpe/qpeapplication.h>
 #include <qiconset.h>
 #include <qpe/resource.h>
 
 #include "applnkitem.h"
 
+
 AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
 {
         _apps = 0;
-        QIconSet is = Resource::loadIconSet( "osearch/applications" );
+        QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
         //QIconSet is = Resource::loadIconSet( "AppsIcon" );
-        setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 }
 
 
 AppLnkSearch::~AppLnkSearch()
 {
         delete _apps;
 }
 
 
 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) ) {
+                            || (_search.match(app->exec()) != -1) ) {    
                         insertItem( app );
                 }else
                 if (searchFile( app ))
-                        insertItem( app );
-                qApp->processEvents( 100 );
+                                insertItem( app );      
+                        qApp->processEvents( 100 );     
         }
         return _resultCount;
 }
 
 void AppLnkSearch::insertItem( void *rec )
 {
         (void)new AppLnkItem( this, (AppLnk*)rec );
         _resultCount++;
 }
 
 void AppLnkSearch::setSearch(QRegExp re)
 {
         setOpen( false );
         SearchGroup::setSearch( re );
 }
 
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 5da7ae9..50c76e0 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -1,92 +1,92 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description: 
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "datebooksearch.h"
 
 #include "eventitem.h"
 
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <opie/oevent.h>
 #include <opie/orecur.h>
 #include <opie/odatebookaccess.h>
 #include <qiconset.h>
 #include <qaction.h>
 #include <qdatetime.h>
 #include <qpopupmenu.h>
 
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
 {
-        QIconSet is = Resource::loadIconSet( "datebook/DateBook" );
-        setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+        QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
+        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
         actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null,  0, 0, 0, true );
         actionSearchInDates = new QAction( QObject::tr("search in dates"),QString::null,  0, 0, 0, true );
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "datebook_settings" );
            actionShowPastEvents->setOn( cfg.readBoolEntry( "show_past_events", false ) );
            actionSearchInDates->setOn( cfg.readBoolEntry( "search_in_dates", true ) );
 }
 
 DatebookSearch::~DatebookSearch()
 {
         qDebug("SAVE DATEBOOK SEARCH CONFIG");
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "datebook_settings" );
            cfg.writeEntry( "show_past_events", actionShowPastEvents->isOn() );
            cfg.writeEntry( "search_in_dates", actionSearchInDates->isOn() );
         delete _dates;
         delete _popupMenu;
         delete actionShowPastEvents;
         delete actionSearchInDates;
 }
 
 
 void DatebookSearch::load()
 {
          _dates = new ODateBookAccess();
          _dates->load();
 }
 
 int DatebookSearch::search()
 {
         ORecordList<OEvent> results = _dates->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++)
                 insertItem( new OEvent( results[i] ) );
         return _resultCount;
 }
 
 void DatebookSearch::insertItem( void *rec )
 {
         OEvent *ev = (OEvent*)rec;
         if ( !actionShowPastEvents->isOn() &&
               ev->endDateTime() < QDateTime::currentDateTime() &&
               !ev->recurrence().doesRecur()
             ) return;
         if ( !actionSearchInDates->isOn() && (
               ev->lastHitField() == Qtopia::StartDateTime ||
                ev->lastHitField() == Qtopia::EndDateTime )
             ) return;
         new EventItem( this, ev );
         _resultCount++;
 }
 
 QPopupMenu* DatebookSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionShowPastEvents->addTo( _popupMenu );
                 actionSearchInDates->addTo( _popupMenu );
         }
         return _popupMenu;
 }
 
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 26097a4..b03dbd8 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -1,95 +1,95 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 
 #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), _popupMenu(0)
 {
-        QIconSet is = Resource::loadIconSet( "osearch/documents" );
-        setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+        QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
+        setPixmap( 0, is.pixmap( QIconSet::Automatic, 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 )
 {
         (void)new DocLnkItem( this, (DocLnk*)rec );
         _resultCount++;
 }
 
 
 QPopupMenu* DocLnkSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionSearchInFiles->addTo( _popupMenu );
         }
         return _popupMenu;
         //(void) new DocLnkItem( this, (DocLnk*)rec );
                 // rec is undeclared here
 #warning  FIXME
         _resultCount++;
 }
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 07403a1..55302cb 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -1,277 +1,313 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002 Patrick S. Vogt <tille@handhelds.org>
 
 
 
 #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 <qhbox.h>
 #include <qpushbutton.h>
 #include <qintdict.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qsignalmapper.h>
 #include <qtextbrowser.h>
 #include <qregexp.h>
 #include <qwhatsthis.h>
 #include <qmenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qtoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/config.h>
 #include <qpe/global.h>
 #include <opie/owait.h>
 
 #include "olistview.h"
 #include "olistviewitem.h"
 #include "resultitem.h"
 #include "adresssearch.h"
 #include "todosearch.h"
 #include "datebooksearch.h"
 #include "applnksearch.h"
 #include "doclnksearch.h"
 #include "mainwindow.h"
 
+static const char* const image1_data[] = { 
+"14 14 3 1",
+". c None",
+"# c #000000",
+"a c #ff0000",
+"..............",
+"..##.......###",
+".#aa#....##aa#",
+"#aaaa#.##aaaa#",
+".##aaa#aaaaa##",
+"...#aaaaaaa#..",
+"....#aaaaa#...",
+"...#aaaaa#....",
+"..#aaaaaaa#...",
+".#aaaaaaaaa#..",
+"#aaaa###aaaa#.",
+"#aaa#..##aaa#.",
+"#aaa#...#aa#..",
+".###.....##..."};
+
+
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0)
 {
   setCaption( tr("OSearch") );
 
   setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   QFrame *mainFrame = new QFrame( this, "mainFrame" );
   mainFrame->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   mainLayout = new QVBoxLayout( mainFrame );
   mainLayout->setSpacing( 0 );
-  mainLayout->setMargin( 0 );
+  mainLayout->setMargin( 3 );
 
   resultsList = new OListView( mainFrame );
   resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   mainLayout->addWidget( resultsList );
 
   detailsFrame = new QFrame( mainFrame, "detailsFrame" );
   QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
   richEdit = new QTextView( detailsFrame );
   QWhatsThis::add( richEdit, tr("The details of the current result") );
   richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
   detailsLayout->addWidget( richEdit );
 
   buttonBox = new QHBox( mainFrame, "Button Box" );
 
   _buttonCount = 0;
 
   mainLayout->addWidget( detailsFrame );
   mainLayout->addWidget( buttonBox );
   detailsFrame->hide();
   buttonBox->hide();
 
   searches.append( new AppLnkSearch( resultsList, tr("Applications") ) );
   searches.append( new DocLnkSearch( resultsList, tr("Documents") ) );
   searches.append( new TodoSearch( resultsList, tr("Todo List") ) );
   searches.append( new DatebookSearch( resultsList, tr("Calendar") ) );
   searches.append( new AdressSearch( resultsList, tr("Contacts") ) );
 
   setCentralWidget( mainFrame );
 
   popupTimer = new QTimer();
   searchTimer = new QTimer();
 
   connect(popupTimer, SIGNAL(timeout()), SLOT(showPopup()));
   connect(searchTimer, SIGNAL(timeout()), SLOT(searchStringChanged()));
   connect(resultsList, SIGNAL(pressed(QListViewItem*)), SLOT(setCurrent(QListViewItem*)));
   connect(resultsList, SIGNAL(clicked(QListViewItem*)), SLOT(stopTimer(QListViewItem*)));
 
   signalMapper = new QSignalMapper( this );
 
   connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
 
   makeMenu();
 
    Config cfg( "osearch", Config::User );
    cfg.setGroup( "search_settings" );
    actionCaseSensitiv->setOn( cfg.readBoolEntry( "caseSensitiv", false ) );
    actionWildcards->setOn( cfg.readBoolEntry( "wildcards", false ) );
 //   actionWholeWordsOnly->setOn( cfg.readBoolEntry( "whole_words_only", false ) );
 }
 
 void MainWindow::makeMenu()
 {
    QToolBar *toolBar = new QToolBar( this );
    QToolBar *searchBar = new QToolBar(this);
    QMenuBar *menuBar = new QMenuBar( toolBar );
    QPopupMenu *searchMenu = new QPopupMenu( menuBar );
 //   QPopupMenu *viewMenu = new QPopupMenu( menuBar );
    QPopupMenu *cfgMenu = new QPopupMenu( menuBar );
    QPopupMenu *searchOptions = new QPopupMenu( cfgMenu );
 
    setToolBarsMovable( false );
    toolBar->setHorizontalStretchable( true );
    menuBar->insertItem( tr( "Search" ), searchMenu );
    menuBar->insertItem( tr( "Settings" ), cfgMenu );
 
    //SETTINGS MENU
    cfgMenu->insertItem( tr( "Search" ), searchOptions );
    QPopupMenu *pop;
    for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){
                 pop = s->popupMenu();
                 if (pop){
                         cfgMenu->insertItem( s->text(0), pop );
                 }
   }
 
 
   //SEARCH
   SearchAllAction = new QAction( tr("Search all"),QString::null,  0, this, 0 );
   SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
  // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
   connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
   SearchAllAction->addTo( searchMenu );
   searchMenu->insertItem( tr( "Options" ), searchOptions );
 
   //SEARCH OPTIONS
   //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null,  0, this, 0, true );
   //actionWholeWordsOnly->addTo( searchOptions );
   actionCaseSensitiv = new QAction( tr("Case sensitiv"),QString::null,  0, this, 0, true );
   actionCaseSensitiv->addTo( searchOptions );
   actionWildcards = new QAction( tr("Use wildcards"),QString::null,  0, this, 0, true );
   actionWildcards->addTo( searchOptions );
 
   //SEARCH BAR
+  LabelEnterText = new QLabel( searchBar, "Label" );
+  LabelEnterText->setAutoMask( FALSE );
+  LabelEnterText->setText( tr( "Search for: " ) );
+  
   addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
   QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
   QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
   searchEdit->setFocus();
   searchBar->setHorizontalStretchable( TRUE );
   searchBar->setStretchableWidget( searchEdit );
+  
+  //Search button
   SearchAllAction->addTo( searchBar );
-  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),
-       this, SLOT( setSearch( const QString & ) ) );
+  
+  //image ripped of off opie-login/loginwindow.cpp
+  QPixmap image1( ( const char** ) image1_data );
+  
+  //Clear text
+  ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
+  ClearSearchText->setText( tr( "" ) );
+  ClearSearchText->setPixmap( image1 );
+  
+  connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
+  connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
 
 }
 
 MainWindow::~MainWindow()
 {
    Config cfg( "osearch", Config::User );
    cfg.setGroup( "search_settings" );
    cfg.writeEntry( "caseSensitiv", actionCaseSensitiv->isOn() );
    cfg.writeEntry( "wildcards", actionWildcards->isOn() );
    //cfg.writeEntry( "whole_words_only", actionWholeWordsOnly->isOn() );
 }
 
 void MainWindow::setCurrent(QListViewItem *item)
 {
         if (!item) return;
         _currentItem = (OListViewItem*)item;
         //_currentItem = dynamic_cast<OListViewItem*>(item);
         if (_currentItem->rtti() == OListViewItem::Result){
                 ResultItem *res = (ResultItem*)item;
         //      ResultItem *res = dynamic_cast<ResultItem*>(item);
                 richEdit->setText( res->toRichText() );
                 QIntDict<QString> acts = res->actions();
                 QButton *button;
                 for (uint i = 0; i < acts.count(); i++){
                         button = buttonMap[i];
                         if (!button) {
                             qWarning(" no button for %s", (*acts[i]).latin1() );
                             button = new QPushButton( buttonBox );
                             buttonMap.insert( i,  button );
                             signalMapper->setMapping(button, i );
                             connect(button, SIGNAL(clicked() ), signalMapper, SLOT(map() ) );
                         }
                         button->setText( *acts[i] );
                         button->show();
                 }
                 for (uint i = acts.count(); i < _buttonCount; i++){
                         button = buttonMap[i];
                         if (button) button->hide();
                 }
                 _buttonCount = acts.count();
                 detailsFrame->show();
                 buttonBox->show();
 
         }else {
             detailsFrame->hide();
             buttonBox->hide();
         }
         popupTimer->start( 300, true );
 }
 
 void MainWindow::stopTimer(QListViewItem*)
 {
         popupTimer->stop();
 }
 
 void MainWindow::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());
         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 && _currentItem->rtti() == OListViewItem::Result){
                 ResultItem *res = (ResultItem*)_currentItem;
         //      ResultItem *res = dynamic_cast<ResultItem*>(item);
                 res->action(act);
         }
 }
 
 void MainWindow::optionChanged(int )
 {
         searchStringChanged();
 }
diff --git a/core/pim/osearch/mainwindow.h b/core/pim/osearch/mainwindow.h
index bdc6c5f..9886053 100644
--- a/core/pim/osearch/mainwindow.h
+++ b/core/pim/osearch/mainwindow.h
@@ -1,86 +1,89 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 // (c) 2002-2003 Patrick S. Vogt <tille@handhelds.org>
 
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
 #include <qmainwindow.h>
 #include <qdialog.h>
 #include <qaction.h>
 #include <qlist.h>
 
 #include <qmap.h>
 #include <qtimer.h>
 #include <qpopupmenu.h>
 
 class QAction;
 class QToolBar;
 class QHBox;
 class QVBoxLayout;
 class QTextView;
 class QFrame;
 class OListView;
 class OListViewItem;
 class QListViewItem;
 class QPopupMenu;
 class QTimer;
+class QLabel;
 
 class QSignalMapper;
 class QButton;
 
 class SearchGroup;
 
 class MainWindow : public QMainWindow
 {
     Q_OBJECT
 
 
 public:
   MainWindow( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
   ~MainWindow();
   static QString appName() { return QString::fromLatin1("osearch"); }
 
 public slots:
   void setCurrent(QListViewItem*);
   void setSearch( const QString& );
   void searchAll();
 
 protected slots:
   void slotAction(int);
   void showPopup();
   void stopTimer( QListViewItem* );
   void searchStringChanged();
   void optionChanged(int);
 
 private:
   QHBox *buttonBox;
   QMap<int, QButton*> buttonMap;
   QSignalMapper* signalMapper;
   OListView *resultsList;
   QTextView *richEdit;
   OListViewItem *_currentItem;
   QVBoxLayout *mainLayout;
   QFrame *detailsFrame;
   QTimer *popupTimer;
   QTimer *searchTimer;
+  QToolButton* ClearSearchText;
+  QLabel* LabelEnterText;
 
   QString _searchString;
   QList<SearchGroup> searches;
   QAction *SearchAllAction;
   QAction *actionCaseSensitiv;
   QAction *actionWildcards;
   //QAction *actionWholeWordsOnly;
   uint _buttonCount;
   void makeMenu();
 };
 
 #endif
 
diff --git a/core/pim/osearch/olistview.cpp b/core/pim/osearch/olistview.cpp
index 06392ba..e678d63 100644
--- a/core/pim/osearch/olistview.cpp
+++ b/core/pim/osearch/olistview.cpp
@@ -1,35 +1,37 @@
 /***************************************************************************
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
   // (c) 2002 Patrick S. Vogtp <tille@handhelds.org>
 
 #include "olistview.h"
 #include "olistviewitem.h"
 #include <qmessagebox.h>
-
+#include <qpe/qpeapplication.h>
 
 OListView::OListView(QWidget *parent, const char *name )
   : QListView(parent,name)
 {
 
-        setRootIsDecorated( true );
-        addColumn(tr("Results"));
+                setRootIsDecorated( true );
+        addColumn(tr("Results"),qApp->desktop()->width() - 9 );
+        //setColumnWidthMode(0, Manual);
+        
         setSorting( -1 );
          connect( this, SIGNAL(expanded(QListViewItem*)), SLOT(expand(QListViewItem*)));
 }
 
 
 OListView::~OListView()
 {
 }
 
 void OListView::expand(QListViewItem *item)
 {
          ((OListViewItem*)item)->expand();
 }
 
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 5c1d7a5..8de875e 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -1,80 +1,80 @@
 //
 //
 // C++ Implementation: $MODULE$
 //
 // Description:
 //
 //
 // Author: Patrick S. Vogt <tille@handhelds.org>, (C) 2003
 //
 // Copyright: See COPYING file that comes with this distribution
 //
 //
 #include "todosearch.h"
 
 #include <opie/otodoaccess.h>
 #include <opie/otodo.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qiconset.h>
 #include <qaction.h>
 #include <qpopupmenu.h>
 #include "todoitem.h"
 
 TodoSearch::TodoSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _todos(0), _popupMenu(0)
 {
         //AppLnkSet als(QPEApplication::qpeDir());
         //setPixmap( 0, als.findExec("todolist")->pixmap() );
-        QIconSet is = Resource::loadIconSet( "todo/TodoList" );
-        setPixmap( 0, is.pixmap( QIconSet::Small, true ) );
+        QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
+        setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
         actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null,  0, 0, 0, true );
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "todo_settings" );
            actionShowCompleted->setOn( cfg.readBoolEntry( "show_completed_tasks", false ) );
 
 }
 
 
 TodoSearch::~TodoSearch()
 {
         Config cfg( "osearch", Config::User );
            cfg.setGroup( "todo_settings" );
            cfg.writeEntry( "show_completed_tasks", actionShowCompleted->isOn() );
         delete _popupMenu;
         delete actionShowCompleted;
         delete _todos;
 }
 
 
 void TodoSearch::load()
 {
          _todos = new OTodoAccess();
          _todos->load();
 }
 
 int TodoSearch::search()
 {
         ORecordList<OTodo> results = _todos->matchRegexp(_search);
         for (uint i = 0; i < results.count(); i++)
                 insertItem( new OTodo( results[i] ));
         return _resultCount;
 }
 
 void TodoSearch::insertItem( void *rec )
 {
         OTodo *todo = (OTodo*)rec;
         if (!actionShowCompleted->isOn() &&
                 todo->isCompleted() ) return;
         (void)new TodoItem( this, todo );
         _resultCount++;
 }
 
 QPopupMenu* TodoSearch::popupMenu()
 {
         if (!_popupMenu){
                 _popupMenu = new QPopupMenu( 0 );
                 actionShowCompleted->addTo( _popupMenu );
         }
         return _popupMenu;
 }