Changeset 167

Timestamp:

10/03/2008 07:39:43 AM (3 years ago)

Author:

guyru

Message:

• Add "Clear", "Configure" buttons to Highscores Dialog, add ability to resize the Highscores list and clear it.

Fix the date formatting when submitting to Highscores list.

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (2 diffs)
• configuration.cpp (modified) (4 diffs)
• configuration.h (modified) (1 diff)
• highscores_dialog.cpp (modified) (4 diffs)
• highscores_dialog.h (modified) (3 diffs)

trunk/src/MainFrame.cpp

@@ -541 +541 @@
 
         if (settings_dialog->ShowModal()!=wxID_OK) {
+                delete settings_dialog;
                 return;
         }
@@ -1017 +1018 @@
         date = now.FormatDate().mb_str();
         date += " ";
-        date += now.FormatISOTime().SubString(0,5).mb_str();
+        date += now.FormatISOTime().SubString(0,4).mb_str();
 
         int rank = m_config->submitHighscore(score, name, date);

trunk/src/configuration.cpp

@@ -21 +21 @@
 #include <iostream>
 #include <cstdlib> // used in the back-compatibility code
+#include <sstream>
 #include "configuration.h"
 #include "../config.h"
@@ -103 +104 @@
         string date,hour,name;
         HighscoreItem temp_item;
+
+        temp_chr = file->get();
+        file->unget();
+
         while(file->good()) {
                 temp_chr = file->get();
@@ -323 +328 @@
                 return 0;
         }
+        save();
         return place;
 }
@@ -331 +337 @@
         return ptr;
 }
+
+void Configuration::clearHighscores()
+{
+        m_highscores.clear();
+        save();
+}
+
+void Configuration::setHighscoresSize(int size)
+{
+
+        std::ostringstream o;
+        o << size;
+        m_settings["highscore-list-size"] = o.str();
+
+        while (m_highscores.size()>size) {
+                m_highscores.pop_back();
+        }
+
+        save();
+}

trunk/src/configuration.h

@@ -75 +75 @@
 
         const HighscoresList* getHighscores() const;
+
+        void clearHighscores();
+
+        void setHighscoresSize(int size);
 private:
         /**

trunk/src/highscores_dialog.cpp

@@ -68 +68 @@
 void HighscoresDialog::loadData()
 {
+        highscoreslist->DeleteAllItems();
         const configuration::HighscoresList *list = m_config->getHighscores();
 
@@ -110 +111 @@
         top_sizer->Add(highscoreslist, 1, wxALL, 10); 
 
-        top_sizer->Add(
-                new wxButton(this,wxID_CLOSE),
-                0, //no streching
-                wxALL, //we want border around everything
-                10);
-        
-        SetAutoLayout(true);
+        wxBoxSizer *button_sizer = new wxBoxSizer( wxHORIZONTAL );
+
+        wxSizerFlags flags = wxSizerFlags().Border(wxALL & ~wxLEFT, 10);
+
+        button_sizer->AddStretchSpacer();
+        button_sizer->Add(new wxButton(this,wxID_CLEAR),flags);
+        button_sizer->Add(new wxButton(this,ID_CONFIGURE,wxT("Configure")),flags);
+        button_sizer->Add( new wxButton(this,wxID_CLOSE), flags);
+
+        top_sizer->Add(button_sizer,0,wxEXPAND);
+        
         SetSizer(top_sizer);
-
-        top_sizer->Fit(this);
         top_sizer->SetSizeHints(this);
-
-        Layout();
 }
 
@@ -129 +130 @@
 {
         Connect(wxID_CLOSE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(HighscoresDialog::onClose));
-}
-
+
+        Connect(wxID_CLEAR, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(HighscoresDialog::onClear));
+        Connect(ID_CONFIGURE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(HighscoresDialog::onConfigure));
+}
 void HighscoresDialog::onClose(wxCommandEvent& event)
 {
@@ -136 +139 @@
 }
 
+void HighscoresDialog::onConfigure(wxCommandEvent& event)
+{
+        HighscoresSettingsDialog *dialog = new HighscoresSettingsDialog(this, m_config);
+        
+        if (dialog->ShowModal() == wxID_OK) {
+                loadData();
+        }
+
+        delete dialog;
+}
+
+void HighscoresDialog::onClear(wxCommandEvent& event)
+{
+        int answer = wxMessageBox(
+                wxT("Are you sure you want to clear the Highscores table?\nThis action cannot be reversed."),
+                wxT("Are You Sure?"),
+                wxYES | wxNO,
+                this);
+        
+        if (answer == wxYES) {
+                m_config->clearHighscores();
+                loadData();
+        }
+}
+
+
+HighscoresSettingsDialog::HighscoresSettingsDialog(wxWindow* parent, configuration::Configuration* config) :
+        wxDialog(parent, wxID_ANY, wxT("Highscores Table Settings"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+{
+        this->m_config = config;
+        doLayout();
+
+        Connect(wxID_OK, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(HighscoresSettingsDialog::onOk));
+}
+
+void HighscoresSettingsDialog::doLayout()
+{
+        wxBoxSizer* top_sizer = new wxBoxSizer(wxVERTICAL);
+
+        wxBoxSizer* size_sizer = new wxBoxSizer(wxHORIZONTAL);
+
+        size_sizer->Add(new wxStaticText(this, wxID_ANY, wxT("High score table size:")), wxSizerFlags().Border(wxALL,10));
+        
+        int size = atoi(m_config->get("highscore-list-size").c_str());
+        spin_ctrl = new wxSpinCtrl(this, wxID_ANY);
+        spin_ctrl->SetRange(10,200);
+        spin_ctrl->SetValue(size);
+
+        size_sizer->Add(spin_ctrl,wxSizerFlags().Border(wxALL & ~wxLEFT,10));
+
+        top_sizer->Add(size_sizer);
+        top_sizer->Add(CreateButtonSizer(wxOK|wxCANCEL), 1, wxBOTTOM, 10);
+
+        SetSizer(top_sizer);
+        top_sizer->SetSizeHints(this);
+}
+
+void HighscoresSettingsDialog::onOk(wxCommandEvent& event) {
+        int size = spin_ctrl->GetValue();
+        m_config->setHighscoresSize(size);
+        event.Skip();
+}

trunk/src/highscores_dialog.h

@@ -25 +25 @@
 #include <wx/dialog.h>
 #include <wx/listctrl.h>
+#include <wx/spinctrl.h>
 
 namespace highscores_dialog {
@@ -34 +35 @@
 
         void onClose(wxCommandEvent& event);    
+        void onClear(wxCommandEvent& event);    
+        void onConfigure(wxCommandEvent& event);        
 private:
         void createControls();
@@ -46 +49 @@
 };
 
+
+class HighscoresSettingsDialog : public wxDialog
+{
+public:
+        HighscoresSettingsDialog(wxWindow* parent, configuration::Configuration* config);
+
+        void onOk(wxCommandEvent& event);
+private:
+        void doLayout();
+        wxSpinCtrl *spin_ctrl;
+
+        configuration::Configuration* m_config;
+};
+
+
+enum {
+        ID_CONFIGURE,
+};
+
 }