Changeset 163 for trunk

Timestamp:

09/27/2008 03:42:22 PM (4 years ago)

Author:

guyru

Message:

remove old settings dialog and switch to new one

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (13 diffs)
• MainFrame.h (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• SettingsDialog.cpp (deleted)
• SettingsDialog.h (deleted)
• configuration.cpp (modified) (1 diff)
• settings_dialog.cpp (added)
• settings_dialog.h (added)

trunk/src/MainFrame.cpp

@@ -32 +32 @@
 #include "ObjectsID.h"
 #include "HighScoreDialog.h"
-#include "SettingsDialog.h"
 #include "dice_theme_dialog.h"
 #include "About.h"
 #include "UtilityFunctions.h"
 #include "configuration.h"
+#include "settings_dialog.h"
 #include <iostream>
 #include <sstream>
@@ -79 +79 @@
                 wxRenameFile(home_path+wxT("/.OpenYahtzee"),home_path+wxT("/.openyahtzee"),false);
         }
-        configuration::Configuration config("/home/guy/.openyahtzee.new");
-        config.save();
+
+        
+        std::string config_file;
+        config_file = (home_path.mb_str());
+        #ifndef PORTABLE
+                config_file += "/.openyahtzee.new";
+        #else
+                config_file += "/openyahtzee.dat";
+        #endif
+
+        m_config = new configuration::Configuration(config_file);
+
         m_settingsdb = new SettingsDB(); //Get the settings database connection
         m_highscoredb = new HighScoreTableDB();
@@ -169 +179 @@
         wxFlexGridSizer *diceSizer;
 
