Changeset 154

Timestamp:

09/22/2008 06:58:33 PM (3 years ago)

Author:

guyru

Message:

display the number of rolls left on the roll button

File:

• trunk/src/MainFrame.cpp (modified) (4 diffs)

trunk/src/MainFrame.cpp

@@ -449 +449 @@
         if (m_rolls <= 0) //we don't have remaining rolls 
                 ((wxButton*) FindWindow(ID_ROLL)) -> Enable(false);
+        
+        // change the displayed roll counter
+        wxString caption = wxString::Format(wxT("Roll! (%i)"),m_rolls);
+        FindWindow(ID_ROLL)->SetLabel(caption);
 
         //restore the 'keep' checkboxes
@@ -650 +654 @@
         m_score_dice.SetDice(dice);
         m_score_dice.SetYahtzeeJoker(YahtzeeJoker());
-        m_rolls -= 1;
+        --m_rolls;
+        
+        // change the displayed roll counter
+        wxString caption = wxString::Format(wxT("Roll! (%i)"),m_rolls);
+        FindWindow(ID_ROLL)->SetLabel(caption);
+
         #ifndef DEBUG
-        if (m_rolls <= 0) 
+        if (m_rolls <= 0) {
                 ((wxButton*) FindWindow(ID_ROLL)) -> Enable(false);
+                FindWindow(ID_ROLL)->SetLabel(wxT("Roll!"));
+        }
+
         #endif
         
@@ -901 +913 @@
         m_rolls = 3;
         ((wxButton*) FindWindow(ID_ROLL)) -> Enable(true);
+
+        // reset the roll count in the caption
+        FindWindow(ID_ROLL)->SetLabel(wxT("Roll! (3)"));
         for (int i=0; i<5; i++){ 
                 ((wxCheckBox*) FindWindow(i + ID_DICE1KEEP)) -> SetValue(false);
@@ -1241 +1256 @@
         }
         FindWindow(ID_ROLL)->Enable(roll_button_enabled);
+
+        // if there are rolls left we should display the count of them
+        if (roll_button_enabled) {
+                wxString caption = wxString::Format(wxT("Roll! (%i)"),m_rolls);
+                FindWindow(ID_ROLL)->SetLabel(caption);
+        }
+
         
         //BEGIN layout for the dice section of the score board