Changeset 38

Timestamp:

09/01/07 20:56:05 (6 years ago)

Author:

guyru

Message:

check for updates support

Location:

trunk/OpenYahtzee

Files:

• TODO (modified) (1 diff)
• openyahtzee.kdevelop.pcs (modified) (previous)
• openyahtzee.kdevses (modified) (3 diffs)
• src/MainFrame.cpp (modified) (5 diffs)
• src/MainFrame.h (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (2 diffs)
• src/ObjectsID.h (modified) (1 diff)
• src/openyahtzee.cpp (modified) (1 diff)

trunk/OpenYahtzee/TODO

@@ -1 +1 @@
 TODO FILE
+
+DONE:
 -cleanup code at the end of every scoring button
 -cleanup code for the icon settings for the dialogs/frames

trunk/OpenYahtzee/openyahtzee.kdevses

@@ -2 +2 @@
 <!DOCTYPE KDevPrjSession>
 <KDevPrjSession>
- <DocsAndViews NumberOfDocuments="13" >
+ <DocsAndViews NumberOfDocuments="14" >
   <Doc0 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.h" >
    <View0 Type="Source" />
   </Doc0>
   <Doc1 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.cpp" >
-   <View0 line="30" Type="Source" />
+   <View0 Type="Source" />
   </Doc1>
   <Doc2 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.cpp" >
-   <View0 line="539" Type="Source" />
+   <View0 line="53" Type="Source" />
   </Doc2>
   <Doc3 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/ObjectsID.h" >
-   <View0 Type="Source" />
+   <View0 line="29" Type="Source" />
   </Doc3>
   <Doc4 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/MainFrame.h" >
-   <View0 line="71" Type="Source" />
+   <View0 line="51" Type="Source" />
   </Doc4>
   <Doc5 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/DBwrapper.h" >
@@ -25 +25 @@
   </Doc6>
   <Doc7 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDialog.cpp" >
-   <View0 Type="Source" />
+   <View0 line="27" Type="Source" />
   </Doc7>
   <Doc8 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/SettingsDB.cpp" >
@@ -34 +34 @@
   </Doc9>
   <Doc10 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.cpp" >
-   <View0 line="32" Type="Source" />
+   <View0 Type="Source" />
   </Doc10>
   <Doc11 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/Icon.h" >
-   <View0 line="34" Type="Source" />
+   <View0 Type="Source" />
   </Doc11>
   <Doc12 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/openyahtzee.rc" >
-   <View0 line="19" Type="Source" />
+   <View0 Type="Source" />
   </Doc12>
+  <Doc13 NumberOfViews="1" URL="file:///home/guy/workspace/OpenYahtzee/src/HighScoreDialog.h" >
+   <View0 line="0" Type="Source" />
+  </Doc13>
  </DocsAndViews>
  <pluginList>

trunk/OpenYahtzee/src/MainFrame.cpp

@@ -47 +47 @@
 
 //include the icon file
-#ifdef WIN32
-        #include "icon32.xpm"
-#else
-        #include "icon.xpm"
-#endif
+#include "Icon.h"
 
 //default values
 #define SPACE_SIZE 1
 #define DEF_HIGHSCORESIZE 16
+#define OY_VERSION "1.6.0"
 
 MainFrame::MainFrame(const wxString& title, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE)
@@ -61 +58 @@
 {
         //give the frame an icon
-#ifdef WIN32
-        SetIcon(wxIcon(icon32_xpm));
-#else
-        SetIcon(wxIcon(icon_xpm));
-#endif
+        SetIcon(wxIcon(ICON));
+
 
         std::ostringstream sstr;
@@ -102 +96 @@
         
         //insert menu items into menu Help
+        helpMenu->Append(ID_CHECK_FOR_UPDATES, wxT("&Check for Updates"),
+                        wxT("Check for new version of the game via the web"));
         helpMenu->Append(wxID_ABOUT, wxT("&About...\tF1"),
                         wxT("Show about dialog"));
@@ -224 +220 @@
         Connect(wxID_EXIT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnQuit));
         Connect(wxID_ABOUT, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnAbout));
+        Connect(ID_CHECK_FOR_UPDATES, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnCheckForUpdates));
         Connect(ID_NEWGAME, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnNewGame));
         Connect(ID_UNDO, wxEVT_COMMAND_MENU_SELECTED, wxCommandEventHandler(MainFrame::OnUndo));
@@ -256 +253 @@
         wxString msg;
         wxString sqliteversion = wxString(sqlite3_version,wxConvUTF8);
