[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE_3_3_BRANCH: kdegames/kpoker
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2004-11-20 19:26:22
Message-ID: 20041120192622.21AE216D12 () office ! kde ! org
[Download RAW message or body]

CVS commit by ingwa: 

Backport fixes for bugs 93635 and 93636.

BUG: 93635
BUG: 93636


  M +11 -0     ChangeLog   1.2.14.3
  M +5 -1      kpoker.cpp   1.70.2.3
  M +2 -0      top.cpp   1.42.2.2


--- kdegames/kpoker/ChangeLog  #1.2.14.2:1.2.14.3
@@ -1,2 +1,13 @@
+2004-11-20  Inge Wallin  <inge@lysator.liu.se>
+
+        Backport fix to bug 93636: When "Fold" is pressed, the current
+        round should be ended immediately.
+        * kpoker.cpp (out): Call drawClick(), i.e. go to next game state,
+        instead of setting up the drawButton to let the user do it.
+
+        Backport fix to bug 93635: The status bar is wrong in many places.
+        * top.cpp (PokerWindow): connect the signal to clear the status
+        bar to the proper slot.
+
 2004-10-01  Inge Wallin  <inge@lysator.liu.se>
 

--- kdegames/kpoker/kpoker.cpp  #1.70.2.2:1.70.2.3
@@ -517,5 +517,9 @@ void kpok::out()
                                - findHumanPlayer()->getCurrentBet());
   paintCash();
-  drawButton->setText(i18n("&Draw"));
+
+  // Go to next state immediately.  (Previously we told the user to
+  // click the action button.)
+  drawClick();
+  //drawButton->setText(i18n("&Draw"));
 }
 

--- kdegames/kpoker/top.cpp  #1.42.2.1:1.42.2.2
@@ -55,4 +55,6 @@ PokerWindow::PokerWindow()
   connect(m_kpok, SIGNAL(showClickToHold(bool)), 
           this,   SLOT(showClickToHold(bool)));
+  connect(m_kpok, SIGNAL(clearStatusBar()), 
+          this,   SLOT(clearStatusBar()));
   connect(m_kpok, SIGNAL(statusBarMessage(QString)), 
           this,   SLOT(statusBarMessage(QString)));


[prev in list] [next in list] [prev in thread] [next in thread]