Diffstat (limited to 'noncore/apps/dagger/searchbar.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/dagger/searchbar.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp index b794bfd..b195f67 100644 --- a/noncore/apps/dagger/searchbar.cpp +++ b/noncore/apps/dagger/searchbar.cpp | |||
@@ -19,25 +19,22 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
19 | #include "textwidget.h" | 19 | #include "textwidget.h" |
20 | 20 | ||
21 | #include <opie2/oresource.h> | 21 | #include <opie2/oresource.h> |
22 | #include <opie2/owait.h> | 22 | #include <opie2/owait.h> |
23 | 23 | ||
24 | #include <qpe/qpeapplication.h> | 24 | #include <qpe/qpeapplication.h> |
25 | #include <qpe/resource.h> | ||
26 | 25 | ||
27 | #include <qaction.h> | 26 | #include <qaction.h> |
28 | #include <qcombobox.h> | 27 | #include <qcombobox.h> |
29 | #include <qlineedit.h> | 28 | #include <qlineedit.h> |
30 | #include <qwhatsthis.h> | 29 | #include <qwhatsthis.h> |
31 | 30 | ||
32 | #include <listkey.h> | 31 | #include <listkey.h> |
33 | #include <regex.h> | 32 | #include <regex.h> |
34 | #include <versekey.h> | 33 | #include <versekey.h> |
35 | 34 | ||
36 | using Opie::Core::OResource; | ||
37 | |||
38 | void searchCallback( char /*percent*/, void */*userData*/ ) | 35 | void searchCallback( char /*percent*/, void */*userData*/ ) |
39 | { | 36 | { |
40 | qApp->processEvents(); | 37 | qApp->processEvents(); |
41 | } | 38 | } |
42 | 39 | ||
43 | SearchBar::SearchBar( QMainWindow *parent ) | 40 | SearchBar::SearchBar( QMainWindow *parent ) |
@@ -48,34 +45,37 @@ SearchBar::SearchBar( QMainWindow *parent ) | |||
48 | m_searchText = new QLineEdit( this ); | 45 | m_searchText = new QLineEdit( this ); |
49 | setStretchableWidget( m_searchText ); | 46 | setStretchableWidget( m_searchText ); |
50 | QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) ); | 47 | QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) ); |
51 | connect(m_searchText, SIGNAL(textChanged(const QString &)), | 48 | connect(m_searchText, SIGNAL(textChanged(const QString &)), |
52 | this, SLOT(slotTextChanged(const QString &)) ); | 49 | this, SLOT(slotTextChanged(const QString &)) ); |
53 | 50 | ||
54 | m_actionFind = new QAction( tr( "Find" ), OResource::loadPixmap( "find", OResource::SmallIcon ), QString::null, | 51 | m_actionFind = new QAction( tr( "Find" ), |
55 | 0, this, 0 ); | 52 | Opie::Core::OResource::loadPixmap( "find", Opie::Core::OResource::SmallIcon ), |
53 | QString::null, 0, this, 0 ); | ||
56 | m_actionFind->setEnabled( false ); | 54 | m_actionFind->setEnabled( false ); |
57 | m_actionFind->addTo( this ); | 55 | m_actionFind->addTo( this ); |
58 | m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); | 56 | m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) ); |
59 | connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); | 57 | connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) ); |
60 | 58 | ||
61 | addSeparator(); | 59 | addSeparator(); |
62 | 60 | ||
63 | m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ), | 61 | m_actionPrev = new QAction( tr( "Previous result" ), |
62 | Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ), | ||
64 | QString::null, 0, this, 0 ); | 63 | QString::null, 0, this, 0 ); |
65 | m_actionPrev->setEnabled( false ); | 64 | m_actionPrev->setEnabled( false ); |
66 | m_actionPrev->addTo( this ); | 65 | m_actionPrev->addTo( this ); |
67 | m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); | 66 | m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) ); |
68 | connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); | 67 | connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) ); |
69 | 68 | ||
70 | m_resultList = new QComboBox( this ); | 69 | m_resultList = new QComboBox( this ); |
71 | m_resultList->setEnabled( false ); | 70 | m_resultList->setEnabled( false ); |
72 | QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); | 71 | QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) ); |
73 | connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); | 72 | connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) ); |
74 | 73 | ||
75 | m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), | 74 | m_actionNext = new QAction( tr( "Next result" ), |
75 | Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ), | ||
76 | QString::null, 0, this, 0 ); | 76 | QString::null, 0, this, 0 ); |
77 | m_actionNext->setEnabled( false ); | 77 | m_actionNext->setEnabled( false ); |
78 | m_actionNext->addTo( this ); | 78 | m_actionNext->addTo( this ); |
79 | m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); | 79 | m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) ); |
80 | connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); | 80 | connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) ); |
81 | 81 | ||