summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/dagger/configuredlg.cpp8
-rw-r--r--noncore/apps/dagger/navbar.cpp19
-rw-r--r--noncore/apps/dagger/opentextdlg.cpp4
-rw-r--r--noncore/apps/dagger/searchbar.cpp18
4 files changed, 25 insertions, 24 deletions
diff --git a/noncore/apps/dagger/configuredlg.cpp b/noncore/apps/dagger/configuredlg.cpp
index 42bc6da..791eeb1 100644
--- a/noncore/apps/dagger/configuredlg.cpp
+++ b/noncore/apps/dagger/configuredlg.cpp
@@ -20,4 +20,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
20#include <opie2/ofiledialog.h> 20#include <opie2/ofiledialog.h>
21 21#include <opie2/oresource.h>
22#include <qpe/resource.h>
23 22
@@ -53,5 +52,4 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa
53 grid->addWidget( m_swordPath, 1, 0 ); 52 grid->addWidget( m_swordPath, 1, 0 );
54 QPixmap pic; 53 QPushButton *btn = new QPushButton( Opie::Core::OResource::loadPixmap( "folder", Opie::Core::OResource::SmallIcon ),
55 pic.convertFromImage( Resource::loadImage( "folder" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) ); 54 QString::null, widget );
56 QPushButton *btn = new QPushButton( pic, QString::null, widget );
57 btn->setMaximumWidth( btn->height() ); 55 btn->setMaximumWidth( btn->height() );
diff --git a/noncore/apps/dagger/navbar.cpp b/noncore/apps/dagger/navbar.cpp
index ac49613..b28c677 100644
--- a/noncore/apps/dagger/navbar.cpp
+++ b/noncore/apps/dagger/navbar.cpp
@@ -28,4 +28,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
28 28
29using Opie::Core::OResource;
30
31NavBar::NavBar( QMainWindow *parent ) 29NavBar::NavBar( QMainWindow *parent )
@@ -34,3 +32,4 @@ NavBar::NavBar( QMainWindow *parent )
34 // Initialize UI 32 // Initialize UI
35 m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ), 33 m_actionPrevPage = new QAction( tr( "Previous page" ),
34 Opie::Core::OResource::loadPixmap( "fastback", Opie::Core::OResource::SmallIcon ),
36 QString::null, 0, this, 0 ); 35 QString::null, 0, this, 0 );
@@ -40,3 +39,4 @@ NavBar::NavBar( QMainWindow *parent )
40 39
41 m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ), 40 m_actionPrevVerse = new QAction( tr( "Previous verse" ),
41 Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
42 QString::null, 0, this, 0 ); 42 QString::null, 0, this, 0 );
@@ -51,3 +51,4 @@ NavBar::NavBar( QMainWindow *parent )
51 51
52 m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), 52 m_actionNextVerse = new QAction( tr( "Next verse" ),
53 Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
53 QString::null, 0, this, 0 ); 54 QString::null, 0, this, 0 );
@@ -57,4 +58,5 @@ NavBar::NavBar( QMainWindow *parent )
57 58
58 m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ), 59 m_actionNextPage = new QAction( tr( "Next page" ),
59 QString::null, 0, this, 0 ); 60 Opie::Core::OResource::loadPixmap( "fastforward", Opie::Core::OResource::SmallIcon ),
61 QString::null, 0, this, 0 );
60 m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) ); 62 m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) );
@@ -70,3 +72,4 @@ NavBar::NavBar( QMainWindow *parent )
70 72
71 m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ), 73 m_actionScroll = new QAction( tr( "Auto-scroll" ),
74 Opie::Core::OResource::loadPixmap( "dagger/autoscroll", Opie::Core::OResource::SmallIcon ),
72 QString::null, 0, this, 0 ); 75 QString::null, 0, this, 0 );
diff --git a/noncore/apps/dagger/opentextdlg.cpp b/noncore/apps/dagger/opentextdlg.cpp
index 8c94a4b..7fd5cde 100644
--- a/noncore/apps/dagger/opentextdlg.cpp
+++ b/noncore/apps/dagger/opentextdlg.cpp
@@ -19,3 +19,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
19 19
20#include <qpe/resource.h> 20#include <qpe/applnk.h>
21 21
@@ -37,3 +37,3 @@ OpenTextDlg::OpenTextDlg( QWidget *parent, sword::SWMgr *swordMgr, QPixmap *bibl
37 m_textList.setRootIsDecorated( true ); 37 m_textList.setRootIsDecorated( true );
38 m_textList.addColumn( tr( "Icon" ),35 ); 38 m_textList.addColumn( tr( "Icon" ) );
39 m_textList.addColumn( tr( "Text" ) ); 39 m_textList.addColumn( tr( "Text" ) );
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
@@ -24,3 +24,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
24#include <qpe/qpeapplication.h> 24#include <qpe/qpeapplication.h>
25#include <qpe/resource.h>
26 25
@@ -35,4 +34,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
35 34
36using Opie::Core::OResource;
37
38void searchCallback( char /*percent*/, void */*userData*/ ) 35void searchCallback( char /*percent*/, void */*userData*/ )
@@ -53,4 +50,5 @@ SearchBar::SearchBar( QMainWindow *parent )
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 );
@@ -62,4 +60,5 @@ SearchBar::SearchBar( QMainWindow *parent )
62 60
63 m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ), 61 m_actionPrev = new QAction( tr( "Previous result" ),
64 QString::null, 0, this, 0 ); 62 Opie::Core::OResource::loadPixmap( "back", Opie::Core::OResource::SmallIcon ),
63 QString::null, 0, this, 0 );
65 m_actionPrev->setEnabled( false ); 64 m_actionPrev->setEnabled( false );
@@ -74,4 +73,5 @@ SearchBar::SearchBar( QMainWindow *parent )
74 73
75 m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ), 74 m_actionNext = new QAction( tr( "Next result" ),
76 QString::null, 0, this, 0 ); 75 Opie::Core::OResource::loadPixmap( "forward", Opie::Core::OResource::SmallIcon ),
76 QString::null, 0, this, 0 );
77 m_actionNext->setEnabled( false ); 77 m_actionNext->setEnabled( false );