now remembers how many cards to turn

2 files changed, 13 insertions, 3 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
@@ -99,26 +99,29 @@ CanvasCardWindow::CanvasCardWindow(QWidget* parent, const char* name, WFlags f)
     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();
     } else if ( gameType == 1 ) {
 	cardGame = new FreecellCardGame( &canvas, snapOn, this );
@@ -163,12 +166,13 @@ CanvasCardWindow::~CanvasCardWindow()
     if (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;
     }
 }
 
 
@@ -265,22 +269,28 @@ void CanvasCardWindow::snapToggle()
     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) 
+    if(cardGame->cardsDrawn() == 3){
 	settings->changeItem(drawId, tr("Turn One Card"));
-    else 
+    }  else {
 	settings->changeItem(drawId, tr("Turn Three Cards"));
 }
+}
 
 
 void CanvasCardWindow::setCardBacks()
 {
     QCanvasItemList l = canvas.allItems();
 
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