Diffstat (limited to 'core/pim/osearch/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/pim/osearch/mainwindow.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/core/pim/osearch/mainwindow.cpp b/core/pim/osearch/mainwindow.cpp index 1d0331c..d71b167 100644 --- a/core/pim/osearch/mainwindow.cpp +++ b/core/pim/osearch/mainwindow.cpp | |||
@@ -12,31 +12,30 @@ | |||
12 | 12 | ||
13 | #include "olistview.h" | 13 | #include "olistview.h" |
14 | #include "olistviewitem.h" | 14 | #include "olistviewitem.h" |
15 | #include "resultitem.h" | 15 | #include "resultitem.h" |
16 | #include "adresssearch.h" | 16 | #include "adresssearch.h" |
17 | #include "todosearch.h" | 17 | #include "todosearch.h" |
18 | #include "datebooksearch.h" | 18 | #include "datebooksearch.h" |
19 | #include "applnksearch.h" | 19 | #include "applnksearch.h" |
20 | #include "doclnksearch.h" | 20 | #include "doclnksearch.h" |
21 | #include "mainwindow.h" | 21 | #include "mainwindow.h" |
22 | 22 | ||
23 | #include <opie2/odebug.h> | 23 | #include <opie2/odebug.h> |
24 | #include <opie2/oresource.h> | ||
24 | #include <opie2/owait.h> | 25 | #include <opie2/owait.h> |
25 | 26 | ||
26 | #include <qpe/qpemessagebox.h> | 27 | #include <qpe/qpemessagebox.h> |
27 | #include <qpe/resource.h> | ||
28 | #include <qpe/config.h> | 28 | #include <qpe/config.h> |
29 | 29 | ||
30 | |||
31 | #include <qpe/qpeapplication.h> | 30 | #include <qpe/qpeapplication.h> |
32 | #include <qpe/global.h> | 31 | #include <qpe/global.h> |
33 | 32 | ||
34 | #include <qtoolbar.h> | 33 | #include <qtoolbar.h> |
35 | #include <qaction.h> | 34 | #include <qaction.h> |
36 | #include <qmessagebox.h> | 35 | #include <qmessagebox.h> |
37 | #include <qpopupmenu.h> | 36 | #include <qpopupmenu.h> |
38 | #include <qtoolbutton.h> | 37 | #include <qtoolbutton.h> |
39 | #include <qstring.h> | 38 | #include <qstring.h> |
40 | #include <qlabel.h> | 39 | #include <qlabel.h> |
41 | #include <qfile.h> | 40 | #include <qfile.h> |
42 | #include <qhbuttongroup.h> | 41 | #include <qhbuttongroup.h> |
@@ -156,25 +155,25 @@ void MainWindow::makeMenu() | |||
156 | cfgMenu->insertItem( tr( "Search" ), searchOptions ); | 155 | cfgMenu->insertItem( tr( "Search" ), searchOptions ); |
157 | QPopupMenu *pop; | 156 | QPopupMenu *pop; |
158 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ | 157 | for (SearchGroup *s = searches.first(); s != 0; s = searches.next() ){ |
159 | pop = s->popupMenu(); | 158 | pop = s->popupMenu(); |
160 | if (pop){ | 159 | if (pop){ |
161 | cfgMenu->insertItem( s->text(0), pop ); | 160 | cfgMenu->insertItem( s->text(0), pop ); |
162 | } | 161 | } |
163 | } | 162 | } |
164 | 163 | ||
165 | 164 | ||
166 | //SEARCH | 165 | //SEARCH |
167 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); | 166 | SearchAllAction = new QAction( tr("Search all"),QString::null, 0, this, 0 ); |
168 | SearchAllAction->setIconSet( Resource::loadIconSet( "find" ) ); | 167 | SearchAllAction->setIconSet( Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ) ); |
169 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); | 168 | // QWhatsThis::add( SearchAllAction, tr("Search everything...") ); |
170 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); | 169 | connect( SearchAllAction, SIGNAL(activated()), this, SLOT(searchAll()) ); |
171 | SearchAllAction->addTo( searchMenu ); | 170 | SearchAllAction->addTo( searchMenu ); |
172 | searchMenu->insertItem( tr( "Options" ), searchOptions ); | 171 | searchMenu->insertItem( tr( "Options" ), searchOptions ); |
173 | 172 | ||
174 | //SEARCH OPTIONS | 173 | //SEARCH OPTIONS |
175 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); | 174 | //actionWholeWordsOnly = new QAction( tr("Whole words only"),QString::null, 0, this, 0, true ); |
176 | //actionWholeWordsOnly->addTo( searchOptions ); | 175 | //actionWholeWordsOnly->addTo( searchOptions ); |
177 | actionCaseSensitiv = new QAction( tr("Case sensitive"),QString::null, 0, this, 0, true ); | 176 | actionCaseSensitiv = new QAction( tr("Case sensitive"),QString::null, 0, this, 0, true ); |
178 | actionCaseSensitiv->addTo( searchOptions ); | 177 | actionCaseSensitiv->addTo( searchOptions ); |
179 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); | 178 | actionWildcards = new QAction( tr("Use wildcards"),QString::null, 0, this, 0, true ); |
180 | actionWildcards->addTo( searchOptions ); | 179 | actionWildcards->addTo( searchOptions ); |