From afb929e7fd04ecdfec2799a5cf9cf298d1af77c6 Mon Sep 17 00:00:00 2001 From: drw Date: Sat, 21 May 2005 20:11:55 +0000 Subject: Resource -> OResource --- (limited to 'noncore/games') diff --git a/noncore/games/backgammon/backgammon.cpp b/noncore/games/backgammon/backgammon.cpp index c286a36..31835f8 100644 --- a/noncore/games/backgammon/backgammon.cpp +++ b/noncore/games/backgammon/backgammon.cpp @@ -7,9 +7,9 @@ /* OPIE */ #include +#include #include #include -#include using namespace Opie::Core; /* QT */ @@ -27,7 +27,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) { if (!name) setName("BackGammon"); setCaption(tr( "Backgammon") ); - setIcon( Resource::loadPixmap( "backgammon" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "backgammon" ) ); //general counter varaible int a=0; //the game engine @@ -169,13 +169,13 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) //the pieces p1=new CanvasImageItem*[15]; p1_side=new CanvasImageItem*[15]; - QImage piece_1_all(Resource::loadImage("backgammon/pieces/"+piecesA_name)); + QImage piece_1_all(Opie::Core::OResource::loadImage("backgammon/pieces/"+piecesA_name)); QImage piece_1_front=piece_1_all.copy(0,0,15,15); QImage piece_1_side=piece_1_all.copy(0,15,15,5); p2=new CanvasImageItem*[15]; p2_side=new CanvasImageItem*[15]; - QImage piece_2_all(Resource::loadImage("backgammon/pieces/"+piecesB_name)); + QImage piece_2_all(Opie::Core::OResource::loadImage("backgammon/pieces/"+piecesB_name)); QImage piece_2_front=piece_2_all.copy(0,0,15,15); QImage piece_2_side=piece_2_all.copy(0,15,15,5); @@ -195,13 +195,13 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) draw(); //the dice - QImage dicebgA_all(Resource::loadImage("backgammon/dice/"+diceA_name)); + QImage dicebgA_all(Opie::Core::OResource::loadImage("backgammon/dice/"+diceA_name)); diceA1=new CanvasImageItem*[7]; diceA2=new CanvasImageItem*[7]; - QImage dicebgB_all(Resource::loadImage("backgammon/dice/"+diceB_name)); + QImage dicebgB_all(Opie::Core::OResource::loadImage("backgammon/dice/"+diceB_name)); diceB1=new CanvasImageItem*[7]; diceB2=new CanvasImageItem*[7]; - QImage oddsbg_all=(Resource::loadImage("backgammon/odds/"+odds_name)); + QImage oddsbg_all=(Opie::Core::OResource::loadImage("backgammon/odds/"+odds_name)); //oddsDice=new CanvasImageItem*[6]; @@ -247,7 +247,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) //oddsDice[0]->show(); //set the board - QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name)); + QImage boardbg(Opie::Core::OResource::loadImage("backgammon/boards/"+board_name)); board=new CanvasImageItem(boardbg,area); board->setX(0); board->setY(0); @@ -256,7 +256,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) board->show(); //the table - QImage tablebg(Resource::loadImage("backgammon/table/"+table_name)); + QImage tablebg(Opie::Core::OResource::loadImage("backgammon/table/"+table_name)); table=new CanvasImageItem(tablebg,area); table->setX(0); table->setY(200-2); @@ -265,7 +265,7 @@ BackGammon::BackGammon(QWidget* parent, const char* name, WFlags fl) table->show(); //the no move marker - QImage nomovebg(Resource::loadImage("backgammon/no_move")); + QImage nomovebg(Opie::Core::OResource::loadImage("backgammon/no_move")); nomove_marker=new CanvasImageItem(nomovebg,area); nomove_marker->setX(0); nomove_marker->setY(200); @@ -924,17 +924,17 @@ void BackGammon::autoroll_dice2() void BackGammon::applytheme() { - QImage boardbg(Resource::loadImage("backgammon/boards/"+board_name)); + QImage boardbg(Opie::Core::OResource::loadImage("backgammon/boards/"+board_name)); board->setImage(boardbg); - QImage tablebg(Resource::loadImage("backgammon/table/"+table_name)); + QImage tablebg(Opie::Core::OResource::loadImage("backgammon/table/"+table_name)); table->setImage(tablebg); - QImage piece_1_all(Resource::loadImage("backgammon/pieces/"+piecesA_name)); + QImage piece_1_all(Opie::Core::OResource::loadImage("backgammon/pieces/"+piecesA_name)); QImage piece_1_front=piece_1_all.copy(0,0,15,15); QImage piece_1_side=piece_1_all.copy(0,15,15,5); - QImage piece_2_all(Resource::loadImage("backgammon/pieces/"+piecesB_name)); + QImage piece_2_all(Opie::Core::OResource::loadImage("backgammon/pieces/"+piecesB_name)); QImage piece_2_front=piece_2_all.copy(0,0,15,15); QImage piece_2_side=piece_2_all.copy(0,15,15,5); @@ -949,9 +949,9 @@ void BackGammon::applytheme() } draw(); - QImage dicebgA_all(Resource::loadImage("backgammon/dice/"+diceA_name)); - QImage dicebgB_all(Resource::loadImage("backgammon/dice/"+diceB_name)); - QImage oddsbg_all=(Resource::loadImage("backgammon/odds/"+odds_name)); + QImage dicebgA_all(Opie::Core::OResource::loadImage("backgammon/dice/"+diceA_name)); + QImage dicebgB_all(Opie::Core::OResource::loadImage("backgammon/dice/"+diceB_name)); + QImage oddsbg_all=(Opie::Core::OResource::loadImage("backgammon/odds/"+odds_name)); for(a=0;a<7;a++) { diff --git a/noncore/games/fifteen/fifteen.cpp b/noncore/games/fifteen/fifteen.cpp index bb57ee1..c41c0a4 100644 --- a/noncore/games/fifteen/fifteen.cpp +++ b/noncore/games/fifteen/fifteen.cpp @@ -23,8 +23,8 @@ #include "fifteenconfigdialog.h" #include +#include -#include #include #include @@ -52,6 +52,7 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f QMenuBar *menubar = new QMenuBar( toolbar ); menubar->setMargin(0); QPopupMenu *game = new QPopupMenu( this ); + menubar->insertItem( tr( "Game" ), game ); QWidget *spacer = new QWidget( toolbar ); spacer->setBackgroundMode( PaletteButton ); @@ -65,26 +66,17 @@ FifteenMainWindow::FifteenMainWindow(QWidget *parent, const char* name, WFlags f - QAction *a = new QAction( tr( "Randomize" ), Resource::loadPixmap( "new" ), + QAction *a = new QAction( tr( "Randomize" ), Opie::Core::OResource::loadPixmap( "new", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated() ), table, SLOT( slotRandomize() ) ); a->addTo( game ); a->addTo( toolbar ); - a = new QAction( tr("Configure"), Resource::loadPixmap( "SettingsIcon" ), + a = new QAction( tr("Configure"), Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ), QString::null, 0, this, 0 ); connect( a, SIGNAL( activated()), table, SLOT( slotConfigure()) ); a->addTo( game ); - - /* This is pointless and confusing. - a = new QAction( tr( "Solve" ), Resource::loadIconSet( "repeat" ), - QString::null, 0, this, 0 ); - connect( a, SIGNAL( activated() ), table, SLOT( slotReset() ) ); - a->addTo( game ); - a->addTo( toolbar ); - */ - menubar->insertItem( tr( "Game" ), game ); } diff --git a/noncore/games/mindbreaker/config.in b/noncore/games/mindbreaker/config.in index b97a9e8..e3c0812 100644 --- a/noncore/games/mindbreaker/config.in +++ b/noncore/games/mindbreaker/config.in @@ -1,4 +1,4 @@ config MINDBREAKER boolean "opie-mindbreaker (crack the coloured code)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE diff --git a/noncore/games/mindbreaker/mindbreaker.cpp b/noncore/games/mindbreaker/mindbreaker.cpp index 1f554d2..aa4afd7 100644 --- a/noncore/games/mindbreaker/mindbreaker.cpp +++ b/noncore/games/mindbreaker/mindbreaker.cpp @@ -20,7 +20,8 @@ #include "mindbreaker.h" -#include +#include + #include #include #include @@ -139,7 +140,7 @@ QVector Peg::specialPegs; void Peg::buildImages() { - QImage pegs = Resource::loadImage("mindbreaker/pegs"); + QImage pegs = Opie::Core::OResource::loadImage("mindbreaker/pegs"); int x = 0; int y = 0; int i; @@ -157,7 +158,7 @@ void Peg::buildImages() x += peg_size; } - QImage image = Resource::loadImage("mindbreaker/mindbreaker"); + QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); /* copy from master image to functional images */ x = 0; y = panel_height; @@ -289,9 +290,9 @@ MindBreaker::MindBreaker( QWidget *parent, const char *name, int wFlags ) QToolBar *tb = new QToolBar(this); tb->setHorizontalStretchable( TRUE ); - QIconSet newicon = Resource::loadIconSet("new"); - new QToolButton(newicon, tr("New Game"), 0, - board, SLOT(clear()), tb, "NewGame"); + QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), tr("New Game"), 0, + board, SLOT(clear()), tb, "NewGame"); + btn->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); score = new QToolButton(tb); score->setText(""); @@ -483,7 +484,7 @@ void MindBreakerBoard::doFixSize() canvas()->resize(s.width() - fw, s.height() - fw); Peg::buildImages(); // must be done BEFORE any pegs are made - QImage image = Resource::loadImage("mindbreaker/mindbreaker"); + QImage image = Opie::Core::OResource::loadImage("mindbreaker/mindbreaker"); /* copy from master image to functional images */ int x = 0; diff --git a/noncore/games/mindbreaker/opie-mindbreaker.control b/noncore/games/mindbreaker/opie-mindbreaker.control index 5b342da..d3826fd 100644 --- a/noncore/games/mindbreaker/opie-mindbreaker.control +++ b/noncore/games/mindbreaker/opie-mindbreaker.control @@ -4,7 +4,7 @@ Priority: optional Section: opie/games Maintainer: Martin Imobersteg Architecture: arm -Depends: task-opie-minimal +Depends: task-opie-minimal, libopiecore2 Description: Game: crack the coloured code A game for the Opie environment. Version: $QPE_VERSION$EXTRAVERSION diff --git a/noncore/games/minesweep/minesweep.cpp b/noncore/games/minesweep/minesweep.cpp index c14609d..18449ff 100644 --- a/noncore/games/minesweep/minesweep.cpp +++ b/noncore/games/minesweep/minesweep.cpp @@ -21,8 +21,9 @@ #include "minesweep.h" #include "minefield.h" +#include + #include -#include #include #include @@ -242,7 +243,7 @@ MineSweep::MineSweep( QWidget* parent, const char* name, WFlags f ) srand(::time(0)); setCaption( tr("Mine Sweep") ); QPEApplication::setInputMethodHint(this, QPEApplication::AlwaysOff ); - setIcon( Resource::loadPixmap( "minesweep/MineSweep" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "minesweep/MineSweep" ) ); QToolBar *toolBar = new QToolBar( this ); toolBar->setHorizontalStretchable( TRUE ); diff --git a/noncore/games/parashoot/base.cpp b/noncore/games/parashoot/base.cpp index 5f3c79d..f232536 100644 --- a/noncore/games/parashoot/base.cpp +++ b/noncore/games/parashoot/base.cpp @@ -20,8 +20,7 @@ #include "codes.h" #include "base.h" -#include - +#include int damage; @@ -31,7 +30,7 @@ Base::Base(QCanvas* canvas) : ohdear("crmble01") { basearray = new QCanvasPixmapArray(); - QString b0 = Resource::findPixmap("parashoot/b0001"); + QString b0 = Opie::Core::OResource::findPixmap("parashoot/b0001"); b0.replace(QRegExp("0001"),"%1"); basearray->readPixmaps(b0, 4); setSequence(basearray); diff --git a/noncore/games/parashoot/bullet.cpp b/noncore/games/parashoot/bullet.cpp index 584f564..1f02251 100644 --- a/noncore/games/parashoot/bullet.cpp +++ b/noncore/games/parashoot/bullet.cpp @@ -23,7 +23,8 @@ #include "man.h" #include "helicopter.h" -#include +#include + #include @@ -35,7 +36,7 @@ Bullet::Bullet(QCanvas* canvas, double angle, int cannonx, int cannony) : QCanvasSprite(0, canvas), bang("collide01") { - QCanvasPixmapArray* bulletarray = new QCanvasPixmapArray(Resource::findPixmap("parashoot/bullet")); + QCanvasPixmapArray* bulletarray = new QCanvasPixmapArray(Opie::Core::OResource::findPixmap("parashoot/bullet")); setSequence(bulletarray); if (nobullets < limit) { nobullets++; diff --git a/noncore/games/parashoot/cannon.cpp b/noncore/games/parashoot/cannon.cpp index 330d850..2f4c353 100644 --- a/noncore/games/parashoot/cannon.cpp +++ b/noncore/games/parashoot/cannon.cpp @@ -18,8 +18,7 @@ ** **********************************************************************/ -#include - +#include #include "codes.h" #include "cannon.h" @@ -32,7 +31,7 @@ shotsfired=0; cannonx = 0; cannony = 0; cannonarray = new QCanvasPixmapArray(); - QString c0 = Resource::findPixmap("parashoot/can0001"); + QString c0 = Opie::Core::OResource::findPixmap("parashoot/can0001"); c0.replace(QRegExp("0001"),"%1"); cannonarray->readPixmaps(c0,17); setSequence(cannonarray); diff --git a/noncore/games/parashoot/helicopter.cpp b/noncore/games/parashoot/helicopter.cpp index 7d91cd1..42adc34 100644 --- a/noncore/games/parashoot/helicopter.cpp +++ b/noncore/games/parashoot/helicopter.cpp @@ -22,7 +22,7 @@ #include "man.h" #include "codes.h" -#include +#include static QList all; @@ -34,7 +34,7 @@ Helicopter::Helicopter(QCanvas* canvas) : all.append(this); hits = 0; QCanvasPixmapArray* helicopterarray = new QCanvasPixmapArray(); - QString h0 = Resource::findPixmap("parashoot/helicopter0001"); + QString h0 = Opie::Core::OResource::findPixmap("parashoot/helicopter0001"); h0.replace(QRegExp("0001"),"%1"); helicopterarray->readPixmaps(h0,4 ); diff --git a/noncore/games/parashoot/interface.cpp b/noncore/games/parashoot/interface.cpp index 5c9b0ef..8ec7032 100644 --- a/noncore/games/parashoot/interface.cpp +++ b/noncore/games/parashoot/interface.cpp @@ -21,8 +21,9 @@ #include "interface.h" #include "man.h" +#include + #include -#include #include #include @@ -52,8 +53,9 @@ ParaShoot::ParaShoot(QWidget* parent, const char* name, WFlags f) : toolbar->setHorizontalStretchable( TRUE ); setCaption( tr("ParaShoot") ); - new QToolButton( Resource::loadIconSet("new"), tr("New Game"), 0, - this, SLOT(newGame()), toolbar, "New Game"); + QToolButton *btn = new QToolButton( Opie::Core::OResource::loadPixmap("new", Opie::Core::OResource::SmallIcon), + tr("New Game"), 0, this, SLOT(newGame()), toolbar, "New Game"); + btn->setUsesBigPixmap( qApp->desktop()->size().width() > 330 ); levelscore = new QLabel(toolbar); levelscore->setBackgroundMode( PaletteButton ); @@ -79,7 +81,7 @@ void ParaShoot::resizeEvent(QResizeEvent *) int fw = style().defaultFrameWidth(); canvas.resize( s.width() - fw - 2, s.height() - fw - 2); - QImage bgimage = Resource::loadImage("parashoot/sky"); + QImage bgimage = Opie::Core::OResource::loadImage("parashoot/sky"); QPixmap bgpixmap; bgpixmap.convertFromImage(bgimage.smoothScale(canvas.width(), diff --git a/noncore/games/parashoot/man.cpp b/noncore/games/parashoot/man.cpp index 0a151b0..080615e 100644 --- a/noncore/games/parashoot/man.cpp +++ b/noncore/games/parashoot/man.cpp @@ -22,8 +22,7 @@ #include "man.h" #include "base.h" -#include - +#include int mancount; @@ -32,7 +31,7 @@ Man::Man(QCanvas* canvas) : splat("lose") // No tr { manarray = new QCanvasPixmapArray(); - QString m0 = Resource::findPixmap("parashoot/man0001"); + QString m0 = Opie::Core::OResource::findPixmap("parashoot/man0001"); m0.replace(QRegExp("0001"),"%1"); manarray->readPixmaps(m0, 7); setSequence(manarray); @@ -47,7 +46,7 @@ Man::Man(QCanvas* canvas, int x, int y) : splat("bang") // No tr { manarray = new QCanvasPixmapArray(); - QString m0 = Resource::findPixmap("parashoot/man0001"); + QString m0 = Opie::Core::OResource::findPixmap("parashoot/man0001"); m0.replace(QString("0001"),"%1"); manarray->readPixmaps(m0, 7); setSequence(manarray); diff --git a/noncore/games/solitaire/canvascard.cpp b/noncore/games/solitaire/canvascard.cpp index c36da6c..cd298ef 100644 --- a/noncore/games/solitaire/canvascard.cpp +++ b/noncore/games/solitaire/canvascard.cpp @@ -20,7 +20,7 @@ #include "canvascard.h" -#include +#include #include // Needed to get the device's width @@ -99,15 +99,19 @@ CanvasCard::CanvasCard( eValue v, eSuit s, bool f, QCanvas *canvas ) : { if ( !cardsFaces ) { if ( qt_screen->deviceWidth() < 200 ) { - cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face_small" ) ); - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) ); - cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars_small" ) ); - cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits_small" ) ); + cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face_small" ) ); + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) ); + cardsChars = new QBitmap(); + *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars_small" ); + cardsSuits = new QBitmap(); + *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits_small" ); } else { - cardsFaces = new QPixmap( Resource::loadPixmap( "cards/card_face" ) ); - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); - cardsChars = new QBitmap( Resource::loadBitmap( "cards/card_chars" ) ); - cardsSuits = new QBitmap( Resource::loadBitmap( "cards/card_suits" ) ); + cardsFaces = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_face" ) ); + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) ); + cardsChars = new QBitmap(); + *cardsChars = Opie::Core::OResource::loadPixmap( "cards/card_chars" ); + cardsSuits = new QBitmap(); + *cardsSuits = Opie::Core::OResource::loadPixmap( "cards/card_suits" ); } cardsCharsUpsideDown = Create180RotatedBitmap( cardsChars ); cardsSuitsUpsideDown = Create180RotatedBitmap( cardsSuits ); @@ -132,28 +136,28 @@ void CanvasCard::setCardBack(int b) if ( qt_screen->deviceWidth() < 200 ) { switch (cardBack) { case 0: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001_small" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001_small" ) ); break; case 1: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002_small" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002_small" ) ); break; case 2: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003_small" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003_small" ) ); break; case 3: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004_small" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004_small" ) ); break; case 4: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005_small" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005_small" ) ); break; } } else { switch (cardBack) { case 0: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0001" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0001" ) ); break; case 1: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0002" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0002" ) ); break; case 2: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0003" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0003" ) ); break; case 3: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0004" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0004" ) ); break; case 4: - cardsBacks = new QPixmap( Resource::loadPixmap( "cards/card_back0005" ) ); break; + cardsBacks = new QPixmap( Opie::Core::OResource::loadPixmap( "cards/card_back0005" ) ); break; } } @@ -181,17 +185,8 @@ void CanvasCard::draw(QPainter &painter) if ( isFacing() ) { -/* - // Now add the joker and card backs to the list of pixmaps - QPixmap *CardsBack = new QPixmap( Resource::loadPixmap( "cards/card_joker.png" ) ); - QPoint *newBackHotspot = new QPoint( 0, 0 ); - pixmaps->append((const QPixmap *)CardsBack); - hotspots->append((const QPoint *)newBackHotspot); -*/ - int w = cardsFaces->width(), h = cardsFaces->height(); -// p->setBrush( NoBrush ); p->setBrush( QColor( 0xFF, 0xFF, 0xFF ) ); if ( isRed() == TRUE ) diff --git a/noncore/games/solitaire/canvascardgame.h b/noncore/games/solitaire/canvascardgame.h index b93cfbf..c559a90 100644 --- a/noncore/games/solitaire/canvascardgame.h +++ b/noncore/games/solitaire/canvascardgame.h @@ -24,7 +24,6 @@ #include "canvasshapes.h" #include "canvascard.h" -#include #include #include diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index 503bc92..956c5bd 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp @@ -24,14 +24,13 @@ #include "harpcardgame.h" #include "teeclubcardgame.h" - - +#include CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) : QMainWindow(parent, name, f), canvas(230, 260), snapOn(TRUE), cardBack(4), gameType(0), cardGame(NULL) { - setIcon( Resource::loadPixmap( "cards" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "cards" ) ); setCaption(tr("Patience")); // Create Playing Area for Games @@ -41,7 +40,7 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D)); } else { QPixmap bg; - bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither ); + bg.convertFromImage( Opie::Core::OResource::loadImage( "table_pattern" ), ThresholdDither ); canvas.setBackgroundPixmap(bg); } diff --git a/noncore/games/tetrix/qtetrix.cpp b/noncore/games/tetrix/qtetrix.cpp index a6a5f34..d949176 100644 --- a/noncore/games/tetrix/qtetrix.cpp +++ b/noncore/games/tetrix/qtetrix.cpp @@ -21,7 +21,7 @@ #include "qtetrix.h" -#include +#include #include #include @@ -97,7 +97,7 @@ void ShowNextPiece::drawNextSquare(int x, int y,QColor *color) QTetrix::QTetrix( QWidget *parent, const char *name, WFlags f ) : QMainWindow( parent, name, f ) { - setIcon( Resource::loadPixmap( "tetrix_icon" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "tetrix_icon" ) ); setCaption( tr("Tetrix" ) ); QTime t = QTime::currentTime(); diff --git a/noncore/games/wordgame/wordgame.cpp b/noncore/games/wordgame/wordgame.cpp index 47d6725..52e2be2 100644 --- a/noncore/games/wordgame/wordgame.cpp +++ b/noncore/games/wordgame/wordgame.cpp @@ -21,8 +21,9 @@ #include "wordgame.h" +#include + #include -#include #include #include @@ -118,7 +119,7 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) : tile_btweak = 0; } - setIcon( Resource::loadPixmap( "wordgame/WordGame.png" ) ); + setIcon( Opie::Core::OResource::loadPixmap( "wordgame/WordGame" ) ); setCaption( tr("Word Game") ); setToolBarsMovable( FALSE ); @@ -127,11 +128,18 @@ WordGame::WordGame( QWidget* parent, const char* name, WFlags fl ) : setCentralWidget(vbox); toolbar = new QToolBar(this); addToolBar(toolbar, Bottom); - reset = new QToolButton(Resource::loadPixmap("back"), tr("Back"), "", this, SLOT(resetTurn()), toolbar); - done = new QToolButton(Resource::loadPixmap("done"), tr("Done"), "", this, SLOT(endTurn()), toolbar); + bool useBigIcon = qApp->desktop()->size().width() > 330; + reset = new QToolButton(Opie::Core::OResource::loadPixmap("back", Opie::Core::OResource::SmallIcon), + tr("Back"), "", this, SLOT(resetTurn()), toolbar); + reset->setUsesBigPixmap( useBigIcon ); + done = new QToolButton(Opie::Core::OResource::loadPixmap("done", Opie::Core::OResource::SmallIcon), + tr("Done"), "", this, SLOT(endTurn()), toolbar); + done->setUsesBigPixmap( useBigIcon ); scoreinfo = new ScoreInfo(toolbar); scoreinfo->setFont(QFont("Helvetica",10)); - new QToolButton(Resource::loadPixmap("finish"), tr("Close"), "", this, SLOT(endGame()), toolbar); + QToolButton *btn = new QToolButton(Opie::Core::OResource::loadPixmap("finish", Opie::Core::OResource::SmallIcon), + tr("Close"), "", this, SLOT(endGame()), toolbar); + btn->setUsesBigPixmap( useBigIcon ); toolbar->setStretchableWidget(scoreinfo); cpu = 0; @@ -305,7 +313,7 @@ bool WordGame::loadRules(const QString &name) if ( re++ < 10 ) ts >> e; } - QImage shim = Resource::loadImage("wordgame/wordgame_shapes"); + QImage shim = Opie::Core::OResource::loadImage("wordgame/wordgame_shapes"); shim = shim.smoothScale((re-1)*TileItem::smallWidth(),TileItem::smallHeight()); QPixmap bgshapes; bgshapes.convertFromImage(shim); @@ -1362,7 +1370,7 @@ void Rack::contentsMouseMoveEvent(QMouseEvent* e) } } -void Rack::contentsMouseReleaseEvent(QMouseEvent* e) +void Rack::contentsMouseReleaseEvent(QMouseEvent* /*e*/) { if ( computerized() ) return; diff --git a/noncore/games/zlines/ballpainter.cpp b/noncore/games/zlines/ballpainter.cpp index 622ec29..e7596c4 100644 --- a/noncore/games/zlines/ballpainter.cpp +++ b/noncore/games/zlines/ballpainter.cpp @@ -17,7 +17,7 @@ * * ***************************************************************************/ -#include +#include #include "ballpainter.h" //#include "shotcounter.h" @@ -59,7 +59,7 @@ QPixmap* BallPainter::pixmap( enum Pixmaps pix ) break; } - return new QPixmap(Resource::loadPixmap(name) ); + return new QPixmap(Opie::Core::OResource::loadPixmap(name) ); } void BallPainter::createPixmap() -- cgit v0.9.0.2