Changeset 137 for trunk/src

Timestamp:

01/13/2008 03:28:16 PM (4 years ago)

Author:

guyru

Message:

added theme dialog

Location:

trunk/src

Files:

• MainFrame.cpp (modified) (5 diffs)
• MainFrame.h (modified) (2 diffs)
• Makefile.am (modified) (2 diffs)
• ObjectsID.h (modified) (1 diff)
• dice_theme_dialog.cpp (added)
• dice_theme_dialog.h (added)

trunk/src/MainFrame.cpp

@@ -1 +1 @@
 // $Header$
 /***************************************************************************
- *   Copyright (C) 2006-2007 by Guy Rutenberg   *
+ *   Copyright (C) 2006-2008 by Guy Rutenberg   *
  *   guyrutenberg@gmail.com   *
  *                                                                         *
@@ -34 +34 @@
 #include "HighScoreDialog.h"
 #include "SettingsDialog.h"
+#include "dice_theme_dialog.h"
 #include "About.h"
 #include "UtilityFunctions.h"
@@ -136 +137 @@
         gameMenu->Append(ID_SHOWHIGHSCORE,wxT("High &Scores"),wxT("Show high-scores table"));
         gameMenu->Append(ID_SETTINGS,wxT("Settings"),wxT("Show settings dialog"));
+        gameMenu->Append(ID_THEMES,wxT("Dice Theme..."),wxT("Select a dice theme"));
         gameMenu->Append(wxID_EXIT, wxT("E&xit\tAlt-X"),
                         wxT("Quit this program"));
@@ -333 +335 @@
         Connect(ID_SHOWHIGHSCORE, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnShowHighscore));
         Connect(ID_SETTINGS, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnSettings));
+        Connect(ID_THEMES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnDiceTheme));
         //END connecting the menu items' events
 
@@ -577 +580 @@
                 Relayout();
         }
+}
+
+/**
+ * Shows the dice theme selection dialog. This event-handler is connected to
+ * Game->Dice Theme menu item.
+ * \param event 
+ */
+void MainFrame::OnDiceTheme( wxCommandEvent& event)
+{
+        DiceThemeDialog *dialog = new DiceThemeDialog(this,wxID_ANY);
+
+        if(dialog->ShowModal()!=wxID_OK)
+                return;
+
 }
 

trunk/src/MainFrame.h

@@ -1 +1 @@
 // $Header$
 /***************************************************************************
- *   Copyright (C) 2006-2007 by Guy Rutenberg   *
+ *   Copyright (C) 2006-2008 by Guy Rutenberg   *
  *   guyrutenberg@gmail.com   *
  *                                                                         *
@@ -52 +52 @@
         void OnShowHighscore (wxCommandEvent& event);
         void OnSettings (wxCommandEvent& event);
+        void OnDiceTheme( wxCommandEvent& event);
         void OnCheckForUpdates (wxCommandEvent& event);
         void OnSendComment (wxCommandEvent& event);

trunk/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = openyahtzee
 openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp DBwrapper.cpp \
-        SettingsDB.cpp HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp \
-        icon.xpm icon32.xpm wxDynamicBitmap.cpp About.cpp \
-        UtilityFunctions.cpp ScoreDice.cpp dice_graphics.cpp
+        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp \
+        SettingsDB.cpp icon.xpm icon32.xpm wxDynamicBitmap.cpp About.cpp \
+        UtilityFunctions.cpp ScoreDice.cpp dice_graphics.cpp \
+        dice_theme_dialog.cpp
 
 # set the include path found by configure
@@ -20 +21 @@
         HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico wxDynamicBitmap.h \
         About.h UtilityFunctions.h ScoreDice.h dice_graphics.h DBwrapper.h \
-        $(dice_graphics)
+        dice_theme_dialog.h $(dice_graphics)
 
 AM_CXXFLAGS = `wx-config --cxxflags`

trunk/src/ObjectsID.h

@@ -28 +28 @@
         ID_SHOWHIGHSCORE,
         ID_SETTINGS,
+        ID_THEMES,
         ID_CHECK_FOR_UPDATES,
         ID_SENDCOMMENT,