Minor GUI polishing

-Use 'better' icons and always QIconSet::Large
-Make the 'Search For' Label to have the same color as the rest of the toolbar

6 files changed, 8 insertions, 6 deletions

diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index f0495c6..e1f575d 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -19,13 +19,13 @@
 
 using namespace Opie;
 AdressSearch::AdressSearch(QListView* parent, QString name):
 	SearchGroup(parent, name)
 {
 	_contacts = 0;
-	QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
+        QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" );
 	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();
diff --git a/core/pim/osearch/applnksearch.cpp b/core/pim/osearch/applnksearch.cpp
index 758baf2..474dbb2 100644
--- a/core/pim/osearch/applnksearch.cpp
+++ b/core/pim/osearch/applnksearch.cpp
@@ -18,13 +18,13 @@
 #include <qpe/resource.h>
 
 
 AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
 {
 	_apps = 0;
-	QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
+        QIconSet is = Resource::loadIconSet( "osearch/applications" );
 	//QIconSet is = Resource::loadIconSet( "AppsIcon" );
 	setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
 }
 
 
 AppLnkSearch::~AppLnkSearch()
diff --git a/core/pim/osearch/datebooksearch.cpp b/core/pim/osearch/datebooksearch.cpp
index 1b44be2..ef3b006 100644
--- a/core/pim/osearch/datebooksearch.cpp
+++ b/core/pim/osearch/datebooksearch.cpp
@@ -25,13 +25,13 @@
 
 
 
 DatebookSearch::DatebookSearch(QListView* parent, QString name)
 : SearchGroup(parent, name), _dates(0), _popupMenu(0)
 {
-	QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
+	QIconSet is = Resource::loadIconSet( "datebook/DateBook" );
 	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 ) );
diff --git a/core/pim/osearch/doclnksearch.cpp b/core/pim/osearch/doclnksearch.cpp
index 4631dce..3d91c1f 100644
--- a/core/pim/osearch/doclnksearch.cpp
+++ b/core/pim/osearch/doclnksearch.cpp
@@ -28,14 +28,14 @@
 #include <qtextstream.h>
 
 
 DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
 : AppLnkSearch(parent, name), _popupMenu(0)
 {
-	QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
-	setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) );
+        QIconSet is = Resource::loadIconSet( "osearch/documents" );
+	setPixmap( 0, is.pixmap( QIconSet::Large, 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 ) );
 }
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 4589c9d..1d0331c 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -180,12 +180,14 @@ void MainWindow::makeMenu()
   actionWildcards->addTo( searchOptions );
 
   //SEARCH BAR
   LabelEnterText = new QLabel( searchBar, "Label" );
   LabelEnterText->setAutoMask( FALSE );
   LabelEnterText->setText( tr( "Search for: " ) );
+  LabelEnterText->setFrameStyle( QFrame::NoFrame );
+  LabelEnterText->setBackgroundMode( PaletteButton );
 
   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 );
diff --git a/core/pim/osearch/todosearch.cpp b/core/pim/osearch/todosearch.cpp
index 48fa909..1ed7370 100644
--- a/core/pim/osearch/todosearch.cpp
+++ b/core/pim/osearch/todosearch.cpp
@@ -22,13 +22,13 @@
 using namespace Opie;
 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/TodoListSmall" );
+        QIconSet is = Resource::loadIconSet( "todo/TodoList" );
 	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 ) );