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
@@ -18,8 +18,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
18#include "configuredlg.h" 18#include "configuredlg.h"
19 19
20#include <opie2/ofiledialog.h> 20#include <opie2/ofiledialog.h>
21 21#include <opie2/oresource.h>
22#include <qpe/resource.h>
23 22
24#include <qlabel.h> 23#include <qlabel.h>
25#include <qlayout.h> 24#include <qlayout.h>
@@ -51,9 +50,8 @@ ConfigureDlg::ConfigureDlg( QWidget *parent, const QString &swordPath, bool alwa
51 m_swordPath = new QLineEdit( swordPath, widget ); 50 m_swordPath = new QLineEdit( swordPath, widget );
52 QWhatsThis::add( m_swordPath, tr( "Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); 51 QWhatsThis::add( m_swordPath, tr( "Enter the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) );
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() );
58 QWhatsThis::add( btn, tr( "Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) ); 56 QWhatsThis::add( btn, tr( "Tap here to select the path where the Sword texts (Bibles, commentaries, etc.) can be found. This path should contain either the 'mods.conf' file or 'mods.d' sub-directory." ) );
59 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectSwordPath()) ); 57 connect( btn, SIGNAL(clicked()), this, SLOT(slotSelectSwordPath()) );
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
@@ -26,19 +26,19 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
26#include <qlineedit.h> 26#include <qlineedit.h>
27#include <qwhatsthis.h> 27#include <qwhatsthis.h>
28 28
29using Opie::Core::OResource;
30
31NavBar::NavBar( QMainWindow *parent ) 29NavBar::NavBar( QMainWindow *parent )
32 : QToolBar( QString::null, parent, QMainWindow::Top, true ) 30 : QToolBar( QString::null, parent, QMainWindow::Top, true )
33{ 31{
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 );
37 m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) ); 36 m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) );
38 m_actionPrevPage->addTo( this ); 37 m_actionPrevPage->addTo( this );
39 connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) ); 38 connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) );
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 );
43 m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) ); 43 m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) );
44 m_actionPrevVerse->addTo( this ); 44 m_actionPrevVerse->addTo( this );
@@ -49,14 +49,16 @@ NavBar::NavBar( QMainWindow *parent )
49 QWhatsThis::add( m_key, tr( "Enter location to display here." ) ); 49 QWhatsThis::add( m_key, tr( "Enter location to display here." ) );
50 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 &)) );
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 );
54 m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) ); 55 m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) );
55 m_actionNextVerse->addTo( this ); 56 m_actionNextVerse->addTo( this );
56 connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) ); 57 connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) );
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." ) );
61 m_actionNextPage->addTo( this ); 63 m_actionNextPage->addTo( this );
62 connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) ); 64 connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) );
@@ -68,7 +70,8 @@ NavBar::NavBar( QMainWindow *parent )
68 QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) ); 70 QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) );
69 connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) ); 71 connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) );
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 );
73 m_actionScroll->setToggleAction( true ); 76 m_actionScroll->setToggleAction( true );
74 m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) ); 77 m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) );
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
@@ -17,7 +17,7 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
17 17
18#include "opentextdlg.h" 18#include "opentextdlg.h"
19 19
20#include <qpe/resource.h> 20#include <qpe/applnk.h>
21 21
22#include <qheader.h> 22#include <qheader.h>
23#include <qlayout.h> 23#include <qlayout.h>
@@ -35,7 +35,7 @@ OpenTextDlg::OpenTextDlg( QWidget *parent, sword::SWMgr *swordMgr, QPixmap *bibl
35 layout->addWidget( &m_textList ); 35 layout->addWidget( &m_textList );
36 36
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" ) );
40 m_textList.header()->hide(); 40 m_textList.header()->hide();
41 m_textList.setAllColumnsShowFocus( true ); 41 m_textList.setAllColumnsShowFocus( true );
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
@@ -22,7 +22,6 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
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>
@@ -33,8 +32,6 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
33#include <regex.h> 32#include <regex.h>
34#include <versekey.h> 33#include <versekey.h>
35 34
36using Opie::Core::OResource;
37
38void searchCallback( char /*percent*/, void */*userData*/ ) 35void searchCallback( char /*percent*/, void */*userData*/ )
39{ 36{
40 qApp->processEvents(); 37 qApp->processEvents();
@@ -51,8 +48,9 @@ SearchBar::SearchBar( QMainWindow *parent )
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." ) );
@@ -60,8 +58,9 @@ SearchBar::SearchBar( QMainWindow *parent )
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" ),
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 );
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." ) );
@@ -72,8 +71,9 @@ SearchBar::SearchBar( QMainWindow *parent )
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" ),
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 );
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." ) );