Changeset 166 for trunk

Timestamp:

01/10/08 06:37:24 (5 years ago)

Author:

guyru

Message:

remove the code of the HighScoreTableDB

Location:

trunk/src

Files:

• HighScoreTableDB.cpp (deleted)
• HighScoreTableDB.h (deleted)
• MainFrame.cpp (modified) (6 diffs)
• MainFrame.h (modified) (3 diffs)
• Makefile.am (modified) (2 diffs)
• highscores_dialog.cpp (modified) (1 diff)

trunk/src/MainFrame.cpp

@@ -41 +41 @@
 #include <cstdlib>
 #include <wx/version.h>
+#include <wx/filename.h>
 
 //include the icon file
@@ -91 +92 @@
         m_config = new configuration::Configuration(config_file);
 
-        m_highscoredb = new HighScoreTableDB();
-
         m_evt_handler = new MainFrameEvtHandler(this);
         
-        InitializeDatabase();//this must come _after_ m_settingsdb and m_highscoredb are created
-
         //bitmap_dices[0] = new wxBitmap(one_xpm);
         //bitmap_dices[1] = new wxBitmap(two_xpm);
@@ -1001 +998 @@
         wxCommandEvent newevent;
 
-
-        place = m_highscoredb->IsHighScore(score);
-        
-        if(!place)  //if the score didn't make it to the highscore table do nothing
-                return;
+        
+        if(!m_config->isHighscore(score)) {
+                return;
+        }
         
         wxString msg;
-        msg.Printf(wxT("Your score made it to the high score table. Your place is number %i.\nPlease enter your name below:"),place);
-
-        wxTextEntryDialog infodialog(this,msg,wxT("Please enter your name"),wxT(""),wxOK | wxCENTRE);
+        msg.Printf(wxT("Your score made it to the high score table.\nPlease enter your name below:"),place);
+
+        wxString last_name = wxString::FromUTF8(m_config->get("last-name").c_str());
+
+        wxTextEntryDialog infodialog(this,msg,wxT("Please enter your name"),last_name ,wxOK | wxCENTRE);
         infodialog.ShowModal();
 
@@ -1017 +1015 @@
         //get the date
         wxDateTime now = wxDateTime::Now();
-        date = now.FormatISOTime().mb_str();
-        date +=" ";
-        date += now.FormatDate().mb_str();
-
-        m_highscoredb->SendHighScore(name,date,score);
+        date = now.FormatDate().mb_str();
+        date += " ";
+        date += now.FormatISOTime().SubString(0,5).mb_str();
+
+        int rank = m_config->submitHighscore(score, name, date);
 
         //now show the high score table
-        newevent.SetId(ID_SHOWHIGHSCORE);
-        newevent.SetEventType(wxEVT_COMMAND_MENU_SELECTED);
-        ProcessEvent(newevent);
+        highscores_dialog::HighscoresDialog *dialog = new highscores_dialog::HighscoresDialog(this,m_config,rank);
+
+        dialog->ShowModal();
+
+        delete dialog;
 
 }
@@ -1091 +1091 @@
 }
 
-
-///TODO: delete this function
-/**
- * Initializes the database and stores default settings if needed.
- * @return 0 if some error
- */
-int MainFrame::InitializeDatabase()
-{
-
-        int highscoresize = atoi((m_config->get("highscore-list-size")).c_str());
-        m_highscoredb->SetSize(highscoresize);
-
-        return 1;
-}
 
 void MainFrame::Relayout()
@@ -1350 +1336 @@
         // free pointers
         delete m_config;
-        delete m_highscoredb;
         delete m_evt_handler;
 }

trunk/src/MainFrame.h

@@ -25 +25 @@
 */
 
-#include "HighScoreTableDB.h"
 #include "ScoreDice.h"
 #include "dice_graphics.h"
@@ -88 +87 @@
         void PostScore(int id);
         void CalculateSubTotal();
-        int InitializeDatabase();
         void Relayout();
         void AddMenus();
@@ -109 +107 @@
         short int m_rollsundo; //holds the number of remaining rolls for use with the undo option
 
-        HighScoreTableDB *m_highscoredb; //handles the highscore database managment
-        
         bool m_skiproll; ///used to prevent the user from accidently rolling the dice twice
 

trunk/src/Makefile.am

@@ -10 +10 @@
         highscores_dialog.cpp \
         highscores_dialog.h \
-        HighScoreTableDB.cpp \
         icon.xpm \
         icon32.xpm \
@@ -50 +49 @@
         dice_graphics.h \
         dice_theme_dialog.h \
-        HighScoreTableDB.h \
         Icon.h \
         icon32.ico \

trunk/src/highscores_dialog.cpp

@@ -45 +45 @@
 void HighscoresDialog::createControls()
 {
-        highscoreslist = new wxListCtrl(this,wxID_ANY,wxDefaultPosition,wxSize(400,400),wxLC_REPORT);
+        highscoreslist = new wxListCtrl(this,wxID_ANY,wxDefaultPosition,wxSize(400,400),wxLC_REPORT | wxBORDER_SUNKEN );
 
         wxListItem itemCol;