Diffstat (limited to 'noncore/games/solitaire/canvascardwindow.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/games/solitaire/canvascardwindow.cpp | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/noncore/games/solitaire/canvascardwindow.cpp b/noncore/games/solitaire/canvascardwindow.cpp index 4c365a5..e1c021e 100644 --- a/noncore/games/solitaire/canvascardwindow.cpp +++ b/noncore/games/solitaire/canvascardwindow.cpp @@ -18,12 +18,14 @@ ** **********************************************************************/ #include "canvascardwindow.h" #include "patiencecardgame.h" #include "freecellcardgame.h" +#include "chicanecardgame.h" +#include "harpcardgame.h" #include <qpe/resource.h> #include <qmainwindow.h> #include <qpopupmenu.h> #include <qstyle.h> @@ -56,12 +58,14 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) #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); menu->insertItem(tr("&Game"), file); menu->insertSeparator(); settings = new QPopupMenu; settings->insertItem(tr("&Change Card Backs"), this, SLOT(changeCardBacks()), Key_F2); @@ -78,12 +82,14 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) #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())); menu->insertItem(tr("Play"), file); menu->insertSeparator(); settings = new QPopupMenu; settings->setCheckable(TRUE); @@ -115,12 +121,28 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f) 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->newGame(); // Until we know how to handle reading freecell config + cardGame->readConfig( cfg ); + setCardBacks(); + } else if ( gameType == 3 ) { + cardGame = new HarpCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(1); + setCaption(tr("Harp")); + setCentralWidget(cardGame); + //cardGame->newGame(); // Until we know how to handle reading freecell config + cardGame->readConfig( cfg ); + setCardBacks(); } else { // Probably there isn't a config file or it is broken // Start a new game initPatience(); } @@ -178,12 +200,43 @@ void CanvasCardWindow::initFreecell() setCentralWidget(cardGame); cardGame->newGame(); setCardBacks(); } +void CanvasCardWindow::initChicane() +{ + // Create New Game + if ( 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; + } + cardGame = new HarpCardGame( &canvas, snapOn, this ); + cardGame->setNumberToDraw(1); + gameType = 3; + setCaption(tr("Harp")); + setCentralWidget(cardGame); + cardGame->newGame(); + setCardBacks(); +} + + void CanvasCardWindow::snapToggle() { snapOn = !snapOn; settings->setItemChecked(snap_id, snapOn); cardGame->toggleSnap(); } |