-        msg.Printf(wxT("OpenYahtzee 1.6\nCopyright (C) 2006 by Guy Rutenberg\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nOpenYahtzee was built against:\nwxWidgets %i.%i\n"),wxMAJOR_VERSION,wxMINOR_VERSION);
+        msg.Printf(wxT("OpenYahtzee %s\nCopyright (C) 2006 by Guy Rutenberg\n\nThis program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n\nOpenYahtzee was built against:\nwxWidgets %i.%i\n"),wxT(OY_VERSION),wxMAJOR_VERSION,wxMINOR_VERSION);
         msg += wxT("SQLite ") + sqliteversion;
                 
         wxMessageBox(msg, wxT("About Yahtzee"), wxOK | wxICON_INFORMATION, this);
+}
+
+void MainFrame::OnCheckForUpdates (wxCommandEvent& event){
+        
+        wxString path;
+        wxPathList path_list;
+        wxString link = wxT("http://openyahtzee.sourceforge.net/update.php?version=");
+        
+        link += wxT(OY_VERSION);
+
+        if (!wxLaunchDefaultBrowser(link)){
+                 //if builtin function doesn't work search for couple of browsers manually. see
+                 //http://linux-consulting.buanzo.com.ar/2006/05/wxwidgets-code-to-launch-browser.html
+
+                // variable declarations
+                wxArrayString browsers;
+                wxPathList path_list;
+                bool BrowserWasFound = false;
+                unsigned int i = 0;
+                wxString path;
+
+                // Add directories to wxPathList's search path from PATH environment variable
+                path_list.AddEnvList(wxT("PATH"));
+                
+                // Add browsers filenames. First item = most priority
+                browsers.Add(wxT("firefox"));
+                browsers.Add(wxT("firefox-bin"));
+                browsers.Add(wxT("mozilla"));
+                browsers.Add(wxT("mozilla-bin"));
+                browsers.Add(wxT("opera"));
+                browsers.Add(wxT("konqueror"));
+                browsers.Add(wxT("epiphany"));
+                
+                for (i = 0; i < browsers.GetCount(); i++) {
+                        path = path_list.FindAbsoluteValidPath(browsers[i]);
+                        if (path.IsEmpty()) {
+                                continue;
+                        } else {
+                                BrowserWasFound = true;
+                                break;
+                        }
+                }
+                
+                browsers.Clear();
+                
+                if (BrowserWasFound) {
+                        path += wxT(" ");
+                        path += link;
+                        ::wxExecute(path);
+                } else {
+                        wxMessageBox(wxT("No browser has been found."),wxT("OpenYahtzee"));
+                }
+        }
+
+
 }
 

trunk/OpenYahtzee/src/MainFrame.h

@@ -50 +50 @@
         void OnShowHighscore (wxCommandEvent& event);
         void OnSettings (wxCommandEvent& event);
+        void OnCheckForUpdates (wxCommandEvent& event);
 
         void OnRollButton (wxCommandEvent& event);

trunk/OpenYahtzee/src/Makefile.am

@@ -1 +1 @@
 bin_PROGRAMS = openyahtzee
 openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \
-                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
-                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm
+                                six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
+                                HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm \
+        openyahtzee.rc
 
 # set the include path found by configure
@@ -10 +11 @@
 
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-                        HighScoreDialog.h SettingsDialog.h Icon.h
+                                HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3

trunk/OpenYahtzee/src/Makefile.in

@@ -185 +185 @@
 target_alias = @target_alias@
 openyahtzee_SOURCES = openyahtzee.cpp MainFrame.cpp five.xpm four.xpm one.xpm \
-                        six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
-                        HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm
+                                six.xpm three.xpm two.xpm DBwrapper.cpp DBwrapper.h SettingsDB.cpp \
+                                HighScoreTableDB.cpp HighScoreDialog.cpp SettingsDialog.cpp icon.xpm icon32.xpm \
+        openyahtzee.rc
 
 
@@ -194 +195 @@
 # the library search path.
 noinst_HEADERS = MainFrame.h ObjectsID.h SettingsDB.h HighScoreTableDB.h \
-                        HighScoreDialog.h SettingsDialog.h Icon.h
+                                HighScoreDialog.h SettingsDialog.h Icon.h icon32.ico
 
 openyahtzee_LDFLAGS = `wx-config --libs` -lsqlite3

trunk/OpenYahtzee/src/ObjectsID.h

@@ -28 +28 @@
         ID_SHOWHIGHSCORE,
         ID_SETTINGS,
+        ID_CHECK_FOR_UPDATES,
         
         ID_ACES,

trunk/OpenYahtzee/src/openyahtzee.cpp

@@ -27 +27 @@
 #include "wx/wx.h"
 #include "MainFrame.h"
+// #ifdef WIN32 
+//      #include openyahtzee.rc
+// #endif