Diffstat (limited to 'noncore/apps/dagger/navbar.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/dagger/navbar.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp index 97761f7..ac49613 100644 --- a/noncore/apps/dagger/navbar.cpp +++ b/noncore/apps/dagger/navbar.cpp | |||
@@ -18,4 +18,6 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
18 | #include "navbar.h" | 18 | #include "navbar.h" |
19 | 19 | ||
20 | #include <opie2/oresource.h> | ||
21 | |||
20 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
21 | #include <qpe/resource.h> | 23 | #include <qpe/resource.h> |
@@ -25,9 +27,11 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
25 | #include <qwhatsthis.h> | 27 | #include <qwhatsthis.h> |
26 | 28 | ||
29 | using Opie::Core::OResource; | ||
30 | |||
27 | NavBar::NavBar( QMainWindow *parent ) | 31 | NavBar::NavBar( QMainWindow *parent ) |
28 | : QToolBar( QString::null, parent, QMainWindow::Top, true ) | 32 | : QToolBar( QString::null, parent, QMainWindow::Top, true ) |
29 | { | 33 | { |
30 | // Initialize UI | 34 | // Initialize UI |
31 | m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ), | 35 | m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ), |
32 | QString::null, 0, this, 0 ); | 36 | QString::null, 0, this, 0 ); |
33 | m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); | 37 | m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); |
@@ -35,5 +39,5 @@ NavBar::NavBar( QMainWindow *parent ) | |||
35 | connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); | 39 | connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); |
36 | 40 | ||
37 | m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ), | 41 | m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ), |
38 | QString::null, 0, this, 0 ); | 42 | QString::null, 0, this, 0 ); |
39 | m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); | 43 | m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); |
@@ -46,5 +50,5 @@ NavBar::NavBar( QMainWindow *parent ) | |||
46 | connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); | 50 | connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) ); |
47 | 51 | ||
48 | m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ), | 52 | m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), |
49 | QString::null, 0, this, 0 ); | 53 | QString::null, 0, this, 0 ); |
50 | m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); | 54 | m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); |
@@ -52,5 +56,5 @@ NavBar::NavBar( QMainWindow *parent ) | |||
52 | connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); | 56 | connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); |
53 | 57 | ||
54 | m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ), | 58 | m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ), |
55 | QString::null, 0, this, 0 ); | 59 | QString::null, 0, this, 0 ); |
56 | m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); | 60 | m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); |
@@ -65,5 +69,5 @@ NavBar::NavBar( QMainWindow *parent ) | |||
65 | connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); | 69 | connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); |
66 | 70 | ||
67 | m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ), | 71 | m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ), |
68 | QString::null, 0, this, 0 ); | 72 | QString::null, 0, this, 0 ); |
69 | m_actionScroll->setToggleAction( true ); | 73 | m_actionScroll->setToggleAction( true ); |