Diffstat (limited to 'noncore/apps/dagger/mainwindow.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/apps/dagger/mainwindow.cpp | 31 |
1 files changed, 20 insertions, 11 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., | |||
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/oresource.h> | ||
26 | 27 | ||
@@ -28,3 +29,2 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
28 | #include <qpe/qpeapplication.h> | 29 | #include <qpe/qpeapplication.h> |
29 | #include <qpe/resource.h> | ||
30 | 30 | ||
@@ -66,5 +66,5 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) | |||
66 | 66 | ||
67 | m_bibleIcon = new QPixmap( Resource::loadPixmap( "dagger/bibletext" ) ); | 67 | m_bibleIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/bibletext", Opie::Core::OResource::SmallIcon ) ); |
68 | m_commentaryIcon = new QPixmap( Resource::loadPixmap( "dagger/commentary" ) ); | 68 | m_commentaryIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/commentary", Opie::Core::OResource::SmallIcon ) ); |
69 | m_lexiconIcon = new QPixmap( Resource::loadPixmap( "dagger/lexicon" ) ); | 69 | m_lexiconIcon = new QPixmap( Opie::Core::OResource::loadPixmap( "dagger/lexicon", Opie::Core::OResource::SmallIcon ) ); |
70 | 70 | ||
@@ -189,3 +189,4 @@ void MainWindow::initUI() | |||
189 | 189 | ||
190 | QAction *a = new QAction( tr( "Open..." ), Resource::loadPixmap( "fileopen" ), QString::null, 0, this, 0 ); | 190 | QAction *a = new QAction( tr( "Open..." ), Opie::Core::OResource::loadPixmap( "fileopen", Opie::Core::OResource::SmallIcon ), |
191 | QString::null, 0, this, 0 ); | ||
191 | connect( a, SIGNAL(activated()), this, SLOT(slotTextOpen()) ); | 192 | connect( a, SIGNAL(activated()), this, SLOT(slotTextOpen()) ); |
@@ -193,3 +194,4 @@ void MainWindow::initUI() | |||
193 | 194 | ||
194 | m_actionTextClose = new QAction( tr( "Close" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 195 | m_actionTextClose = new QAction( tr( "Close" ), Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ), |
196 | QString::null, 0, this, 0 ); | ||
195 | connect( m_actionTextClose, SIGNAL(activated()), this, SLOT(slotTextClose()) ); | 197 | connect( m_actionTextClose, SIGNAL(activated()), this, SLOT(slotTextClose()) ); |
@@ -200,3 +202,4 @@ void MainWindow::initUI() | |||
200 | // TODO - need to implent | 202 | // TODO - need to implent |
201 | a = new QAction( tr( "Install..." ), Resource::loadPixmap( "install" ), QString::null, 0, this, 0 ); | 203 | a = new QAction( tr( "Install" ), Opie::Core::OResource::loadPixmap( "install", Opie::Core::OResource::SmallIcon ), |
204 | QString::null, 0, this, 0 ); | ||
202 | a->setEnabled( false ); | 205 | a->setEnabled( false ); |
@@ -210,3 +213,4 @@ void MainWindow::initUI() | |||
210 | 213 | ||
211 | m_actionEditCopy = new QAction( tr( "Copy" ), Resource::loadPixmap( "copy" ), QString::null, 0, this, 0 ); | 214 | m_actionEditCopy = new QAction( tr( "Copy" ), Opie::Core::OResource::loadPixmap( "copy", Opie::Core::OResource::SmallIcon ), |
215 | QString::null, 0, this, 0 ); | ||
212 | connect( m_actionEditCopy, SIGNAL(activated()), this, SLOT(slotEditCopy()) ); | 216 | connect( m_actionEditCopy, SIGNAL(activated()), this, SLOT(slotEditCopy()) ); |
@@ -216,3 +220,4 @@ void MainWindow::initUI() | |||
216 | 220 | ||
217 | a = new QAction( tr( "Configure..." ), Resource::loadPixmap( "SettingsIcon" ), QString::null, 0, this, 0 ); | 221 | a = new QAction( tr( "Configure" ), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), |
222 | QString::null, 0, this, 0 ); | ||
218 | connect( a, SIGNAL(activated()), this, SLOT(slotEditConfigure()) ); | 223 | connect( a, SIGNAL(activated()), this, SLOT(slotEditConfigure()) ); |
@@ -225,3 +230,5 @@ void MainWindow::initUI() | |||
225 | 230 | ||
226 | m_actionBookmarkAdd = new QAction( tr( "Add" ), Resource::loadPixmap( "dagger/bookmarkadd" ), QString::null, 0, this, 0 ); | 231 | m_actionBookmarkAdd = new QAction( tr( "Add" ), |
232 | Opie::Core::OResource::loadPixmap( "dagger/bookmarkadd", Opie::Core::OResource::SmallIcon ), | ||
233 | QString::null, 0, this, 0 ); | ||
227 | connect( m_actionBookmarkAdd, SIGNAL(activated()), this, SLOT(slotBookmarkAdd()) ); | 234 | connect( m_actionBookmarkAdd, SIGNAL(activated()), this, SLOT(slotBookmarkAdd()) ); |
@@ -229,3 +236,5 @@ void MainWindow::initUI() | |||
229 | 236 | ||
230 | m_actionBookmarkRemove = new QAction( tr( "Remove" ), Resource::loadPixmap( "dagger/bookmarkremove" ), QString::null, 0, this, 0 ); | 237 | m_actionBookmarkRemove = new QAction( tr( "Remove" ), |
238 | Opie::Core::OResource::loadPixmap( "dagger/bookmarkremove", Opie::Core::OResource::SmallIcon ), | ||
239 | QString::null, 0, this, 0 ); | ||
231 | connect( m_actionBookmarkRemove, SIGNAL(activated()), this, SLOT(slotBookmarkRemove()) ); | 240 | connect( m_actionBookmarkRemove, SIGNAL(activated()), this, SLOT(slotBookmarkRemove()) ); |