summaryrefslogtreecommitdiff
authortille <tille>2003-05-16 19:36:33 (UTC)
committer tille <tille>2003-05-16 19:36:33 (UTC)
commit87051a7ba4834aed152bc09aad7f4935c9729ccb (patch) (side-by-side diff)
tree85c2b2274efede684b1914a4e4a1b2c87bddf6b3
parent1ac65aca5d1219e537238330501bc441dd2a3324 (diff)
downloadopie-87051a7ba4834aed152bc09aad7f4935c9729ccb.zip
opie-87051a7ba4834aed152bc09aad7f4935c9729ccb.tar.gz
opie-87051a7ba4834aed152bc09aad7f4935c9729ccb.tar.bz2
and some whatsthis
Diffstat (more/less context) (ignore 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 @@
//
#include "adresssearch.h"
-#include <opie/ocontactaccess.h>
#include <qstring.h>
#include <qiconset.h>
+#include <qwhatsthis.h>
#include <qpe/resource.h>
+#include <opie/ocontactaccess.h>
#include "contactitem.h"
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()
icon = Resource::loadPixmap( "addressbook/mobilework" );
break;
case Qtopia::DefaultEmail:
- icon = Resource::loadPixmap( "addressbook/email" );
- break;
case Qtopia::Emails:
icon = Resource::loadPixmap( "addressbook/email" );
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 @@
// (c) 2002 Patrick S. Vogt <tille@handhelds.org>
-#include "mainwindow.h"
-#include <qpe/qpemenubar.h>
-#include <qpe/qpemessagebox.h>
-#include <qpe/resource.h>
-#include <qpe/config.h>
-#include <qpe/qpetoolbar.h>
-#include <qpe/qpeapplication.h>
-#include <qpe/config.h>
-#include <qpe/global.h>
-#include <opie/owait.h>
#include <qaction.h>
#include <qmessagebox.h>
#include <qpopupmenu.h>
@@ -35,6 +25,16 @@
#include <qlineedit.h>
#include <qtextbrowser.h>
#include <qregexp.h>
+#include <qwhatsthis.h>
+#include <qpe/qpemenubar.h>
+#include <qpe/qpemessagebox.h>
+#include <qpe/resource.h>
+#include <qpe/config.h>
+#include <qpe/qpetoolbar.h>
+#include <qpe/qpeapplication.h>
+#include <qpe/config.h>
+#include <qpe/global.h>
+#include <opie/owait.h>
#include "olistview.h"
#include "olistviewitem.h"
@@ -44,6 +44,7 @@
#include "datebooksearch.h"
#include "applnksearch.h"
#include "doclnksearch.h"
+#include "mainwindow.h"
MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
QMainWindow( parent, name, f ), _currentItem(0)
@@ -66,6 +67,7 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags f ) :
detailsFrame = new QFrame( mainFrame, "detailsFrame" );
QVBoxLayout *detailsLayout = new QVBoxLayout( detailsFrame );
richEdit = new QTextView( detailsFrame );
+ QWhatsThis::add( richEdit, tr("The details of the current result") );
richEdit->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
detailsLayout->addWidget( richEdit );
@@ -134,6 +136,7 @@ void MainWindow::makeMenu()
//SEARCH
SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 );
SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) );
+ // QWhatsThis::add( SearchAllAction, tr("Search everything...") );
connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) );
SearchAllAction->addTo( searchMenu );
searchMenu->insertItem( tr( "Options" ), searchOptions );
@@ -149,6 +152,7 @@ void MainWindow::makeMenu()
//SEARCH BAR
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 );