Changeset 51

Timestamp:

16/01/07 14:10:45 (6 years ago)

Author:

guyru

Message:

* empty log message *

Location:

trunk/OpenYahtzee

Files:

• ChangeLog (modified) (1 diff)
• TODO (modified) (2 diffs)
• src/MainFrame.cpp (modified) (1 diff)
• src/SettingsDialog.cpp (modified) (4 diffs)
• src/SettingsDialog.h (modified) (2 diffs)
• src/openyahtzee.cpp (modified) (1 diff)
• src/wxDynamicBitmap.h (modified) (1 diff)

trunk/OpenYahtzee/ChangeLog

@@ -10 +10 @@
 - Fixed bug #1634542 (undoing of scoring that involves Yahtzee Bonus).
 - Fixed minor misalignment in the UI.
+- Code refactoring and cleanup.
+- Redesigned the Settings Dialog.
+- The main window of the game is now unresizable (fixed size).
 
 Open Yahtzee 1.6:

trunk/OpenYahtzee/TODO

@@ -7 +7 @@
 - Disable the ability to undo the last move of the game.
 - Add abilliy to adjust how many times (avreage) will the dice roll before they stop.
-- Change the "reset high score" toggle button to a checkbox.
 - Multiplayer mode.
 
@@ -15 +14 @@
 - Add a frame around the dices.
 - Make the dice roll a couple of times before they stop.
+- Change the "reset high score" toggle button to a checkbox.
 
 

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -239 +239 @@
         Connect(ID_ROLL, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::OnRollButton));
 
-        for (int i=ID_ACES; i<=ID_SIXES; i++)
-                Connect(i, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::OnUpperButtons));
+        Connect(ID_ACES,ID_SIXES, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::OnUpperButtons));
         Connect(ID_THREEOFAKIND, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::On3ofakindButton));
         Connect(ID_FOUROFAKIND, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (MainFrame::On4ofakindButton));

trunk/OpenYahtzee/src/SettingsDialog.cpp

@@ -29 +29 @@
 
 SettingsDialog::SettingsDialog(wxWindow* parent, int id):
