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 | |||
@@ -23,10 +23,10 @@ file; see the file COPYING. If not, write to the Free Software Foundation, Inc., | |||
23 | #include "textwidget.h" | 23 | #include "textwidget.h" |
24 | 24 | ||
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/oresource.h> | ||
26 | 27 | ||
27 | #include <qpe/qcopenvelope_qws.h> | 28 | #include <qpe/qcopenvelope_qws.h> |
28 | #include <qpe/qpeapplication.h> | 29 | #include <qpe/qpeapplication.h> |
29 | #include <qpe/resource.h> | ||
30 | 30 | ||
31 | #include <qaction.h> | 31 | #include <qaction.h> |
32 | #include <qclipboard.h> | 32 | #include <qclipboard.h> |
@@ -64,9 +64,9 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags /*fl*/ ) | |||
64 | connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); | 64 | connect( &m_tabs, SIGNAL(currentChanged(QWidget *)), this, SLOT( slotTextDisplayed(QWidget *)) ); |
65 | connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); | 65 | connect( &m_autoScrollTimer, SIGNAL(timeout()), this, SLOT(slotNavNextVerse()) ); |
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 | ||
71 | // Load initial configuration | 71 | // Load initial configuration |
72 | QTimer::singleShot( 100, this, SLOT( initConfig() ) ); | 72 | QTimer::singleShot( 100, this, SLOT( initConfig() ) ); |
@@ -187,18 +187,21 @@ void MainWindow::initUI() | |||
187 | // Text menu | 187 | // Text menu |
188 | QPopupMenu *popup = new QPopupMenu( this ); | 188 | QPopupMenu *popup = new QPopupMenu( this ); |
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()) ); |
192 | a->addTo( popup ); | 193 | a->addTo( popup ); |
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()) ); |
196 | m_actionTextClose->addTo( popup ); | 198 | m_actionTextClose->addTo( popup ); |
197 | 199 | ||
198 | popup->insertSeparator(); | 200 | popup->insertSeparator(); |
199 | 201 | ||
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 ); |
203 | connect( a, SIGNAL(activated()), this, SLOT(slotTextInstall()) ); | 206 | connect( a, SIGNAL(activated()), this, SLOT(slotTextInstall()) ); |
204 | a->addTo( popup ); | 207 | a->addTo( popup ); |
@@ -208,13 +211,15 @@ void MainWindow::initUI() | |||
208 | // Edit menu | 211 | // Edit menu |
209 | popup = new QPopupMenu( this ); | 212 | popup = new QPopupMenu( this ); |
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()) ); |
213 | m_actionEditCopy->addTo( popup ); | 217 | m_actionEditCopy->addTo( popup ); |
214 | 218 | ||
215 | popup->insertSeparator(); | 219 | popup->insertSeparator(); |
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()) ); |
219 | a->addTo( popup ); | 224 | a->addTo( popup ); |
220 | 225 | ||
@@ -223,11 +228,15 @@ void MainWindow::initUI() | |||
223 | // Bookmark menu | 228 | // Bookmark menu |
224 | m_bookmarkMenu = new QPopupMenu( this ); | 229 | m_bookmarkMenu = new QPopupMenu( this ); |
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()) ); |
228 | m_actionBookmarkAdd->addTo( m_bookmarkMenu ); | 235 | m_actionBookmarkAdd->addTo( m_bookmarkMenu ); |
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()) ); |
232 | m_actionBookmarkRemove->addTo( m_bookmarkMenu ); | 241 | m_actionBookmarkRemove->addTo( m_bookmarkMenu ); |
233 | 242 | ||