summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/apps/dagger/mainwindow.cpp31
-rw-r--r--noncore/apps/dagger/navbar.cpp14
-rw-r--r--noncore/apps/dagger/searchbar.cpp9
3 files changed, 35 insertions, 19 deletions
diff --git a/noncore/apps/dagger/mainwindow.cpp b/noncore/apps/dagger/mainwindow.cpp
index 3dd9eff..1f2d521 100644
--- a/noncore/apps/dagger/mainwindow.cpp
+++ b/noncore/apps/dagger/mainwindow.cpp
@@ -20,16 +20,16 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
#include "searchbar.h"
#include "opentextdlg.h"
#include "configuredlg.h"
#include "textwidget.h"
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/qpeapplication.h>
-#include <qpe/resource.h>
#include <qaction.h>
#include <qclipboard.h>
#include <qmenubar.h>
#include <qmessagebox.h>
#include <qobjectlist.h>
@@ -61,15 +61,15 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ )
setCaption( tr( "Dagger" ) );
initUI();
connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) );
connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) );
- m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) );
- m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) );
- m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) );
+ m_bibleIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/bibletext", Opie::Core::OResource::SmallIcon ) );
+ m_commentaryIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/commentary", Opie::Core::OResource::SmallIcon ) );
+ m_lexiconIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/lexicon", Opie::Core::OResource::SmallIcon ) );
// Load initial configuration
QTimer::singleShot( 100, this, SLOT( initConfig() ) );
}
MainWindow::~MainWindow()
@@ -184,53 +184,62 @@ void MainWindow::initUI()
m_searchToolbar = new SearchBar( this );
connect( m_searchToolbar, SIGNAL(sigResultClicked(const QString &)), this, SLOT(slotSearchResultClicked(const QString &)) );
// Text menu
QPopupMenu *popup = new QPopupMenu( this );
- QAction *a = new QAction( tr( "Open..." ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 );
+ QAction *a = new QAction( tr( "Open..." ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( a, SIGNAL(activated()), this, SLOT(slotTextOpen()) );
a->addTo( popup );
- m_actionTextClose = new QAction( tr( "Close" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 );
+ m_actionTextClose = new QAction( tr( "Close" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( m_actionTextClose, SIGNAL(activated()), this, SLOT(slotTextClose()) );
m_actionTextClose->addTo( popup );
popup->insertSeparator();
// TODO - need to implent
- a = new QAction( tr( "Install..." ), Resource::loadPixmap( "install" ), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Install" ), Opie::Core::OResource::loadPixmap( "install", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
a->setEnabled( false );
connect( a, SIGNAL(activated()), this, SLOT(slotTextInstall()) );
a->addTo( popup );
m_menuBar->insertItem( tr( "Text" ), popup );
// Edit menu
popup = new QPopupMenu( this );
- m_actionEditCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 );
+ m_actionEditCopy = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( m_actionEditCopy, SIGNAL(activated()), this, SLOT(slotEditCopy()) );
m_actionEditCopy->addTo( popup );
popup->insertSeparator();
- a = new QAction( tr( "Configure..." ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 );
+ a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( a, SIGNAL(activated()), this, SLOT(slotEditConfigure()) );
a->addTo( popup );
m_menuBar->insertItem( tr( "Edit" ), popup );
// Bookmark menu
m_bookmarkMenu = new QPopupMenu( this );
- m_actionBookmarkAdd = new QAction( tr( "Add" ), Resource::loadPixmap( "dagger/bookmarkadd" ), QString::null, 0, this, 0 );
+ m_actionBookmarkAdd = new QAction( tr( "Add" ),
+ Opie::Core::OResource::loadPixmap( "dagger/bookmarkadd", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( m_actionBookmarkAdd, SIGNAL(activated()), this, SLOT(slotBookmarkAdd()) );
m_actionBookmarkAdd->addTo( m_bookmarkMenu );
- m_actionBookmarkRemove = new QAction( tr( "Remove" ), Resource::loadPixmap( "dagger/bookmarkremove" ), QString::null, 0, this, 0 );
+ m_actionBookmarkRemove = new QAction( tr( "Remove" ),
+ Opie::Core::OResource::loadPixmap( "dagger/bookmarkremove", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect( m_actionBookmarkRemove, SIGNAL(activated()), this, SLOT(slotBookmarkRemove()) );
m_actionBookmarkRemove->addTo( m_bookmarkMenu );
m_bookmarkMenu->insertSeparator();
m_menuBar->insertItem( tr( "Bookmark" ), m_bookmarkMenu );
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
@@ -14,60 +14,64 @@ You should have received a copy of the GNU General Public License along with thi
file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "navbar.h"
+#include <opie2/oresource.h>
+
#include <qpe/config.h>
#include <qpe/resource.h>
#include <qaction.h>
#include <qlineedit.h>
#include <qwhatsthis.h>
+using Opie::Core::OResource;
+
NavBar::NavBar( QMainWindow *parent )
: QToolBar( QString::null, parent, QMainWindow::Top, true )
{
// Initialize UI
- m_actionPrevPage = new QAction( tr( "Previous page" ), Resource::loadPixmap( "fastback" ),
+ m_actionPrevPage = new QAction( tr( "Previous page" ), OResource::loadPixmap( "fastback", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionPrevPage->setWhatsThis( tr( "Tap here to scroll backward one page." ) );
m_actionPrevPage->addTo( this );
connect( m_actionPrevPage, SIGNAL(activated()), this, SIGNAL(prevPage()) );
- m_actionPrevVerse = new QAction( tr( "Previous verse" ), Resource::loadPixmap( "back" ),
+ m_actionPrevVerse = new QAction( tr( "Previous verse" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionPrevVerse->setWhatsThis( tr( "Tap here to scroll backward one verse." ) );
m_actionPrevVerse->addTo( this );
connect( m_actionPrevVerse, SIGNAL(activated()), this, SIGNAL(prevVerse()) );
m_key = new QLineEdit( this );
setStretchableWidget( m_key );
QWhatsThis::add( m_key, tr( "Enter location to display here." ) );
connect(m_key, SIGNAL(textChanged(const QString &)), this, SIGNAL(keyChanged(const QString &)) );
- m_actionNextVerse = new QAction( tr( "Next verse" ), Resource::loadPixmap( "forward" ),
+ m_actionNextVerse = new QAction( tr( "Next verse" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionNextVerse->setWhatsThis( tr( "Tap here to scroll forward one verse." ) );
m_actionNextVerse->addTo( this );
connect( m_actionNextVerse, SIGNAL(activated()), this, SIGNAL(nextVerse()) );
- m_actionNextPage = new QAction( tr( "Next page" ), Resource::loadPixmap( "fastforward" ),
+ m_actionNextPage = new QAction( tr( "Next page" ), OResource::loadPixmap( "fastforward", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionNextPage->setWhatsThis( tr( "Tap here to scroll forward one page." ) );
m_actionNextPage->addTo( this );
connect( m_actionNextPage, SIGNAL(activated()), this, SIGNAL(nextPage()) );
addSeparator();
m_scrollRate = new QSpinBox( 1, 100, 1, this );
m_scrollRate->setMinimumWidth( 35 );
QWhatsThis::add( m_scrollRate, tr( "Adjust auto-scroll rate here. A larger value represents a slower scrolling rate." ) );
connect( m_scrollRate, SIGNAL(valueChanged(int)), this, SIGNAL(scrollRateChanged(int)) );
- m_actionScroll = new QAction( tr( "Auto-scroll" ), Resource::loadPixmap( "dagger/autoscroll" ),
+ m_actionScroll = new QAction( tr( "Auto-scroll" ), OResource::loadPixmap( "dagger/autoscroll", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionScroll->setToggleAction( true );
m_actionScroll->setWhatsThis( tr( "Tap here to start or stop auto-scrolling." ) );
connect( m_actionScroll, SIGNAL(toggled(bool)), this, SIGNAL(autoScroll(bool)) );
m_actionScroll->addTo( this );
diff --git a/noncore/apps/dagger/searchbar.cpp b/noncore/apps/dagger/searchbar.cpp
index 9953e8f..b794bfd 100644
--- a/noncore/apps/dagger/searchbar.cpp
+++ b/noncore/apps/dagger/searchbar.cpp
@@ -15,12 +15,13 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "searchbar.h"
#include "textwidget.h"
+#include <opie2/oresource.h>
#include <opie2/owait.h>
#include <qpe/qpeapplication.h>
#include <qpe/resource.h>
#include <qaction.h>
@@ -29,12 +30,14 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc.,
#include <qwhatsthis.h>
#include <listkey.h>
#include <regex.h>
#include <versekey.h>
+using Opie::Core::OResource;
+
void searchCallback( char /*percent*/, void */*userData*/ )
{
qApp->processEvents();
}
SearchBar::SearchBar( QMainWindow *parent )
@@ -45,34 +48,34 @@ SearchBar::SearchBar( QMainWindow *parent )
m_searchText = new QLineEdit( this );
setStretchableWidget( m_searchText );
QWhatsThis::add( m_searchText, tr( "Enter text to search for here." ) );
connect(m_searchText, SIGNAL(textChanged(const QString &)),
this, SLOT(slotTextChanged(const QString &)) );
- m_actionFind = new QAction( tr( "Find" ), Resource::loadPixmap( "find" ), QString::null,
+ m_actionFind = new QAction( tr( "Find" ), OResource::loadPixmap( "find", OResource::SmallIcon ), QString::null,
0, this, 0 );
m_actionFind->setEnabled( false );
m_actionFind->addTo( this );
m_actionFind->setWhatsThis( tr( "Tap here search the current module for the text entered to the left." ) );
connect( m_actionFind, SIGNAL(activated()), this, SLOT(slotFind()) );
addSeparator();
- m_actionPrev = new QAction( tr( "Previous result" ), Resource::loadPixmap( "back" ),
+ m_actionPrev = new QAction( tr( "Previous result" ), OResource::loadPixmap( "back", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionPrev->setEnabled( false );
m_actionPrev->addTo( this );
m_actionPrev->setWhatsThis( tr( "Tap here to view the previous search result." ) );
connect( m_actionPrev, SIGNAL(activated()), this, SLOT(slotPrev()) );
m_resultList = new QComboBox( this );
m_resultList->setEnabled( false );
QWhatsThis::add( m_resultList, tr( "Select the desired search result here." ) );
connect( m_resultList, SIGNAL(activated(const QString &)), this, SIGNAL(sigResultClicked(const QString &)) );
- m_actionNext = new QAction( tr( "Next result" ), Resource::loadPixmap( "forward" ),
+ m_actionNext = new QAction( tr( "Next result" ), OResource::loadPixmap( "forward", OResource::SmallIcon ),
QString::null, 0, this, 0 );
m_actionNext->setEnabled( false );
m_actionNext->addTo( this );
m_actionNext->setWhatsThis( tr( "Tap here to view the next search result." ) );
connect( m_actionNext, SIGNAL(activated()), this, SLOT(slotNext()) );