summaryrefslogtreecommitdiff
Side-by-side diff
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):
_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") );
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 @@
+
AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent, name)
@@ -24,5 +25,5 @@ AppLnkSearch::AppLnkSearch(QListView* parent, QString name): SearchGroup(parent,
_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 ) );
}
@@ -44,2 +45,3 @@ int AppLnkSearch::search()
QList<AppLnk> appList = _apps->children();
+
for ( AppLnk *app = appList.first(); app != 0; app = appList.next() ){
@@ -47,3 +49,3 @@ int AppLnkSearch::search()
|| (_search.match(app->comment()) != -1)
- || (_search.match(app->exec()) != -1) ) {
+ || (_search.match(app->exec()) != -1) ) {
insertItem( app );
@@ -51,4 +53,4 @@ int AppLnkSearch::search()
if (searchFile( app ))
- insertItem( app );
- qApp->processEvents( 100 );
+ insertItem( app );
+ qApp->processEvents( 100 );
}
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)
{
- 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 );
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)
{
- 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 ) );
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 @@
+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 ) :
@@ -62,3 +83,3 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
mainLayout->setSpacing( 0 );
- mainLayout->setMargin( 0 );
+ mainLayout->setMargin( 3 );
@@ -156,2 +177,6 @@ void MainWindow::makeMenu()
//SEARCH BAR
+ LabelEnterText = new QLabel( searchBar, "Label" );
+ LabelEnterText->setAutoMask( FALSE );
+ LabelEnterText->setText( tr( "Search for: " ) );
+
addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
@@ -162,5 +187,16 @@ void MainWindow::makeMenu()
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
@@ -34,2 +34,3 @@ class QPopupMenu;
class QTimer;
+class QLabel;
@@ -73,2 +74,4 @@ private:
QTimer *searchTimer;
+ QToolButton* ClearSearchText;
+ QLabel* LabelEnterText;
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 @@
#include <qmessagebox.h>
-
+#include <qpe/qpeapplication.h>
@@ -19,4 +19,6 @@ OListView::OListView(QWidget *parent, const char *name )
- setRootIsDecorated( true );
- addColumn(tr("Results"));
+ setRootIsDecorated( true );
+ addColumn(tr("Results"),qApp->desktop()->width() - 9 );
+ //setColumnWidthMode(0, Manual);
+
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)
// 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 );