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
@@ -20,8 +20,10 @@
 #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>
@@ -72,13 +74,12 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   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") ) );
@@ -97,5 +98,8 @@ 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) ) );
+
+  signalMapper = new QSignalMapper( this );
+
+  connect(signalMapper, SIGNAL(mapped(int)), SLOT( slotAction(int) ) );
 
   makeMenu();
@@ -184,9 +188,11 @@ void MainWindow::setCurrent(QListViewItem *item)
                 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] );
@@ -194,10 +200,15 @@ void MainWindow::setCurrent(QListViewItem *item)
                 }
                 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 );
 }
@@ -254,5 +265,5 @@ void MainWindow::searchAll()
 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);
@@ -261,5 +272,5 @@ void MainWindow::slotAction( int act )
 }
 
-void MainWindow::optionChanged(int i)
+void MainWindow::optionChanged(int )
 {
         searchStringChanged();