-        if (m_settings.horizontal_layout) {
+        if (m_config->get("horizontal-layout")=="True") {
                 topSizer = new wxBoxSizer( wxVERTICAL );
                 sectionsSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -265 +275 @@
 
         //BEGIN layout for the dice section of the score board
-        if (m_settings.horizontal_layout) {
+        if (m_config->get("horizontal-layout")=="True") {
                 diceSizer->Add(new wxDynamicBitmap(panel, ID_DICE1,
                         m_dice_graphics.GetDice(1)), 0, wxALL, DICE_SPACE);
@@ -529 +539 @@
 void MainFrame::OnSettings( wxCommandEvent& event)
 {
-        SettingsDialog *dialog = new SettingsDialog(this,wxID_ANY);
-        SettingsDialogData data;
-        std::ostringstream sstr;
-        
-        data.highscoresize = m_highscoredb->GetSize();
-
-        data.animate = (m_settingsdb->GetKey("animate")=="Yes")?true:false;
-        data.subtotal = (m_settingsdb->GetKey("calculatesubtotal")=="Yes")?true:false;
-        data.score_hints = m_settings.score_hints;
-        data.horizontal = (m_settingsdb->GetKey("horizontallayout")=="Yes")?true:false;
-        
-        dialog->SetData(data);
-        
-        if(dialog->ShowModal()!=wxID_OK)
-                return;
-        
-        data = dialog->GetData();
-
-        if(data.reset)
-                m_highscoredb->SetSize(0);
-        
-        sstr<<data.highscoresize<<std::flush;
-        m_settingsdb->SetKey("highscoresize",sstr.str());
-                        
-        m_highscoredb->SetSize(data.highscoresize);
-        
-        if (data.animate){
-                m_settingsdb->SetKey("animate","Yes");
-                m_settings.animate = true;
-        } else {
-                m_settingsdb->SetKey("animate","No");
-                m_settings.animate = false;
-        }
-
-        if (data.subtotal){
-                m_settingsdb->SetKey("calculatesubtotal","Yes");
-                m_settings.calculate_subtotal = true;
-        } else {
-                m_settingsdb->SetKey("calculatesubtotal","No");
-                m_settings.calculate_subtotal = false;
-        }
+        settings_dialog::SettingsDialog* settings_dialog = new settings_dialog::SettingsDialog(this, m_config);
+
+        if (settings_dialog->ShowModal()!=wxID_OK) {
+                return;
+        }
+
         ((wxTextCtrl*) FindWindow(ID_UPPERSECTIONTOTAL)) -> SetValue(wxT(""));
         ((wxTextCtrl*) FindWindow(ID_LOWERTOTAL)) -> SetValue(wxT(""));
         CalculateSubTotal();
 
-        if (data.score_hints){
-                m_settingsdb->SetKey("score_hints","Yes");
-                m_settings.score_hints = true;
-        } else {
-                m_settingsdb->SetKey("score_hints","No");
-                m_settings.score_hints = false;
-        }
-
-        if (data.horizontal){
-                m_settingsdb->SetKey("horizontallayout","Yes");
-                m_settings.horizontal_layout = true;
-                Relayout();                     
-        } else {
-                m_settingsdb->SetKey("horizontallayout","No");
-                m_settings.horizontal_layout = false;
-                Relayout();
-        }
+        Relayout();
+
+        delete settings_dialog;
 }
 
@@ -634 +595 @@
         dice[4]=m_score_dice.GetDice(5);
         //roll the dice...
-        if (m_settings.animate) {
+        if (m_config->get("dice-animation")=="True") {
                 int dice_throws[5] = {0,0,0,0,0};
                 for (int i=0; i<5; i++) { //set the number of rolls for each dice
@@ -1095 +1056 @@
 void MainFrame::CalculateSubTotal()
 {
-        if (!m_settings.calculate_subtotal)
+        if (m_config->get("calculate-subtotal")=="False")
                 return;
         long upperscore = 0;
@@ -1148 +1109 @@
         }
         
-        if (m_settingsdb->GetKey("animate") == "Yes") {
-                m_settings.animate = true;
-        } else if (m_settingsdb->GetKey("animate") == "No") {
-                m_settings.animate = false;
-        } else {
-                m_settingsdb->SetKey("animate", "Yes");
-                m_settings.animate = true;
-        }
-
-        if (m_settingsdb->GetKey("calculatesubtotal") == "Yes") {
-                m_settings.calculate_subtotal = true;
-        } else if (m_settingsdb->GetKey("calculatesubtotal") == "No") {
-                m_settings.calculate_subtotal = false;
-        } else {
-                m_settingsdb->SetKey("calculatesubtotal", "Yes");
-                m_settings.calculate_subtotal = true;
-        }
-
-        if (m_settingsdb->GetKey("horizontallayout") == "Yes") {
-                m_settings.horizontal_layout = true;
-        } else if (m_settingsdb->GetKey("horizontallayout") == "No") {
-                m_settings.horizontal_layout = false;
-        } else {
-                m_settingsdb->SetKey("horizontallayout", "No");
-                m_settings.horizontal_layout = true;
-        }
-
-        if (m_settingsdb->GetKey("score_hints") == "Yes") {
-                m_settings.score_hints = true;
-        } else if (m_settingsdb->GetKey("score_hints") == "No") {
-                m_settings.score_hints = false;
-        } else {
-                m_settingsdb->SetKey("score_hints", "Yes");
-                m_settings.score_hints = true;
-        }
 
         return 1;
@@ -1198 +1124 @@
         sectionsSizer->Remove(uppersection);
 
-        if (m_settings.horizontal_layout) {
+        if (m_config->get("horizontal-layout")=="True") {
                 topSizer = new wxBoxSizer( wxVERTICAL );
                 sectionsSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -1265 +1191 @@
         //Change the roll button size if we need to
         roll_button_enabled = FindWindow(ID_ROLL)->IsEnabled();
-        if (m_settings.horizontal_layout) {
+        if (m_config->get("horizontal-layout")=="True") {
                 FindWindow(ID_ROLL)->Destroy();
                 new wxButton(FindWindow(ID_PANEL), ID_ROLL, wxT("Roll!"),wxDefaultPosition,wxSize(64,64));
@@ -1282 +1208 @@
         
         //BEGIN layout for the dice section of the score board
-        if (m_settings.horizontal_layout) {
+        if (m_config->get("horizontal-layout")=="True") {
                 diceSizer->Add(FindWindow(ID_DICE1),0,wxALL,DICE_SPACE);
                 diceSizer->Add(FindWindow(ID_DICE2),0,wxALL,DICE_SPACE);
@@ -1346 +1272 @@
         wxTextCtrl *text_control;
         wxString out;
-        if (! m_main_frame->m_settings.score_hints) {
+        if (m_main_frame->m_config->get("score-hints")=="False") {
                 event.Skip();
                 return;
@@ -1427 +1353 @@
         event.Skip(); //allow default proccesing
 }
+
+MainFrame::~MainFrame() {
+        // free pointers
+        delete m_config;
+        delete m_settingsdb;
+        delete m_highscoredb;
+        delete m_evt_handler;
+}

trunk/src/MainFrame.h

@@ -29 +29 @@
 #include "ScoreDice.h"
 #include "dice_graphics.h"
+#include "configuration.h"
 #ifndef MAINFRAME_INC
 #define MAINFRAME_INC
@@ -44 +45 @@
         // Constructor
         MainFrame(const wxString& title,  const wxSize& size, long style);
+        ~MainFrame();
 
         // Event handlers
@@ -75 +77 @@
         ScoreDice m_score_dice;
 
-        struct {
-                bool animate;
-                bool calculate_subtotal;
-                bool horizontal_layout;
-                bool score_hints;
-        } m_settings;
+        configuration::Configuration *m_config;
 
 private:

trunk/src/Makefile.am

@@ -14 +14 @@
         openyahtzee.cpp \
         SettingsDB.cpp \
-        SettingsDialog.cpp \
+        settings_dialog.cpp \
+        settings_dialog.h \
         ScoreDice.cpp \
         UtilityFunctions.cpp \
@@ -56 +57 @@
         ObjectsID.h \
         SettingsDB.h \
-        SettingsDialog.h \
         ScoreDice.h \
         UtilityFunctions.h \

trunk/src/configuration.cpp

@@ -188 +188 @@
         m_settings["dice-animation"] = "True";
         m_settings["calculate-subtotal"] = "True";
-        m_settings["calculate-subtotal"] = "True";
         m_settings["horizontal-layout"] = "True";
         m_settings["score-hints"] = "True";