Appearance fixed for osearch

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
@@ -24,8 +24,10 @@ 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();
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
@@ -19,12 +19,13 @@
 
 #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 ) );
 }
 
 
@@ -42,15 +43,16 @@ void AppLnkSearch::load()
 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;
 }
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
@@ -27,8 +27,8 @@
 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 );
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
@@ -28,8 +28,8 @@
 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 );
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
@@ -48,6 +48,27 @@
 #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)
 {
@@ -60,7 +81,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
 
   mainLayout = new QVBoxLayout( mainFrame );
   mainLayout->setSpacing( 0 );
-  mainLayout->setMargin( 0 );
+  mainLayout->setMargin( 3 );
 
   resultsList = new OListView( mainFrame );
   resultsList->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
@@ -154,15 +175,30 @@ void MainWindow::makeMenu()
   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() ) );
 
 }
 
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
@@ -32,6 +32,7 @@ class OListViewItem;
 class QListViewItem;
 class QPopupMenu;
 class QTimer;
+class QLabel;
 
 class QSignalMapper;
 class QButton;
@@ -71,6 +72,8 @@ private:
   QFrame *detailsFrame;
   QTimer *popupTimer;
   QTimer *searchTimer;
+  QToolButton* ClearSearchText;
+  QLabel* LabelEnterText;
 
   QString _searchString;
   QList<SearchGroup> searches;
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
@@ -11,14 +11,16 @@
 #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*)));
 }
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
@@ -26,8 +26,8 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
 {
 //	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" );