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 | |||
@@ -26,18 +26,19 @@ | |||
26 | 26 | ||
27 | #include "openetext.h" | 27 | #include "openetext.h" |
28 | #include "output.h" | 28 | #include "output.h" |
29 | 29 | ||
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> |
34 | #include <qpe/config.h> | 36 | #include <qpe/config.h> |
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 | ||
40 | /* QT */ | 41 | /* QT */ |
41 | #include <qregexp.h> | 42 | #include <qregexp.h> |
42 | #include <qregion.h> | 43 | #include <qregion.h> |
43 | #include <qpaintdevicemetrics.h> | 44 | #include <qpaintdevicemetrics.h> |
@@ -284,21 +285,21 @@ void Gutenbrowser::toggleButtonIcons( bool useEm) { | |||
284 | if(useEm) | 285 | if(useEm) |
285 | useEm=TRUE; | 286 | useEm=TRUE; |
286 | pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser"; | 287 | pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser"; |
287 | odebug << "Docdir is "+QPEApplication::documentDir() << oendl; | 288 | odebug << "Docdir is "+QPEApplication::documentDir() << oendl; |
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 | } |
301 | 302 | ||
302 | 303 | ||
303 | bool Gutenbrowser::queryExit() | 304 | bool Gutenbrowser::queryExit() |
304 | { | 305 | { |
@@ -1768,13 +1769,14 @@ void Gutenbrowser::fillWithTitles() { | |||
1768 | temp.setNum(i); | 1769 | temp.setNum(i); |
1769 | config.setGroup( "Files" ); | 1770 | config.setGroup( "Files" ); |
1770 | QString ramble = config.readEntry(temp, "" ); | 1771 | QString ramble = config.readEntry(temp, "" ); |
1771 | config.setGroup( "Titles" ); | 1772 | config.setGroup( "Titles" ); |
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 | } |
1777 | } | 1779 | } |
1778 | 1780 | ||
1779 | void Gutenbrowser::listClickedSlot( QListBoxItem * index) { | 1781 | void Gutenbrowser::listClickedSlot( QListBoxItem * index) { |
1780 | // if( !working) { | 1782 | // if( !working) { |
@@ -1917,13 +1919,14 @@ void Gutenbrowser::menuEditTitle() | |||
1917 | Edit_Title *titleEdit; | 1919 | Edit_Title *titleEdit; |
1918 | titleEdit = new Edit_Title(this,file_title ,TRUE); | 1920 | titleEdit = new Edit_Title(this,file_title ,TRUE); |
1919 | if(titleEdit->exec() !=0) { | 1921 | if(titleEdit->exec() !=0) { |
1920 | //odebug << titleEdit->newTitle << oendl; | 1922 | //odebug << titleEdit->newTitle << oendl; |
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 | } |
1926 | } | 1929 | } |
1927 | 1930 | ||
1928 | // getTitles(); | 1931 | // getTitles(); |
1929 | mainList->triggerUpdate(true); | 1932 | mainList->triggerUpdate(true); |