Changeset 165 for trunk/src

Timestamp:

09/27/2008 05:56:06 PM (4 years ago)

Author:

guyru

Message:

new highscore dialog

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• highscores_dialog.cpp (moved) (moved from trunk/src/HighScoreDialog.cpp) (2 diffs)
• highscores_dialog.h (moved) (moved from trunk/src/HighScoreDialog.h) (2 diffs)

trunk/src/MainFrame.cpp

@@ -31 +31 @@
 #include "wxDynamicBitmap.h"
 #include "ObjectsID.h"
-#include "HighScoreDialog.h"
+#include "highscores_dialog.h"
 #include "dice_theme_dialog.h"
 #include "About.h"
@@ -527 +527 @@
 void MainFrame::OnShowHighscore(wxCommandEvent& event)
 {
-        HighScoreDialog *dialog = new HighScoreDialog(this,wxID_ANY,m_highscoredb);
+        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this,m_config);
+
         dialog->ShowModal();
+
+        delete dialog;
 }
 

trunk/src/Makefile.am

@@ -8 +8 @@
         dice_theme_dialog.cpp \
         MainFrame.cpp \
-        HighScoreDialog.cpp \
+        highscores_dialog.cpp \
+        highscores_dialog.h \
         HighScoreTableDB.cpp \
         icon.xpm \
@@ -50 +51 @@
         dice_theme_dialog.h \
         HighScoreTableDB.h \
-        HighScoreDialog.h \
         Icon.h \
         icon32.ico \

trunk/src/highscores_dialog.cpp

@@ -1 @@
-// $Header$
 /***************************************************************************
- *   Copyright (C) 2006 by Guy Rutenberg   *
+ *   Copyright (C) 2006-2008 by Guy Rutenberg   *
  *   guyrutenberg@gmail.com   *
  *                                                                         *
@@ -20 +19 @@
  ***************************************************************************/
 
-#include <wx/wx.h>
-#include <wx/dialog.h>
 #include <wx/button.h>
 #include <wx/sizer.h>
-#include <wx/listctrl.h>
 
-#include "ObjectsID.h"
-#include "HighScoreDialog.h"
+#include "highscores_dialog.h"
 
 #include "Icon.h"
 
 using namespace std;
+using namespace highscores_dialog;
 
