author | drw <drw> | 2005-05-16 18:39:16 (UTC) |
---|---|---|
committer | drw <drw> | 2005-05-16 18:39:16 (UTC) |
commit | 17b9be61d7de14dea0d662a496e3d08bc9b1662e (patch) (unidiff) | |
tree | b7f5edc5f48ac3f342530a29f91a397f72d6d0e2 /noncore/apps | |
parent | 1a6137e3182a1b6974b64e22017207c32f9d4f7c (diff) | |
download | opie-17b9be61d7de14dea0d662a496e3d08bc9b1662e.zip opie-17b9be61d7de14dea0d662a496e3d08bc9b1662e.tar.gz opie-17b9be61d7de14dea0d662a496e3d08bc9b1662e.tar.bz2 |
Resource -> OResource
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowser.cpp | 27 | ||||
-rw-r--r-- | noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | 18 |
2 files changed, 25 insertions, 20 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 | |||
@@ -28,14 +28,15 @@ | |||
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> |
@@ -286,17 +287,17 @@ void Gutenbrowser::toggleButtonIcons( bool useEm) { | |||
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 | ||
@@ -1770,9 +1771,10 @@ void Gutenbrowser::fillWithTitles() { | |||
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 | ||
@@ -1919,9 +1921,10 @@ void Gutenbrowser::menuEditTitle() | |||
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 | ||
diff --git a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp index c93dbc5..d384c09 100644 --- a/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp +++ b/noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp | |||
@@ -17,8 +17,10 @@ | |||
17 | #include "multiline_ex.h" | 17 | #include "multiline_ex.h" |
18 | 18 | ||
19 | /* OPIE */ | 19 | /* OPIE */ |
20 | #include <opie2/odebug.h> | 20 | #include <opie2/odebug.h> |
21 | #include <opie2/oresource.h> | ||
22 | |||
21 | #include <qpe/config.h> | 23 | #include <qpe/config.h> |
22 | #include <qpe/fontdatabase.h> | 24 | #include <qpe/fontdatabase.h> |
23 | #include <qpe/menubutton.h> | 25 | #include <qpe/menubutton.h> |
24 | #include <qpe/resource.h> | 26 | #include <qpe/resource.h> |
@@ -170,35 +172,35 @@ void Gutenbrowser::initMenuBar() | |||
170 | // menuBar entry fileMenu | 172 | // menuBar entry fileMenu |
171 | menubar = new QPEMenuBar(this); | 173 | menubar = new QPEMenuBar(this); |
172 | 174 | ||
173 | fileMenu=new QPopupMenu(); | 175 | fileMenu=new QPopupMenu(); |
174 | fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"), | 176 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon ), |
175 | "Open Local Library...", this, SLOT( OpenBtn()) ); | 177 | "Open Local Library...", this, SLOT( OpenBtn()) ); |
176 | // fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) ); | 178 | // fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) ); |
177 | fileMenu->insertItem( Resource::loadPixmap("home"), | 179 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ), |
178 | "Download Library Index", this, SLOT( downloadLibIndex()) ); | 180 | "Download Library Index", this, SLOT( downloadLibIndex()) ); |
179 | fileMenu->insertItem( Resource::loadPixmap("quit"), | 181 | fileMenu->insertItem( Opie::Core::OResource::loadPixmap("quit", Opie::Core::OResource::SmallIcon ), |
180 | "Quit Gutenbrowser...", this, SLOT( ByeBye()) ); | 182 | "Quit Gutenbrowser...", this, SLOT( ByeBye()) ); |
181 | // menuBar entry editMenu | 183 | // menuBar entry editMenu |
182 | 184 | ||
183 | editMenu=new QPopupMenu(); | 185 | editMenu=new QPopupMenu(); |
184 | 186 | ||
185 | editMenu->insertItem(Resource::loadPixmap("up"), "Top", | 187 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon ), "Top", |
186 | this, SLOT(TopBtn()) ); | 188 | this, SLOT(TopBtn()) ); |
187 | editMenu->insertItem( Resource::loadPixmap("back"), "Beginning", | 189 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ), "Beginning", |
188 | this, SLOT(doBeginBtn()) ); | 190 | this, SLOT(doBeginBtn()) ); |
189 | editMenu->insertItem( Resource::loadPixmap("gutenbrowser/search"), "Search", | 191 | editMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ), "Search", |
190 | this, SLOT(SearchBtn()) ); | 192 | this, SLOT(SearchBtn()) ); |
191 | 193 | ||
192 | editMenu->insertItem("Clear", this, SLOT(ClearEdit()) ); | 194 | editMenu->insertItem("Clear", this, SLOT(ClearEdit()) ); |
193 | 195 | ||
194 | optionsMenu= new QPopupMenu(); | 196 | optionsMenu= new QPopupMenu(); |
195 | optionsMenu->insertItem( Resource::loadPixmap("gutenbrowser/configure"), | 197 | optionsMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/configure", Opie::Core::OResource::SmallIcon ), |
196 | "Configure", this, SLOT(doOptions()) ); | 198 | "Configure", this, SLOT(doOptions()) ); |
197 | 199 | ||
198 | donateMenu = new QPopupMenu(); | 200 | donateMenu = new QPopupMenu(); |
199 | // donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) ); | 201 | // donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) ); |
200 | donateMenu->insertItem( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), | 202 | donateMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", Opie::Core::OResource::SmallIcon ), |
201 | "Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) ); | 203 | "Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) ); |
202 | 204 | ||
203 | menubar->insertItem("File", fileMenu); | 205 | menubar->insertItem("File", fileMenu); |
204 | menubar->insertItem("Page", editMenu); | 206 | menubar->insertItem("Page", editMenu); |