summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowser.cpp27
-rw-r--r--noncore/apps/opie-gutenbrowser/gutenbrowserData.cpp18
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
@@ -20,30 +20,31 @@
#include "gutenbrowser.h"
#include "LibraryDialog.h"
//#include "bookmarksdlg.h"
#include "optionsDialog.h"
#include "helpme.h"
#include "NetworkDialog.h"
#include "openetext.h"
#include "output.h"
/* OPIE */
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
+
#include <qpe/qpeapplication.h>
#include <qpe/fontdatabase.h>
#include <qpe/config.h>
#include <qpe/qcopenvelope_qws.h>
#include <qpe/mimetype.h>
-#include <qpe/resource.h>
#include <qpe/applnk.h>
/* QT */
#include <qregexp.h>
#include <qregion.h>
#include <qpaintdevicemetrics.h>
#include <qvaluelist.h>
#include <qlabel.h>
#include <qclipboard.h>
#include <qpainter.h>
#include <qpalette.h>
#include <qobjectlist.h>
@@ -278,33 +279,33 @@ void Gutenbrowser::goGetit( const QString &url, bool showMsg) {
system(cmd);
}
}
void Gutenbrowser::toggleButtonIcons( bool useEm) {
QString pixDir;
if(useEm)
useEm=TRUE;
pixDir=QPEApplication::qpeDir()+"pics/gutenbrowser";
odebug << "Docdir is "+QPEApplication::documentDir() << oendl;
if( useIcons && QDir( pixDir).exists() ) {
- LibraryButton->setPixmap( Resource::loadPixmap("home") ); //in inline
- OpenButton->setPixmap( Resource::loadPixmap("gutenbrowser/openbook"));
- ForwardButton->setPixmap( Resource::loadPixmap("forward"));//in inline
- BackButton->setPixmap( Resource::loadPixmap("back") );//in inline
- SearchButton->setPixmap( Resource::loadPixmap("gutenbrowser/search") );//in inline
- lastBmkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark_folder"));
- setBookmarkButton->setPixmap( Resource::loadPixmap("gutenbrowser/bookmark") );
- dictionaryButton->setPixmap( Resource::loadPixmap("gutenbrowser/spellcheck") );
- InfoBar->setPixmap( Resource::loadPixmap("gutenbrowser/google"));
+ LibraryButton->setPixmap( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ) );
+ OpenButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon ));
+ ForwardButton->setPixmap( Opie::Core::OResource::loadPixmap("forward", Opie::Core::OResource::SmallIcon ));
+ BackButton->setPixmap( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ) );
+ SearchButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ) );
+ lastBmkButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/bookmark_folder", Opie::Core::OResource::SmallIcon ));
+ setBookmarkButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/bookmark", Opie::Core::OResource::SmallIcon ) );
+ dictionaryButton->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/spellcheck", Opie::Core::OResource::SmallIcon ) );
+ InfoBar->setPixmap( Opie::Core::OResource::loadPixmap("gutenbrowser/google", Opie::Core::OResource::SmallIcon ));
}
}
bool Gutenbrowser::queryExit()
{
int exit=QMessageBox::information(this, "Quit...", "Do your really want to quit?",
QMessageBox::Ok, QMessageBox::Cancel);
if (exit==1) {
writeConfig();
qApp->quit();
} else {
@@ -1762,25 +1763,26 @@ void Gutenbrowser::fillWithTitles() {
Config config("Gutenbrowser");
config.setGroup( "Files" );
int i_numofFiles = config.readNumEntry("NumberOfFiles", 0);
mainList->clear();
QString temp;
for (int i = 1; i <= i_numofFiles; i++) {
temp.setNum(i);
config.setGroup( "Files" );
QString ramble = config.readEntry(temp, "" );
config.setGroup( "Titles" );
temp = config.readEntry(ramble, "");
if( !temp.isEmpty()) {
- mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), temp, -1);
+ mainList->insertItem ( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm",
+ Opie::Core::OResource::SmallIcon ), temp, -1);
}
}
}
void Gutenbrowser::listClickedSlot( QListBoxItem * index) {
// if( !working) {
// working=true;
if(index) {
// QCopEnvelope ( "QPE/System", "busy()" );
title = index->text();
showMainList=FALSE;
mainList->hide();
@@ -1911,25 +1913,26 @@ void Gutenbrowser::menuEditTitle()
QString file_title = config.readEntry( s_filename, "");
//odebug << "file_title is "+file_title << oendl;
if(title_text == file_title ) {
// selFile = s_filename;
//odebug << "Edit: "+ file_title << oendl;
i=i_numofFiles+1;
Edit_Title *titleEdit;
titleEdit = new Edit_Title(this,file_title ,TRUE);
if(titleEdit->exec() !=0) {
//odebug << titleEdit->newTitle << oendl;
config.writeEntry( s_filename, titleEdit->newTitle);
mainList->removeItem(currentItem);
- mainList->insertItem ( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"), titleEdit->newTitle, currentItem);
+ mainList->insertItem ( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm",
+ Opie::Core::OResource::SmallIcon ), titleEdit->newTitle, currentItem);
}
}
}
// getTitles();
mainList->triggerUpdate(true);
}
bool Gutenbrowser::UnZipIt(const QString &zipFile) {
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
@@ -9,24 +9,26 @@
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
***************************************************************************/
//#include "gutenbrowserData.h"
#include "gutenbrowser.h"
#include "multiline_ex.h"
/* OPIE */
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
+
#include <qpe/config.h>
#include <qpe/fontdatabase.h>
#include <qpe/menubutton.h>
#include <qpe/resource.h>
#include <qpe/qpeapplication.h>
/* QT */
#include <qfontinfo.h>
#include <qtoolbutton.h>
void Gutenbrowser::initSlots() {
@@ -162,51 +164,51 @@ qDebug("lease query before leaving the library.");;
// QString tmpTitle=config.readEntry(file_name,"");
}// end initConfig()
void Gutenbrowser::initMenuBar()
{
qDebug("Starting menu init.");
// menuBar entry fileMenu
menubar = new QPEMenuBar(this);
fileMenu=new QPopupMenu();
- fileMenu->insertItem(Resource::loadPixmap("gutenbrowser/openbook"),
+ fileMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/openbook", Opie::Core::OResource::SmallIcon ),
"Open Local Library...", this, SLOT( OpenBtn()) );
// fileMenu->insertItem("Download FTPSite", this, SLOT( downloadFtpList()) );
- fileMenu->insertItem( Resource::loadPixmap("home"),
+ fileMenu->insertItem( Opie::Core::OResource::loadPixmap("home", Opie::Core::OResource::SmallIcon ),
"Download Library Index", this, SLOT( downloadLibIndex()) );
- fileMenu->insertItem( Resource::loadPixmap("quit"),
+ fileMenu->insertItem( Opie::Core::OResource::loadPixmap("quit", Opie::Core::OResource::SmallIcon ),
"Quit Gutenbrowser...", this, SLOT( ByeBye()) );
// menuBar entry editMenu
editMenu=new QPopupMenu();
- editMenu->insertItem(Resource::loadPixmap("up"), "Top",
+ editMenu->insertItem( Opie::Core::OResource::loadPixmap("up", Opie::Core::OResource::SmallIcon ), "Top",
this, SLOT(TopBtn()) );
- editMenu->insertItem( Resource::loadPixmap("back"), "Beginning",
+ editMenu->insertItem( Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon ), "Beginning",
this, SLOT(doBeginBtn()) );
- editMenu->insertItem( Resource::loadPixmap("gutenbrowser/search"), "Search",
+ editMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/search", Opie::Core::OResource::SmallIcon ), "Search",
this, SLOT(SearchBtn()) );
editMenu->insertItem("Clear", this, SLOT(ClearEdit()) );
optionsMenu= new QPopupMenu();
- optionsMenu->insertItem( Resource::loadPixmap("gutenbrowser/configure"),
+ optionsMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/configure", Opie::Core::OResource::SmallIcon ),
"Configure", this, SLOT(doOptions()) );
donateMenu = new QPopupMenu();
// donateMenu->insertItem("Gutenberg", this, SLOT(donateGutenberg()) );
- donateMenu->insertItem( Resource::loadPixmap("gutenbrowser/gutenbrowser_sm"),
+ donateMenu->insertItem( Opie::Core::OResource::loadPixmap("gutenbrowser/gutenbrowser_sm", Opie::Core::OResource::SmallIcon ),
"Gutenbrowser Developer", this, SLOT(infoGutenbrowser()) );
menubar->insertItem("File", fileMenu);
menubar->insertItem("Page", editMenu);
menubar->insertItem("Options", optionsMenu);
// menubar->insertItem("More Info", donateMenu);
menu->addWidget( menubar,0);
topLayout->addLayout( menu, 0);
}