-    wxDialog(parent, wxID_ANY, wxT("Settins Dialog"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+    wxDialog(parent, wxID_ANY, wxT("Settings Dialog"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
 
         SetIcon(wxIcon(ICON));
 
-        label_1 = new wxStaticText(this, -1, wxT("High-score table size:"));
+        label_1 = new wxStaticText(this, -1, wxT("High score table size:"));
         spin_ctrl = new wxSpinCtrl(this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS,0,1024,20);
-        button_3 = new wxToggleButton(this, ID_RESETHIGHSCORE, wxT("reset high-score table"));
-        button_1 = new wxButton(this, wxID_OK);
-        button_2 = new wxButton(this, wxID_CANCEL);
+        checkbox_reset = new wxCheckBox(this, ID_RESETHIGHSCORE, wxT("Reset high score table"));
         animate_checkbox = new wxCheckBox(this, ID_ANIMATECHECKBOX, wxT("Animate dice"));
 
-        set_properties();
+        connect_event_table();
         do_layout();
         // end wxGlade
 }
 
-BEGIN_EVENT_TABLE( SettingsDialog, wxDialog)
-        EVT_TOGGLEBUTTON(ID_RESETHIGHSCORE, SettingsDialog::OnResetHighScore)
-END_EVENT_TABLE();
 
-void SettingsDialog::set_properties()
+void SettingsDialog::connect_event_table()
 {
-    // begin wxGlade: SettingsDialog::set_properties
-    //SetTitle(wxT("Settings Dialog")); /*unneeded anymore -guy*/
-    //button_1->SetDefault();/*unneeded anymore -guy*/
-    // end wxGlade
+   Connect(ID_RESETHIGHSCORE,wxEVT_COMMAND_CHECKBOX_CLICKED,wxCommandEventHandler(SettingsDialog::OnResetHighScore));
 }
 
@@ -62 +54 @@
 {
         wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
-        wxBoxSizer* sizer_2 = new wxBoxSizer(wxHORIZONTAL);
         wxBoxSizer* highscoresizer = new wxBoxSizer(wxHORIZONTAL);
-        highscoresizer->Add(label_1, 0, wxALL|wxADJUST_MINSIZE, 10);
-        highscoresizer->Add(spin_ctrl, 0, wxALL|wxADJUST_MINSIZE, 10);
+
+        highscoresizer->Add(label_1, 0, wxALL|wxADJUST_MINSIZE, 5);
+        highscoresizer->Add(spin_ctrl, 0, wxALL|wxADJUST_MINSIZE, 5);
         top_sizer->Add(highscoresizer, 0, 0, 0);
-        top_sizer->Add(button_3, 0,wxALL|wxALIGN_RIGHT|wxADJUST_MINSIZE, 10);
+        top_sizer->Add(checkbox_reset, 0,wxALL, 5);
 
-        top_sizer->Add(animate_checkbox,0,wxALL,10);
+        top_sizer->Add(animate_checkbox,0,wxALL,5);
 
-        sizer_2->Add(button_1, 0, wxALL|wxADJUST_MINSIZE, 10);
-        sizer_2->Add(button_2, 0, wxALL|wxADJUST_MINSIZE, 10);
-        top_sizer->Add(sizer_2, 1, 0, 0);
+        top_sizer->Add(CreateButtonSizer(wxOK|wxCANCEL), 1, wxBOTTOM, 10);
         SetAutoLayout(true);
         SetSizer(top_sizer);
@@ -84 +74 @@
 void SettingsDialog::OnResetHighScore(wxCommandEvent& event)
 {
-        if(!button_3->GetValue()){
-                button_3->SetValue(0);
+        if(!checkbox_reset->GetValue()){
+                checkbox_reset->SetValue(0);
                 return;
         }
         
-        int answer = wxMessageBox(wxT("Are you sure you want to reset the high-score table? After reseting the high score table, you won't be able to restore it!\nThe new high-score table size will be as specified in this dialog."),wxT("High-score table reset"),wxYES_NO|wxICON_EXCLAMATION);
+        int answer = wxMessageBox(wxT("Are you sure you want to reset the high score table? After reseting the high score table, you won't be able to restore it!\n\nThe new high score table size will be as specified in this dialog."),wxT("High-score table reset"),wxYES_NO|wxICON_EXCLAMATION,this);
 
         if(answer==wxNO)
-                button_3->SetValue(0);
+                checkbox_reset->SetValue(0);
 }
 
@@ -105 +95 @@
         SettingsDialogData data;
         data.highscoresize = spin_ctrl->GetValue();
-        data.reset = button_3->GetValue();
+        data.reset = checkbox_reset->GetValue();
         data.animate = animate_checkbox->GetValue();
         return data;

trunk/OpenYahtzee/src/SettingsDialog.h

@@ -53 +53 @@
 private:
     // begin wxGlade: SettingsDialog::methods
-    void set_properties();
+    void connect_event_table();
     void do_layout();
     // end wxGlade
@@ -63 +63 @@
         wxStaticText* label_1;
         wxSpinCtrl* spin_ctrl;
-        wxToggleButton* button_3; //the reset button
-        wxButton* button_1;
-        wxButton* button_2;
+        wxCheckBox* checkbox_reset; //the reset button
         
         wxCheckBox* animate_checkbox;
-
-        DECLARE_EVENT_TABLE();
         
 };

trunk/OpenYahtzee/src/openyahtzee.cpp

@@ -54 +54 @@
 
         // Create the main application window
-        MainFrame *frame = new MainFrame(wxT("OpenYahtzee"), wxDefaultSize, wxDEFAULT_FRAME_STYLE);
+        MainFrame *frame = new MainFrame(wxT("OpenYahtzee"), wxDefaultSize, wxDEFAULT_FRAME_STYLE & (~wxRESIZE_BORDER));
         
         //Show it

trunk/OpenYahtzee/src/wxDynamicBitmap.h

@@ -41 +41 @@
         wxDynamicBitmap (wxWindow* parent, wxWindowID id, wxBitmap&  bitmap,
                  const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
-                 long style = 0, const wxString& name = wxPanelNameStr);
+                 long style = wxNO_BORDER, const wxString& name = wxPanelNameStr);
         virtual void SetBitmap(wxBitmap&  bitmap);
         wxBitmap GetBitmap();