author | drw <drw> | 2005-04-24 19:29:20 (UTC) |
---|---|---|
committer | drw <drw> | 2005-04-24 19:29:20 (UTC) |
commit | 9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b (patch) (side-by-side diff) | |
tree | ef243e01fd5347d74d06e7d90e9c3fc19d990534 /noncore | |
parent | d1ca2bbae79743f9f8a2c5ac1d702cc1c789fd27 (diff) | |
download | opie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.zip opie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.tar.gz opie-9f4dd8e0d2cbe83d23c5405394d5e076dd6c2c6b.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/apps/dagger/mainwindow.cpp | 31 | ||||
-rw-r--r-- | noncore/apps/dagger/navbar.cpp | 14 | ||||
-rw-r--r-- | noncore/apps/dagger/searchbar.cpp | 9 |
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 @@ -25,2 +25,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include <opie2/odebug.h> +#include <opie2/oresource.h> @@ -28,3 +29,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., #include <qpe/qpeapplication.h> -#include <qpe/resource.h> @@ -66,5 +66,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) - 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 ) ); @@ -189,3 +189,4 @@ void MainWindow::initUI() - 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()) ); @@ -193,3 +194,4 @@ void MainWindow::initUI() - 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()) ); @@ -200,3 +202,4 @@ void MainWindow::initUI() // 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 ); @@ -210,3 +213,4 @@ void MainWindow::initUI() - 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()) ); @@ -216,3 +220,4 @@ void MainWindow::initUI() - 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()) ); @@ -225,3 +230,5 @@ void MainWindow::initUI() - 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()) ); @@ -229,3 +236,5 @@ void MainWindow::initUI() - 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()) ); 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 @@ -19,2 +19,4 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., +#include <opie2/oresource.h> + #include <qpe/config.h> @@ -26,2 +28,4 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., +using Opie::Core::OResource; + NavBar::NavBar( QMainWindow *parent ) @@ -30,3 +34,3 @@ NavBar::NavBar( QMainWindow *parent ) // 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 ); @@ -36,3 +40,3 @@ NavBar::NavBar( QMainWindow *parent ) - 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 ); @@ -47,3 +51,3 @@ NavBar::NavBar( QMainWindow *parent ) - 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 ); @@ -53,3 +57,3 @@ NavBar::NavBar( QMainWindow *parent ) - 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 ); @@ -66,3 +70,3 @@ NavBar::NavBar( QMainWindow *parent ) - 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 ); 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 @@ -20,2 +20,3 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., +#include <opie2/oresource.h> #include <opie2/owait.h> @@ -34,2 +35,4 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., +using Opie::Core::OResource; + void searchCallback( char /*percent*/, void */*userData*/ ) @@ -50,3 +53,3 @@ SearchBar::SearchBar( QMainWindow *parent ) - 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 ); @@ -59,3 +62,3 @@ SearchBar::SearchBar( QMainWindow *parent ) - 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 ); @@ -71,3 +74,3 @@ SearchBar::SearchBar( QMainWindow *parent ) - 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 ); |