| -rw-r--r-- | noncore/games/solitaire/canvascardwindow.cpp | 120 | ||||
| -rw-r--r-- | noncore/games/solitaire/opie-solitaire.control | 2 |
2 files changed, 66 insertions, 56 deletions
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index 450b4db..e836eb2 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp @@ -20,53 +20,53 @@ #include "canvascardwindow.h" #include "patiencecardgame.h" #include "freecellcardgame.h" #include "chicanecardgame.h" #include "harpcardgame.h" #include "teeclubcardgame.h" #include <qpe/resource.h> #include <qmainwindow.h> #include <qpopupmenu.h> #include <qstyle.h> 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" ) ); // Create Playing Area for Games if ( QPixmap::defaultDepth() < 12 ) { // canvas.setBackgroundColor(QColor(0x51, 0x74, 0x6B)); -// canvas.setBackgroundColor(QColor(0x20, 0xb0, 0x50)); - canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D)); +// canvas.setBackgroundColor(QColor(0x20, 0xb0, 0x50)); + canvas.setBackgroundColor(QColor(0x08, 0x98, 0x2D)); } else { QPixmap bg; - bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither ); + bg.convertFromImage( Resource::loadImage( "table_pattern" ), ThresholdDither ); canvas.setBackgroundPixmap(bg); } #if defined( QT_QWS_CASSIOPEIA ) canvas.setAdvancePeriod(70); #else canvas.setAdvancePeriod(30); #endif #ifdef _PATIENCE_USE_ACCELS_ QPEMenuBar* menu = menuBar(); QPopupMenu* file = new QPopupMenu; file->insertItem(tr("Patience"), this, SLOT(initPatience()), CTRL+Key_F); file->insertItem(tr("Freecell"), this, SLOT(initFreecell()), CTRL+Key_F); file->insertItem(tr("Chicane"), this, SLOT(initChicane()), CTRL+Key_F); file->insertItem(tr("Harp"), this, SLOT(initHarp()), CTRL+Key_F); file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub()), CTRL+Key_F); menu->insertItem(tr("&Game"), file); menu->insertSeparator(); settings = new QPopupMenu; @@ -81,224 +81,234 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) help->insertItem(tr("&About"), this, SLOT(help()), Key_F1); help->setItemChecked(dbf_id, TRUE); menu->insertItem(tr("&Help"),help); #else QMenuBar* menu = menuBar(); QPopupMenu* file = new QPopupMenu; file->insertItem(tr("Patience"), this, SLOT(initPatience())); file->insertItem(tr("Freecell"), this, SLOT(initFreecell())); file->insertItem(tr("Chicane"), this, SLOT(initChicane())); file->insertItem(tr("Harp"), this, SLOT(initHarp())); file->insertItem(tr("Teeclub"), this, SLOT(initTeeclub())); menu->insertItem(tr("Play"), file); menu->insertSeparator(); settings = new QPopupMenu; settings->setCheckable(TRUE); settings->insertItem(tr("Change Card Backs"), this, SLOT(changeCardBacks())); snap_id = settings->insertItem(tr("Snap To Position"), this, SLOT(snapToggle())); QString m; drawId = settings->insertItem(tr("Turn One Card"), this, SLOT(drawnToggle())); menu->insertItem(tr("Settings"),settings); + settings->setCheckable(TRUE); #endif menu->show(); Config cfg( "Patience" ); cfg.setGroup( "GlobalSettings" ); snapOn = cfg.readBoolEntry( "SnapOn", TRUE); settings->setItemChecked(snap_id, snapOn); + gameType = cfg.readNumEntry( "GameType", -1 ); - drawThree = cfg.readBoolEntry( "DrawThree", TRUE); + drawThree = cfg.readBoolEntry( "DrawThree", FALSE); if ( gameType == 0 ) { - cardGame = new PatienceCardGame( &canvas, snapOn, this ); - cardGame->setNumberToDraw(drawThree ? 3 : 1); - setCaption(tr("Patience")); - setCentralWidget(cardGame); - cardGame->readConfig( cfg ); - setCardBacks(); + cardGame = new PatienceCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(drawThree ? 3 : 1); + + setCaption(tr("Patience")); + setCentralWidget(cardGame); + cardGame->readConfig( cfg ); + setCardBacks(); } else if ( gameType == 1 ) { - cardGame = new FreecellCardGame( &canvas, snapOn, this ); - setCaption(tr("Freecell")); - setCentralWidget(cardGame); - //cardGame->newGame(); // Until we know how to handle reading freecell config - cardGame->readConfig( cfg ); - setCardBacks(); + cardGame = new FreecellCardGame( &canvas, snapOn, this ); + setCaption(tr("Freecell")); + setCentralWidget(cardGame); + //cardGame->newGame(); // Until we know how to handle reading freecell config + cardGame->readConfig( cfg ); + setCardBacks(); } else if ( gameType == 2 ) { - cardGame = new ChicaneCardGame( &canvas, snapOn, this ); - cardGame->setNumberToDraw(1); - setCaption(tr("Chicane")); - setCentralWidget(cardGame); - cardGame->readConfig( cfg ); - setCardBacks(); + cardGame = new ChicaneCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(1); + setCaption(tr("Chicane")); + setCentralWidget(cardGame); + cardGame->readConfig( cfg ); + setCardBacks(); } else if ( gameType == 3 ) { - cardGame = new HarpCardGame( &canvas, snapOn, this ); - cardGame->setNumberToDraw(1); - setCaption(tr("Harp")); - setCentralWidget(cardGame); - cardGame->readConfig( cfg ); - setCardBacks(); + cardGame = new HarpCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(1); + setCaption(tr("Harp")); + setCentralWidget(cardGame); + cardGame->readConfig( cfg ); + setCardBacks(); } else if ( gameType == 4 ) { - cardGame = new TeeclubCardGame( &canvas, snapOn, this ); - cardGame->setNumberToDraw(1); - setCaption(tr("Teeclub")); - setCentralWidget(cardGame); - cardGame->readConfig( cfg ); - setCardBacks(); + cardGame = new TeeclubCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(1); + setCaption(tr("Teeclub")); + setCentralWidget(cardGame); + cardGame->readConfig( cfg ); + setCardBacks(); } else { - // Probably there isn't a config file or it is broken - // Start a new game - initPatience(); + // Probably there isn't a config file or it is broken + // Start a new game + initPatience(); } updateDraw(); } CanvasCardWindow::~CanvasCardWindow() { if (cardGame) { - Config cfg("Patience"); - cfg.setGroup( "GlobalSettings" ); - cfg.writeEntry( "GameType", gameType ); - cfg.writeEntry( "SnapOn", snapOn ); - cfg.writeEntry( "DrawThree", drawThree); - cardGame->writeConfig( cfg ); - delete cardGame; + Config cfg("Patience"); + cfg.setGroup( "GlobalSettings" ); + cfg.writeEntry( "GameType", gameType ); + cfg.writeEntry( "SnapOn", snapOn ); + cfg.writeEntry( "DrawThree", drawThree); + cfg.write(); + cardGame->writeConfig( cfg ); + delete cardGame; } } void CanvasCardWindow::resizeEvent(QResizeEvent *) { QSize s = centralWidget()->size(); int fw = style().defaultFrameWidth(); canvas.resize( s.width() - fw - 2, s.height() - fw - 2); } void CanvasCardWindow::initPatience() { // Create New Game if ( cardGame ) - delete cardGame; + delete cardGame; cardGame = new PatienceCardGame( &canvas, snapOn, this ); cardGame->setNumberToDraw(drawThree ? 3 : 1); gameType = 0; setCaption(tr("Patience")); setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); updateDraw(); } void CanvasCardWindow::initFreecell() { // Create New Game if ( cardGame ) { - delete cardGame; + delete cardGame; } cardGame = new FreecellCardGame( &canvas, snapOn, this ); gameType = 1; setCaption(tr("Freecell")); setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); } void CanvasCardWindow::initChicane() { // Create New Game if ( cardGame ) { - delete cardGame; + delete cardGame; } cardGame = new ChicaneCardGame( &canvas, snapOn, this ); cardGame->setNumberToDraw(1); gameType = 2; setCaption(tr("Chicane")); setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); } void CanvasCardWindow::initHarp() { // Create New Game if ( cardGame ) { - delete cardGame; + delete cardGame; } cardGame = new HarpCardGame( &canvas, snapOn, this ); cardGame->setNumberToDraw(1); gameType = 3; setCaption(tr("Harp")); setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); } void CanvasCardWindow::initTeeclub() { // Create New Game if ( cardGame ) { delete cardGame; } cardGame = new TeeclubCardGame( &canvas, snapOn, this ); cardGame->setNumberToDraw(1); gameType = 4; setCaption(tr("Teeclub")); setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); } void CanvasCardWindow::snapToggle() { snapOn = !snapOn; settings->setItemChecked(snap_id, snapOn); cardGame->toggleSnap(); } void CanvasCardWindow::drawnToggle() { + drawThree=!drawThree; + Config cfg( "Patience" ); + cfg.setGroup( "GlobalSettings" ); cardGame->toggleCardsDrawn(); updateDraw(); + cfg.writeEntry( "DrawThree", drawThree); + cfg.write(); } void CanvasCardWindow::updateDraw() { - if(cardGame->cardsDrawn() == 3) - settings->changeItem(drawId, tr("Turn One Card")); - else - settings->changeItem(drawId, tr("Turn Three Cards")); + if(cardGame->cardsDrawn() == 3){ + settings->changeItem(drawId, tr("Turn One Card")); + } else { + settings->changeItem(drawId, tr("Turn Three Cards")); + } } void CanvasCardWindow::setCardBacks() { QCanvasItemList l = canvas.allItems(); for (QCanvasItemList::Iterator it = l.begin(); it != l.end(); ++it) { - if ( (*it)->rtti() == canvasCardId ) - ((CanvasCard *)(*it))->setCardBack( cardBack ); + if ( (*it)->rtti() == canvasCardId ) + ((CanvasCard *)(*it))->setCardBack( cardBack ); } } void CanvasCardWindow::changeCardBacks() { cardBack++; if (cardBack == 5) - cardBack = 0; + cardBack = 0; setCardBacks(); } diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control index f70fefa..4389360 100644 --- a/noncore/games/solitaire/opie-solitaire.control +++ b/noncore/games/solitaire/opie-solitaire.control @@ -1,9 +1,9 @@ -Files: bin/patience apps/Games/patience.desktop pics/cards +Files: bin/patience apps/Games/patience.desktop pics/cards Priority: optional Section: opie/games Maintainer: Martin Imobersteg <imm@gmx.ch> Architecture: arm Version: $QPE_VERSION-$SUB_VERSION Depends: opie-base ($QPE_VERSION) Description: Game: solitaire card games A solitaire game for the Opie environment. |