gui stuff

3 files changed, 8 insertions, 9 deletions

diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index ad43ba2..554ab13 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -68,49 +68,49 @@ void ContactItem::setIcon()
 	case Qtopia::MiddleName:
 	case Qtopia::LastName:
 	case Qtopia::Suffix:
 	case Qtopia::Nickname:
  	case Qtopia::FileAs:
 		icon = Resource::loadPixmap( "osearch/identity" );
  		break;
  	case Qtopia::HomeStreet:
  	case Qtopia::HomeCity:
  	case Qtopia::HomeState:
  	case Qtopia::HomeZip:
  	case Qtopia::HomeCountry:
 		icon = Resource::loadPixmap( "osearch/addresshome" );
  		break;
  	case Qtopia::Company:
  	case Qtopia::BusinessCity:
  	case Qtopia::BusinessStreet:
  	case Qtopia::BusinessZip:
  	case Qtopia::BusinessCountry:
  	case Qtopia::Department:
  	case Qtopia::Office:
  	case Qtopia::Manager:
  	case Qtopia::BusinessPager:
  	case Qtopia::Profession:
-		icon = Resource::loadPixmap( "addressbook/addresshome" );
+		icon = Resource::loadPixmap( "osearch/addresshome" );
  		break;
  	case Qtopia::Assistant:
 	case Qtopia::Spouse:
  	case Qtopia::Children:
 		icon = Resource::loadPixmap( "osearch/personal" );
  		break;
  	case Qtopia::Birthday:
  	case Qtopia::Anniversary:
 		icon = Resource::loadPixmap( "osearch/clock" );
  		break;
  	case Qtopia::Notes:
 		icon = Resource::loadPixmap( "txt" );
  		break;
 	default:
 		icon = Resource::loadPixmap( "DocsIcon" );
 		break;
 	}
 	setPixmap( 0, icon );
 }
 
 ContactItem::~ContactItem()
 {
 	delete _contact;
 }
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 6070fdf..adce926 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -29,71 +29,70 @@
 #include <qlabel.h>
 #include <qfile.h>
 #include <qhbuttongroup.h>
 #include <qpushbutton.h>
 #include <qintdict.h>
 #include <qlayout.h>
 #include <qlineedit.h>
 #include <qtextbrowser.h>
 #include <qregexp.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"
 
 MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
   QMainWindow( parent, name, f ), _currentItem(0)
 {
   setCaption( tr("OSearch") );
 
-  setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding));
+  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 );
 
   resultsList = new OListView( mainFrame );
-  resultsList->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding));
-  mainLayout->addWidget( resultsList, 1 );
+  resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+  mainLayout->addWidget( resultsList );
 
   detailsFrame = new QFrame( mainFrame, "detailsFrame" );
   QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
   richEdit = new QTextView( detailsFrame );
-  richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Expanding, QSizePolicy::Expanding));
-  //richEdit->setSizePolicy( QSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ));
-  detailsLayout->addWidget( richEdit, 1 );
+  richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
+  detailsLayout->addWidget( richEdit );
 
   buttonGroupActions = new QHButtonGroup( this );
   buttonGroupActions->hide();
   _buttonCount = 0;
-//  buttonGroupActions->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
 
   buttonLayout = new QHBoxLayout( detailsFrame );
   detailsLayout->addLayout( buttonLayout );
 
   mainLayout->addWidget( detailsFrame );
   detailsFrame->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") ) );
 
   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*)));
   connect(buttonGroupActions, SIGNAL(clicked(int)), SLOT( slotAction(int) ) );
 
diff --git a/core/pim/osearch/opie-osearch.control b/core/pim/osearch/opie-osearch.control
index d7e3310..9f1bf5f 100644
--- a/core/pim/osearch/opie-osearch.control
+++ b/core/pim/osearch/opie-osearch.control
@@ -1,10 +1,10 @@
 Packagename: opie-osearch
-Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/OSearch.png
+Files: bin/osearch apps/1Pim/osearch.desktop pics/osearch/*.png
 Priority: optional
 Section: opie/
 Maintainer: Patrick S. Vogt <tille@handhelds.org>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: task-opie-minimal
 Description: search...