summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/pim/osearch/adresssearch.cpp3
-rw-r--r--core/pim/osearch/contactitem.cpp2
-rw-r--r--core/pim/osearch/mainwindow.cpp24
3 files changed, 16 insertions, 13 deletions
diff --git a/core/pim/osearch/adresssearch.cpp b/core/pim/osearch/adresssearch.cpp
index 252fb40..2cd545f 100644
--- a/core/pim/osearch/adresssearch.cpp
+++ b/core/pim/osearch/adresssearch.cpp
@@ -12,10 +12,11 @@
12// 12//
13#include "adresssearch.h" 13#include "adresssearch.h"
14 14
15#include <opie/ocontactaccess.h>
16#include <qstring.h> 15#include <qstring.h>
17#include <qiconset.h> 16#include <qiconset.h>
17#include <qwhatsthis.h>
18#include <qpe/resource.h> 18#include <qpe/resource.h>
19#include <opie/ocontactaccess.h>
19 20
20#include "contactitem.h" 21#include "contactitem.h"
21 22
diff --git a/core/pim/osearch/contactitem.cpp b/core/pim/osearch/contactitem.cpp
index 68e0cd4..c4738ae 100644
--- a/core/pim/osearch/contactitem.cpp
+++ b/core/pim/osearch/contactitem.cpp
@@ -42,8 +42,6 @@ void ContactItem::setIcon()
42 icon = Resource::loadPixmap( "addressbook/mobilework" ); 42 icon = Resource::loadPixmap( "addressbook/mobilework" );
43 break; 43 break;
44 case Qtopia::DefaultEmail: 44 case Qtopia::DefaultEmail:
45 icon = Resource::loadPixmap( "addressbook/email" );
46 break;
47 case Qtopia::Emails: 45 case Qtopia::Emails:
48 icon = Resource::loadPixmap( "addressbook/email" ); 46 icon = Resource::loadPixmap( "addressbook/email" );
49 break; 47 break;
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp
index 2936b17..c6934db 100644
--- a/core/pim/osearch/mainwindow.cpp
+++ b/core/pim/osearch/mainwindow.cpp
@@ -10,17 +10,7 @@
10// (c) 2002 Patrick S. Vogt <tille@handhelds.org> 10// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
11 11
12 12
13#include "mainwindow.h"
14 13
15#include <qpe/qpemenubar.h>
16#include <qpe/qpemessagebox.h>
17#include <qpe/resource.h>
18#include <qpe/config.h>
19#include <qpe/qpetoolbar.h>
20#include <qpe/qpeapplication.h>
21#include <qpe/config.h>
22#include <qpe/global.h>
23#include <opie/owait.h>
24#include <qaction.h> 14#include <qaction.h>
25#include <qmessagebox.h> 15#include <qmessagebox.h>
26#include <qpopupmenu.h> 16#include <qpopupmenu.h>
@@ -35,6 +25,16 @@
35#include <qlineedit.h> 25#include <qlineedit.h>
36#include <qtextbrowser.h> 26#include <qtextbrowser.h>
37#include <qregexp.h> 27#include <qregexp.h>
28#include <qwhatsthis.h>
29#include <qpe/qpemenubar.h>
30#include <qpe/qpemessagebox.h>
31#include <qpe/resource.h>
32#include <qpe/config.h>
33#include <qpe/qpetoolbar.h>
34#include <qpe/qpeapplication.h>
35#include <qpe/config.h>
36#include <qpe/global.h>
37#include <opie/owait.h>
38 38
39#include "olistview.h" 39#include "olistview.h"
40#include "olistviewitem.h" 40#include "olistviewitem.h"
@@ -44,6 +44,7 @@
44#include "datebooksearch.h" 44#include "datebooksearch.h"
45#include "applnksearch.h" 45#include "applnksearch.h"
46#include "doclnksearch.h" 46#include "doclnksearch.h"
47#include "mainwindow.h"
47 48
48MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) : 49MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
49 QMainWindow( parent, name, f ), _currentItem(0) 50 QMainWindow( parent, name, f ), _currentItem(0)
@@ -66,6 +67,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
66 detailsFrame = new QFrame( mainFrame, "detailsFrame" ); 67 detailsFrame = new QFrame( mainFrame, "detailsFrame" );
67 QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame ); 68 QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
68 richEdit = new QTextView( detailsFrame ); 69 richEdit = new QTextView( detailsFrame );
70 QWhatsThis::add( richEdit, tr("The details of the current result") );
69 richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding)); 71 richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
70 detailsLayout->addWidget( richEdit ); 72 detailsLayout->addWidget( richEdit );
71 73
@@ -134,6 +136,7 @@ void MainWindow::makeMenu()
134 //SEARCH 136 //SEARCH
135 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); 137 SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
136 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); 138 SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
139 // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
137 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); 140 connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
138 SearchAllAction->addTo( searchMenu ); 141 SearchAllAction->addTo( searchMenu );
139 searchMenu->insertItem( tr( "Options" ), searchOptions ); 142 searchMenu->insertItem( tr( "Options" ), searchOptions );
@@ -149,6 +152,7 @@ void MainWindow::makeMenu()
149 //SEARCH BAR 152 //SEARCH BAR
150 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE ); 153 addToolBar( searchBar, "Search", QMainWindow::Top, TRUE );
151 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" ); 154 QLineEdit *searchEdit = new QLineEdit( searchBar, "seachEdit" );
155 QWhatsThis::add( searchEdit, tr("Enter your search terms here") );
152 searchEdit->setFocus(); 156 searchEdit->setFocus();
153 searchBar->setHorizontalStretchable( TRUE ); 157 searchBar->setHorizontalStretchable( TRUE );
154 searchBar->setStretchableWidget( searchEdit ); 158 searchBar->setStretchableWidget( searchEdit );