Changeset 21

Timestamp:

17/12/06 17:09:23 (7 years ago)

Author:

guyru

Message:

added functionality to undo button

Location:

trunk/OpenYahtzee

Files:

• openyahtzee.kdevelop (modified) (3 diffs)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (1 diff)
• src/MainFrame.cpp (modified) (12 diffs)

trunk/OpenYahtzee/openyahtzee.kdevelop

@@ -14 +14 @@
     <projectdirectory>.</projectdirectory>
     <absoluteprojectpath>false</absoluteprojectpath>
-    <description></description>
+    <description/>
   </general>
   <kdevautoproject>
@@ -186 +186 @@
     </codecompletion>
     <creategettersetter>
-      <prefixGet></prefixGet>
+      <prefixGet/>
       <prefixSet>set</prefixSet>
       <prefixVariable>m_,_</prefixVariable>
@@ -202 +202 @@
   <kdevdebugger>
     <general>
-      <programargs></programargs>
-      <gdbpath></gdbpath>
-      <dbgshell></dbgshell>
-      <configGdbScript></configGdbScript>
-      <runShellScript></runShellScript>
-      <runGdbScript></runGdbScript>
+      <programargs/>
+      <gdbpath/>
+      <dbgshell/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
       <breakonloadinglibs>true</breakonloadinglibs>
       <separatetty>false</separatetty>

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="7" >
+ <DocsAndViews NumberOfDocuments="6" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
-   <View0 line="23" Type="Source" />
+   <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 line="0" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="86" Type="Source" />
+   <View0 line="186" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
-   <View0 line="44" Type="Source" />
+   <View0 Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="80" Type="Source" />
+   <View0 Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
    <View0 line="26" Type="Source" />
   </Doc5>
-  <Doc6 NumberOfViews="1" URL="file:///usr/include/wx-2.6/wx/gtk/bitmap.h" >
-   <View0 line="74" Type="Source" />
-  </Doc6>
  </DocsAndViews>
  <pluginList>
   <kdevdebugger>
-   <breakpointList>
-    <breakpoint0 location="/home/guy/workspace/OpenYahtzee/src/MainFrame.cpp:228" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
-     <tracedExpressions/>
-    </breakpoint0>
-    <breakpoint1 location="/home/guy/workspace/OpenYahtzee/src/MainFrame.cpp:215" type="1" tracingFormatString="" traceFormatStringEnabled="0" condition="" tracingEnabled="0" enabled="1" >
-     <tracedExpressions/>
-    </breakpoint1>
-   </breakpointList>
+   <breakpointList/>
   </kdevdebugger>
   <kdevbookmarks>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -81 +81 @@
         gameMenu->Append(ID_NEWGAME,wxT("&New Game\tF2"),wxT("Start a new game"));
         //create the undo button and make it disabled
-        (gameMenu->Append(ID_UNDO,wxT("&Undo"),wxT("Undo the last move")))->Enable(false);
+        gameMenu->Append(ID_UNDO,wxT("&Undo"),wxT("Undo the last move"));
         gameMenu->Append(ID_SHOWHIGHSCORE,wxT("High &Scores"),wxT("Show high-scores table"));
         gameMenu->Append(ID_SETTINGS,wxT("Settings"),wxT("Show settings dialog"));
@@ -183 +183 @@
                 textctrl->SetEditable(false);
         }
+        
+        //disable the undo button
+        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+
 
         
@@ -254 +258 @@
 void MainFrame::OnUndo(wxCommandEvent& event)
 {
-        std::cout<<"in undo"<<std::endl;
         m_rolls = m_rollsundo;
 
-        //enable the roll button if neccessary
-        if (m_rolls > 0) //we still have remaining rolls 
-                ((wxButton*) FindWindow(ID_ROLL)) -> Enable(true);
-
+        //after the user scored the button was enabled, check if it should be disabled
+        if (m_rolls <= 0) //we don't have remaining rolls 
+                ((wxButton*) FindWindow(ID_ROLL)) -> Enable(false);
+
+        //restore the 'keep' checkboxes
+        for (int i=0; i<5; i++)
+                ((wxCheckBox*) FindWindow(i + ID_DICE1KEEP)) -> Enable(true);
+        
         //reset the users last choice
         FindWindow(m_lastmove)->Enable(true);
+
         //clear the score;
         ((wxTextCtrl*)FindWindow(ID_ACESTEXT + (m_lastmove - ID_ACES)))->SetValue(wxT(""));
-        FindWindow(ID_UNDO)->Enable(false);
-        m_numofplaysleft--;
+
+        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
+        //cancel the counting for the choice that was canceled
+        m_numofplaysleft++;
 }
 ///This function enables the undo button and stores the last move
 inline void MainFrame::EnableUndo(int id)
 {
-                FindWindow(ID_UNDO)->Enable(true);
+                (GetMenuBar()->FindItem(ID_UNDO))->Enable(true);
                 m_lastmove = id;
 }
@@ -328 +338 @@
         for (int i=0; i<5; i++)
                 ((wxCheckBox*) FindWindow(i + ID_DICE1KEEP)) -> Enable(true);
+        
+        //we rolled the dices so undoing isn't allowed
+        (GetMenuBar()->FindItem(ID_UNDO))->Enable(false);
 
 }
@@ -347 +360 @@
                 FindWindow(event.GetId())->Enable(false);
                 m_numofplaysleft--;
+                EnableUndo(event.GetId());
                 EndofGame();
         }
@@ -382 +396 @@
         FindWindow(event.GetId())->Enable(false);
         m_numofplaysleft--;
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -414 +429 @@
         FindWindow(event.GetId())->Enable(false);
         m_numofplaysleft--;
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -444 +460 @@
         FindWindow(event.GetId())->Enable(false);
         m_numofplaysleft--;
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -471 +488 @@
         FindWindow(event.GetId())->Enable(false);
         m_numofplaysleft--;
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -497 +515 @@
         FindWindow(event.GetId())->Enable(false);
         m_numofplaysleft--;
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -516 +535 @@
         m_numofplaysleft--;
         ResetRolls();
+        EnableUndo(event.GetId());
         EndofGame();
 }
@@ -536 +556 @@
                 FindWindow(event.GetId())->Enable(false);
                 m_numofplaysleft--;
+                EnableUndo(event.GetId());
                 EndofGame();
         }