Diffstat (limited to 'noncore/apps/opie-gutenbrowser/gutenbrowser.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp index 413ab51..e639d4d 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | |||
@@ -30,4 +30,6 @@ | |||
30 | /* OPIE */ | 30 | /* OPIE */ |
31 | #include <opie2/odebug.h> | 31 | #include <opie2/odebug.h> |
32 | #include <opie2/oresource.h> | ||
33 | |||
32 | #include <qpe/qpeapplication.h> | 34 | #include <qpe/qpeapplication.h> |
33 | #include <qpe/fontdatabase.h> | 35 | #include <qpe/fontdatabase.h> |
@@ -35,5 +37,4 @@ | |||
35 | #include <qpe/qcopenvelope_qws.h> | 37 | #include <qpe/qcopenvelope_qws.h> |
36 | #include <qpe/mimetype.h> | 38 | #include <qpe/mimetype.h> |
37 | #include <qpe/resource.h> | ||
38 | #include <qpe/applnk.h> | 39 | #include <qpe/applnk.h> |
39 | 40 | ||
@@ -288,13 +289,13 @@ void Gutenbrowser::toggleButtonIcons( bool useEm) { | |||
288 | 289 | ||
289 | if( useIcons && QDir( pixDir).exists() ) { | 290 | if( useIcons && QDir( pixDir).exists() ) { |
290 | LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline | 291 | LibraryButton->setPixmap( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ) ); |
291 | OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook")); | 292 | OpenButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon )); |
292 | ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline | 293 | ForwardButton->setPixmap( Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon )); |
293 | BackButton->setPixmap( Resource::loadPixmap("back") );//in inline | 294 | BackButton->setPixmap( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ) ); |
294 | SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline | 295 | SearchButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ) ); |
295 | lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder")); | 296 | lastBmkButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/bookmark_folder", Opie::Core::OResource::SmallIcon )); |
296 | setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") ); | 297 | setBookmarkButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/bookmark", Opie::Core::OResource::SmallIcon ) ); |
297 | dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") ); | 298 | dictionaryButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/spellcheck", Opie::Core::OResource::SmallIcon ) ); |
298 | InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google")); | 299 | InfoBar->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/google", Opie::Core::OResource::SmallIcon )); |
299 | } | 300 | } |
300 | } | 301 | } |
@@ -1772,5 +1773,6 @@ void Gutenbrowser::fillWithTitles() { | |||
1772 | temp = config.readEntry(ramble, ""); | 1773 | temp = config.readEntry(ramble, ""); |
1773 | if( !temp.isEmpty()) { | 1774 | if( !temp.isEmpty()) { |
1774 | mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1); | 1775 | mainList->insertItem ( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", |
1776 | Opie::Core::OResource::SmallIcon ), temp, -1); | ||
1775 | } | 1777 | } |
1776 | } | 1778 | } |
@@ -1921,5 +1923,6 @@ void Gutenbrowser::menuEditTitle() | |||
1921 | config.writeEntry( s_filename, titleEdit->newTitle); | 1923 | config.writeEntry( s_filename, titleEdit->newTitle); |
1922 | mainList->removeItem(currentItem); | 1924 | mainList->removeItem(currentItem); |
1923 | mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem); | 1925 | mainList->insertItem ( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", |
1926 | Opie::Core::OResource::SmallIcon ), titleEdit->newTitle, currentItem); | ||
1924 | } | 1927 | } |
1925 | } | 1928 | } |