1 files changed, 25 insertions, 14 deletions

diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index c6934db..aa52061 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -16,16 +16,18 @@
 #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 <qpe/qpemenubar.h>
 #include <qpe/qpemessagebox.h>
 #include <qpe/resource.h>
@@ -68,21 +70,20 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   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 );
 
-  buttonGroupActions = new QHButtonGroup( this );
-  buttonGroupActions->hide();
-  _buttonCount = 0;
+  buttonBox = new QHBox( mainFrame, "Button Box" );
 
-  buttonLayout = new QHBoxLayout( detailsFrame );
-  detailsLayout->addLayout( buttonLayout );
+  _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") ) );
   searches.append( new DatebookSearch( resultsList, tr("datebook") ) );
   searches.append( new AdressSearch( resultsList, tr("adressbook") ) );
@@ -93,13 +94,16 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   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*)));
-  connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
+
+  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 ) );
@@ -180,28 +184,35 @@ void MainWindow::setCurrent(QListViewItem *item)
 		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 = buttonGroupActions->find( i );
+			button = buttonMap[i];
 			if (!button) {
-				button = new QPushButton( detailsFrame );
-				buttonLayout->addWidget( button, 0 );
-				buttonGroupActions->insert( button, i);
+			    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 = buttonGroupActions->find( i );
+			button = buttonMap[i];
 			if (button) button->hide();
 		}
 		_buttonCount = acts.count();
 		detailsFrame->show();
-	}else detailsFrame->hide();
+                buttonBox->show();
+
+	}else {
+            detailsFrame->hide();
+            buttonBox->hide();
+        }
 	popupTimer->start( 300, true );
 }
 
 void MainWindow::stopTimer(QListViewItem*)
 {
         popupTimer->stop();
@@ -250,17 +261,17 @@ void MainWindow::searchAll()
 		//resultsList->repaint();
 	}
 }
 
 void MainWindow::slotAction( int act )
 {
-	if (_currentItem->rtti() == OListViewItem::Result){
+	if ( _currentItem && _currentItem->rtti() == OListViewItem::Result){
 		ResultItem *res = (ResultItem*)_currentItem;
 //		ResultItem *res = dynamic_cast<ResultItem*>(item);
 		res->action(act);
 	}
 }
 
-void MainWindow::optionChanged(int i)
+void MainWindow::optionChanged(int )
 {
 	searchStringChanged();
 }