Changeset 175

Timestamp:

10/05/2008 08:03:25 PM (4 years ago)

Author:

guyru

Message:

add resource file, fix score hint shade under Windows

Location:

trunk

Files:

• openyahtzee.sln (added)
• openyahtzee.vcproj (added)
• src/About.cpp (modified) (2 diffs)
• src/Icon.h (deleted)
• src/MainFrame.cpp (modified) (12 diffs)
• src/Makefile.am (modified) (3 diffs)
• src/highscores_dialog.cpp (modified) (2 diffs)
• src/icon32.ico (deleted)
• src/icon64.xpm (moved) (moved from trunk/src/icon.xpm) (1 diff)
• src/openyahtzee.ico (added)
• src/openyahtzee.rc (added)
• src/settings_dialog.cpp (modified) (2 diffs)

trunk/src/About.cpp

@@ -22 +22 @@
 
 #include "About.h"
-#include "icon.xpm"
+#include "icon64.xpm"
 
 
@@ -36 +36 @@
         //wxImage tempimage = logo->ConvertToImage();
         wxBitmap *logo = new wxBitmap; 
-        *logo = wxBitmap(icon_xpm);
+        *logo = wxBitmap(icon64_xpm);
         
         notebook_main = new wxNotebook(this, -1, wxDefaultPosition, wxDefaultSize, 0);

trunk/src/MainFrame.cpp

@@ -52 +52 @@
  } // namespace dice
 
-//include the icon file
-#include "Icon.h"
+#include "icon32.xpm"
 
 //default values - design
@@ -75 +74 @@
 {
         //give the frame an icon
-        SetIcon(wxIcon(ICON));
+        SetIcon(wxIcon(icon32_xpm));
 
         /* Check if there is configuration file under old-name and
@@ -674 +673 @@
         
                 out.Printf(wxT("%i"),temp);
-                ((wxTextCtrl*) FindWindow(event.GetId() - ID_ACES + ID_ACESTEXT))->SetValue(out);
-                ((wxTextCtrl*) FindWindow(event.GetId() - ID_ACES + ID_ACESTEXT))->SetBackgroundColour(*wxWHITE);
+                wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(event.GetId() - ID_ACES + ID_ACESTEXT));
+                text_ctrl->SetValue(out);
+                text_ctrl->SetBackgroundColour(*wxWHITE);
+                text_ctrl->Refresh();
                 
                 PostScore(event.GetId());
@@ -697 +698 @@
         
         out.Printf(wxT("%i"),m_score_dice.ThreeOfAKind());
-        ((wxTextCtrl*) FindWindow(ID_THREEOFAKINDTEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_THREEOFAKINDTEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_THREEOFAKINDTEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
         
         PostScore(event.GetId());
@@ -717 +720 @@
 
         out.Printf(wxT("%i"),m_score_dice.FourOfAKind());
-        ((wxTextCtrl*) FindWindow(ID_FOUROFAKINDTEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_FOUROFAKINDTEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_FOUROFAKINDTEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
         
         PostScore(event.GetId());
@@ -738 +743 @@
 
         out.Printf(wxT("%i"), m_score_dice.FullHouse());
-        ((wxTextCtrl*) FindWindow(ID_FULLHOUSETEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_FULLHOUSETEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_FULLHOUSETEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
         
         PostScore(event.GetId());
@@ -760 +767 @@
         
         out.Printf(wxT("%i"), m_score_dice.SmallSequence());
-        ((wxTextCtrl*) FindWindow(ID_SMALLSEQUENCETEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_SMALLSEQUENCETEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_SMALLSEQUENCETEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
         
         PostScore(event.GetId());
@@ -782 +791 @@
 
         out.Printf(wxT("%i"), m_score_dice.LargeSequence());
-        ((wxTextCtrl*) FindWindow(ID_LARGESEQUENCETEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_LARGESEQUENCETEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_LARGESEQUENCETEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
+
         
         PostScore(event.GetId());
@@ -803 +815 @@
         if (m_score_dice.IsYahtzee()) m_yahtzee = true;
         out.Printf(wxT("%i"), m_score_dice.Yahtzee());
-        ((wxTextCtrl*) FindWindow(ID_YAHTZEETEXT))->SetValue(out);
-        ((wxTextCtrl*) FindWindow(ID_YAHTZEETEXT))->SetBackgroundColour(*wxWHITE);
+        wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_YAHTZEETEXT));
+        text_ctrl->SetValue(out);
+        text_ctrl->SetBackgroundColour(*wxWHITE);
+        text_ctrl->Refresh();
 
         PostScore(event.GetId());
@@ -821 +835 @@
         
                 out.Printf(wxT("%i"),m_score_dice.Chance());
-                ((wxTextCtrl*) FindWindow(ID_CHANCETEXT))->SetValue(out);
-                ((wxTextCtrl*) FindWindow(ID_CHANCETEXT))->SetBackgroundColour(*wxWHITE);
-                
+                wxTextCtrl *text_ctrl = dynamic_cast<wxTextCtrl*>(FindWindow(ID_CHANCETEXT));
+                text_ctrl->SetValue(out);
+                text_ctrl->SetBackgroundColour(*wxWHITE);
+                text_ctrl->Refresh();
                 PostScore(event.GetId());
         }
@@ -981 +996 @@
 void MainFrame::HighScoreHandler(int score)
 {
-        int place;
         std::string name,date;
         wxCommandEvent newevent;
@@ -990 +1004 @@
         }
         
-        wxString msg;
-        msg.Printf(wxT("Your score made it to the high score table.\nPlease enter your name below:"),place);
+        wxString msg = wxT("Your score made it to the high score table.\nPlease enter your name below:");
 
         wxString last_name = wxString::FromUTF8(m_config->get("last-name").c_str());

trunk/src/Makefile.am

@@ -9 +9 @@
         highscores_dialog.cpp \
         highscores_dialog.h \
-        icon.xpm \
         icon32.xpm \
+        icon64.xpm \
         openyahtzee.cpp \
         settings_dialog.cpp \
@@ -33 +33 @@
         About.h \
         DBwrapper.h \
-        Icon.h \
-        icon32.ico \
+        openyahtzee.ico \
         MainFrame.h \
         ObjectsID.h \
@@ -40 +39 @@
         wxDynamicBitmap.h \
         ../openyahtzee.vcproj \
-        ../openyahtzee.sln
+        ../openyahtzee.sln \
+        openyahtzee.ico \
+        openyahtzee.rc
 
 AM_CXXFLAGS = `wx-config --cxxflags`

trunk/src/highscores_dialog.cpp

@@ -24 +24 @@
 #include "highscores_dialog.h"
 
-#include "Icon.h"
+#include "icon32.xpm"
 
 using namespace std;
@@ -35 +35 @@
         m_config = config;
 
-        SetIcon(wxIcon(ICON));
+        SetIcon(wxIcon(icon32_xpm));
 
         createControls();

trunk/src/icon64.xpm

@@ -1 +1 @@
 /* XPM */
-static char *icon_xpm[] = {
+static char *icon64_xpm[] = {
 /* columns rows colors chars-per-pixel */
 "64 64 256 2",

trunk/src/settings_dialog.cpp

@@ -20 +20 @@
 
 #include "settings_dialog.h"
-#include "Icon.h"
+#include "icon32.xpm"
 
 using namespace settings_dialog;
@@ -28 +28 @@
 {
 
-        SetIcon(wxIcon(ICON));
+        SetIcon(wxIcon(icon32_xpm));
 
         m_config = config;