-HighScoreDialog::HighScoreDialog(wxWindow* parent,wxWindowID id,HighScoreTableDB *highscoredb) :
-        wxDialog(parent, id, wxT("High-Score Table"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+HighscoresDialog::HighscoresDialog(wxWindow* parent,configuration::Configuration* config, int highlight_rank) :
+        wxDialog(parent, wxID_ANY, wxT("Highscores Table"), wxDefaultPosition, wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
 {
+        this->highlight_rank = highlight_rank;
+        m_config = config;
 
         SetIcon(wxIcon(ICON));
 
+        createControls();
+        loadData();
+        doLayout();
+        connectEventTable();
+}
 
-        list<string> table;
+void HighscoresDialog::createControls()
+{
+        highscoreslist = new wxListCtrl(this,wxID_ANY,wxDefaultPosition,wxSize(400,400),wxLC_REPORT);
 
-        table = highscoredb->GetHighScoreTable();       
+        wxListItem itemCol;
 
-        list<string>::iterator lip = table.begin();
+        itemCol.SetText(wxT("Rank"));
+        itemCol.SetImage(-1);
+        highscoreslist->InsertColumn(0, itemCol);
+
+        itemCol.SetText(wxT("Name"));
+        itemCol.SetImage(-1);
+        highscoreslist->InsertColumn(1, itemCol);
+
+        itemCol.SetText(wxT("Score"));
+        itemCol.SetImage(-1);
+        highscoreslist->InsertColumn(2, itemCol);
+
+        itemCol.SetText(wxT("Date"));
+        itemCol.SetImage(-1);
+        highscoreslist->InsertColumn(3, itemCol);
+}
+
+void HighscoresDialog::loadData()
+{
+        const configuration::HighscoresList *list = m_config->getHighscores();
+
+        configuration::HighscoresList::const_iterator it;
         wxString buf;
 
+        int i = 0;
+        for (it = list->begin(); it!=list->end(); it++, i++) {
+                // rank
+                buf.Clear();
+                buf<<(i+1);
+                highscoreslist->InsertItem(i,buf,-1);
 
-        //Now create the dialog
-        //Create The top-level sizer
-        wxBoxSizer *topSizer = new wxBoxSizer( wxVERTICAL );
-        wxListCtrl *highscorelist = new wxListCtrl(this,wxID_ANY,wxDefaultPosition,wxSize(400,400),wxLC_REPORT);
+                // name
+                buf = wxString(it->name.c_str(),wxConvUTF8);
+                highscoreslist->SetItem(i,1,buf);
+
+                // score
+                buf.Clear();
+                buf<< it->score;
+                highscoreslist->SetItem(i,2,buf);
+
+                // date
+                buf = wxString(it->date.c_str(),wxConvUTF8);
+                highscoreslist->SetItem(i,3,buf);
+        }
+
+        if (highlight_rank) {
+                highscoreslist->SetItemTextColour(highlight_rank-1,*wxRED);
+        }
+
+        highscoreslist->SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER );
+        highscoreslist->SetColumnWidth(1, wxLIST_AUTOSIZE );
+        highscoreslist->SetColumnWidth(2, wxLIST_AUTOSIZE_USEHEADER );
+        highscoreslist->SetColumnWidth(3, wxLIST_AUTOSIZE );
+}
+
+void HighscoresDialog::doLayout()
+{
+        wxBoxSizer *top_sizer = new wxBoxSizer( wxVERTICAL );
         
-        topSizer->Add(
-                highscorelist,
-                0,
-                wxALL,
-                10);
-                
-        topSizer->Add(
-                new wxButton(this,wxID_OK),
+        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);
         
-        ///////////////////////////////////////
-        ////Enter content into highscoretable
+        SetAutoLayout(true);
+        SetSizer(top_sizer);
 
-        //create the columns
-        wxListItem itemCol;
-        itemCol.SetText(wxT("Place"));
-        itemCol.SetImage(-1);
-        highscorelist->InsertColumn(0, itemCol);
-        itemCol.SetText(wxT("Name"));
-        itemCol.SetImage(-1);
-        highscorelist->InsertColumn(1, itemCol);
-        itemCol.SetText(wxT("Date"));
-        itemCol.SetImage(-1);
-        highscorelist->InsertColumn(2, itemCol);
-        itemCol.SetText(wxT("Score"));
-        itemCol.SetImage(-1);
-        highscorelist->InsertColumn(3, itemCol);
-        
-        int i =0;
-        while(lip != table.end()) {
-                if (i%4){
-                        buf = wxString(lip->c_str(),wxConvUTF8);
-                        highscorelist->SetItem(i/4,i%4,buf);
-                        lip++;
+        top_sizer->Fit(this);
+        top_sizer->SetSizeHints(this);
 
-                } else { 
-                        buf.Clear();
-                        buf << (i/4+1);
-                        highscorelist->InsertItem(i/4,buf,-1);
-                }
-                i++;
-        }
-        
-
-        //size the collumns
-        highscorelist->SetColumnWidth(0, wxLIST_AUTOSIZE_USEHEADER );
-        highscorelist->SetColumnWidth(1, wxLIST_AUTOSIZE );
-        highscorelist->SetColumnWidth(2, wxLIST_AUTOSIZE );
-        highscorelist->SetColumnWidth(3, wxLIST_AUTOSIZE_USEHEADER );
-
-        
-
-        SetSizer( topSizer ); // use the sizer for layout
-        topSizer->Fit( this );          // fit the dialog to the contents
-        topSizer->SetSizeHints( this ); // set hints to honor min size
-
+        Layout();
 }
 
+
+void HighscoresDialog::connectEventTable()
+{
+        Connect(wxID_CLOSE, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler(HighscoresDialog::onClose));
+}
+
+void HighscoresDialog::onClose(wxCommandEvent& event)
+{
+        Close();
+}
+

trunk/src/highscores_dialog.h

@@ -1 @@
-// $Header$
 /***************************************************************************
- *   Copyright (C) 2006 by Guy Rutenberg   *
+ *   Copyright (C) 2006-2008 by Guy Rutenberg   *
  *   guyrutenberg@gmail.com   *
  *                                                                         *
@@ -19 +18 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
-#ifndef HIGHSCOREDIALOG_INC
-#define HIGHSCOREDIALOG_INC
+#ifndef OPENYAHTZEE_HIGHSCORES_DIALOG_INC
+#define OPENYAHTZEE_HIGHSCORES_DIALOG_INC
 
-#include "HighScoreTableDB.h"
+#include "configuration.h"
+#include <wx/wx.h>
+#include <wx/dialog.h>
+#include <wx/listctrl.h>
 
-class HighScoreDialog : public wxDialog
+namespace highscores_dialog {
+
+class HighscoresDialog : public wxDialog
 {
 public:
-        HighScoreDialog(wxWindow* parent,wxWindowID id,HighScoreTableDB* highscoredb);
+        HighscoresDialog(wxWindow* parent,configuration::Configuration* config, int highlight_rank = 0);
 
+        void onClose(wxCommandEvent& event);    
 private:
+        void createControls();
+        void loadData( );
+        void doLayout();
+        void connectEventTable();
 
+        int highlight_rank;
+        configuration::Configuration* m_config;
+
+        wxListCtrl *highscoreslist;
 };
+
+}