summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp6
-rw-r--r--core/pim/osearch/applnksearch.cpp12
-rw-r--r--core/pim/osearch/datebooksearch.cpp4
-rw-r--r--core/pim/osearch/doclnksearch.cpp4
-rw-r--r--core/pim/osearch/mainwindow.cpp42
-rw-r--r--core/pim/osearch/mainwindow.h3
-rw-r--r--core/pim/osearch/olistview.cpp8
-rw-r--r--core/pim/osearch/todosearch.cpp4
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
@@ -26,4 +26,6 @@ AdressSearch::AdressSearch(QListView* parent, QString name):
26 _contacts = 0; 26 _contacts = 0;
27 QIconSet is = Resource::loadIconSet( "addressbook/AddressBook" ); 27 QIconSet is = Resource::loadIconSet( "addressbook/AddressBookSmall" );
28 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 28 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
29
30
29 //QWhatsThis::add( this, QObject::tr("Search the addressbook") ); 31 //QWhatsThis::add( this, QObject::tr("Search the addressbook") );
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
@@ -21,2 +21,3 @@
21 21
22
22AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name) 23AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
@@ -24,5 +25,5 @@ AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent,
24 _apps = 0; 25 _apps = 0;
25 QIconSet is = Resource::loadIconSet( "osearch/applications" ); 26 QIconSet is = Resource::loadIconSet( "osearch/applicationsSmall" );
26 //QIconSet is = Resource::loadIconSet( "AppsIcon" ); 27 //QIconSet is = Resource::loadIconSet( "AppsIcon" );
27 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 28 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
28} 29}
@@ -44,2 +45,3 @@ int AppLnkSearch::search()
44 QList<AppLnk> appList = _apps->children(); 45 QList<AppLnk> appList = _apps->children();
46
45 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){ 47 for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
@@ -47,3 +49,3 @@ int AppLnkSearch::search()
47 || (_search.match(app->comment()) != -1) 49 || (_search.match(app->comment()) != -1)
48 || (_search.match(app->exec()) != -1) ) { 50 || (_search.match(app->exec()) != -1) ) {
49 insertItem( app ); 51 insertItem( app );
@@ -51,4 +53,4 @@ int AppLnkSearch::search()
51 if (searchFile( app )) 53 if (searchFile( app ))
52 insertItem( app ); 54 insertItem( app );
53 qApp->processEvents( 100 ); 55 qApp->processEvents( 100 );
54 } 56 }
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
@@ -29,4 +29,4 @@ DatebookSearch::DatebookSearch(QListView* parent, QString name)
29{ 29{
30 QIconSet is = Resource::loadIconSet( "datebook/DateBook" ); 30 QIconSet is = Resource::loadIconSet( "datebook/DateBookSmall" );
31 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 31 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
32 actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true ); 32 actionShowPastEvents = new QAction( QObject::tr("show past events"),QString::null, 0, 0, 0, true );
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
@@ -30,4 +30,4 @@ DocLnkSearch::DocLnkSearch(QListView* parent, QString name)
30{ 30{
31 QIconSet is = Resource::loadIconSet( "osearch/documents" ); 31 QIconSet is = Resource::loadIconSet( "osearch/documentsSmall" );
32 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 32 setPixmap( 0, is.pixmap( QIconSet::Automatic, true ) );
33 33
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
@@ -50,2 +50,23 @@
50 50
51static const char* const image1_data[] = {
52"14 14 3 1",
53". c None",
54"# c #000000",
55"a c #ff0000",
56"..............",
57"..##.......###",
58".#aa#....##aa#",
59"#aaaa#.##aaaa#",
60".##aaa#aaaaa##",
61"...#aaaaaaa#..",
62"....#aaaaa#...",
63"...#aaaaa#....",
64"..#aaaaaaa#...",
65".#aaaaaaaaa#..",
66"#aaaa###aaaa#.",
67"#aaa#..##aaa#.",
68"#aaa#...#aa#..",
69".###.....##..."};
70
71
51MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : 72MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
@@ -62,3 +83,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
62 mainLayout->setSpacing( 0 ); 83 mainLayout->setSpacing( 0 );
63 mainLayout->setMargin( 0 ); 84 mainLayout->setMargin( 3 );
64 85
@@ -156,2 +177,6 @@ void MainWindow::makeMenu()
156 //SEARCH BAR 177 //SEARCH BAR
178 LabelEnterText = new QLabel( searchBar, "Label" );
179 LabelEnterText->setAutoMask( FALSE );
180 LabelEnterText->setText( tr( "Search for: " ) );
181
157 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 182 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
@@ -162,5 +187,16 @@ void MainWindow::makeMenu()
162 searchBar->setStretchableWidget( searchEdit ); 187 searchBar->setStretchableWidget( searchEdit );
188
189 //Search button
163 SearchAllAction->addTo( searchBar ); 190 SearchAllAction->addTo( searchBar );
164 connect( searchEdit, SIGNAL( textChanged( const QString & ) ), 191
165 this, SLOT( setSearch( const QString & ) ) ); 192 //image ripped of off opie-login/loginwindow.cpp
193 QPixmap image1( ( const char** ) image1_data );
194
195 //Clear text
196 ClearSearchText = new QToolButton( searchBar, "ClearSearchText");
197 ClearSearchText->setText( tr( "" ) );
198 ClearSearchText->setPixmap( image1 );
199
200 connect( searchEdit, SIGNAL( textChanged( const QString & ) ),this, SLOT( setSearch( const QString & ) ) );
201 connect( ClearSearchText, SIGNAL( clicked() ), searchEdit, SLOT( clear() ) );
166 202
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
@@ -34,2 +34,3 @@ class QPopupMenu;
34class QTimer; 34class QTimer;
35class QLabel;
35 36
@@ -73,2 +74,4 @@ private:
73 QTimer *searchTimer; 74 QTimer *searchTimer;
75 QToolButton* ClearSearchText;
76 QLabel* LabelEnterText;
74 77
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
@@ -13,3 +13,3 @@
13#include <qmessagebox.h> 13#include <qmessagebox.h>
14 14#include <qpe/qpeapplication.h>
15 15
@@ -19,4 +19,6 @@ OListView::OListView(QWidget *parent, const char *name )
19 19
20 setRootIsDecorated( true ); 20 setRootIsDecorated( true );
21 addColumn(tr("Results")); 21 addColumn(tr("Results"),qApp->desktop()->width() - 9 );
22 //setColumnWidthMode(0, Manual);
23
22 setSorting( -1 ); 24 setSorting( -1 );
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
@@ -28,4 +28,4 @@ TodoSearch::TodoSearch(QListView* parent, QString name)
28 //setPixmap( 0, als.findExec("todolist")->pixmap() ); 28 //setPixmap( 0, als.findExec("todolist")->pixmap() );
29 QIconSet is = Resource::loadIconSet( "todo/TodoList" ); 29 QIconSet is = Resource::loadIconSet( "todo/TodoListSmall" );
30 setPixmap( 0, is.pixmap( QIconSet::Small, true ) ); 30 setPixmap( 0, is.pixmap( QIconSet::Large, true ) );
31 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true ); 31 actionShowCompleted = new QAction( QObject::tr("show completed tasks"),QString::null, 0, 0, 0, true );