gbrainy r362 - in trunk/platforms: . win32 win32/src

[jmas svn gnome org]

Author: jmas
Date: Mon Jun  2 08:30:40 2008
New Revision: 362
URL: http://svn.gnome.org/viewvc/gbrainy?rev=362&view=rev

Log:
2008-06-02 Jordi Mas <jmas softcatala org>

        * win32/*: Updated for gbrainy 0.7



Added:
   trunk/platforms/win32/src/win32.patch
Modified:
   trunk/platforms/ChangeLog
   trunk/platforms/win32/README.TXT
   trunk/platforms/win32/src/Defines.cs
   trunk/platforms/win32/src/build.bat

Modified: trunk/platforms/win32/README.TXT
==============================================================================
--- trunk/platforms/win32/README.TXT	(original)
+++ trunk/platforms/win32/README.TXT	Mon Jun  2 08:30:40 2008
@@ -5,7 +5,7 @@
 *  The Experimental Combined Mono and Gtk# Installer for Win32
 Available at: http://forge.novell.com/modules/xfmod/project/?monowin32
 
-It contains the mono runtime and gtk# bindings
+It contains the mono run-time and gtk# bindings
 
 * NSIS 2.31 install system
 
@@ -17,7 +17,8 @@
 generate manually and that there are at subdirectory src/
 
 * A built Defines.cs for the win32 build
-* build.bat that builds the application
+* build.bat that builds the application
+* Apply the win32.patch to remove GNOME dependencies
 
 At /installer you have
 

Modified: trunk/platforms/win32/src/Defines.cs
==============================================================================
--- trunk/platforms/win32/src/Defines.cs	(original)
+++ trunk/platforms/win32/src/Defines.cs	Mon Jun  2 08:30:40 2008
@@ -22,7 +22,7 @@
 
 public class Defines
 {
-	public static string VERSION = "0.54";
+	public static string VERSION = "0.70";
 	public const string GNOME_LOCALE_DIR = "locale/";
 	public static string DATA_DIR = "";
 }

Modified: trunk/platforms/win32/src/build.bat
==============================================================================
--- trunk/platforms/win32/src/build.bat	(original)
+++ trunk/platforms/win32/src/build.bat	Mon Jun  2 08:30:40 2008
@@ -1,5 +1,5 @@
-copy ..\data\*80*.png .
-gmcs -target:winexe -out:gbrainy.exe -nowarn:0169 ArrayListIndicesRandom.cs GameManager.cs PuzzleCirclesRectangle.cs Game.cs PuzzleFigures.cs PuzzleMatrixNumbers.cs PuzzleMoveFigure.cs PuzzlePencil.cs PuzzleSquares.cs PuzzleTriangles.cs PuzzleCoverPercentage.cs PuzzleNumericSequence.cs PuzzleAlphabeticSequence.cs PuzzleSquareDots.cs PuzzleNumericRelation.cs PuzzleNextFigure.cs PuzzleSquareSheets.cs CalculationArithmetical.cs MemoryColouredFigures.cs GameSession.cs MemoryNumbers.cs Memory.cs MemoryColouredText.cs PuzzleCube.cs MemoryWords.cs PuzzleFigureLetter.cs CustomGameDialog.cs PuzzleDivideCircle.cs CalculationGreatestDivisor.cs CalculationTwoNumbers.cs CalculationWhichNumber.cs PuzzleMatrixGroups.cs PuzzleBalance.cs PuzzlePairs.cs PuzzleOstracism.cs MemoryCountDots.cs CalculationOperator.cs PuzzleFigurePattern.cs ColorPalette.cs PuzzlePeopleTable.cs GameDrawingArea.cs MemoryFigures.cs PuzzleMissingSlice.cs PuzzleLines.cs PuzzleTetris.cs PreferencesDialog.cs PuzzleMissin
 gPiece.cs MemoryIndications.cs PuzzleMostInCommon.cs PuzzleBuildTriangle.cs CairoContextEx.cs PuzzleClocks.cs gbrainy.cs Defines.cs -pkg:gtk-sharp-2.0  -pkg:gnome-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cairo.dll -r:Mono.Posix -resource:gbrainy.glade -resource:../data/resume-32.png -resource:../data/endgame-32.png -resource:../data/pause-32.png -resource:../data/allgames-32.png -resource:../data/gbrainy.png -resource:../data/logic-games-32.png -resource:../data/math-games-32.png -resource:../data/memory-games-32.png -resource:../data/gbrainy.svg
-
-
-
+copy ..\data\*80*.png .
+gmcs -target:winexe -out:gbrainy.exe -nowarn:0169 PuzzleFourSided.cs Preferences.cs GtkDialog.cs PlayerHistory.cs PlayerHistoryDialog.cs PuzzleSquaresAndLetters.cs PuzzleTrianglesWithNumbers.cs CalculationFractions.cs PuzzleCountCircles.cs PuzzleEquation.cs PuzzleQuadrilaterals.cs PuzzleCountSeries.cs PuzzleExtraCircle.cs  ArrayListIndicesRandom.cs GameManager.cs PuzzleCirclesRectangle.cs Game.cs PuzzleFigures.cs PuzzleMatrixNumbers.cs PuzzleMoveFigure.cs PuzzlePencil.cs PuzzleSquares.cs PuzzleTriangles.cs PuzzleCoverPercentage.cs PuzzleNumericSequence.cs PuzzleSquareDots.cs PuzzleNumericRelation.cs PuzzleNextFigure.cs PuzzleSquareSheets.cs CalculationArithmetical.cs MemoryColouredFigures.cs GameSession.cs MemoryNumbers.cs Memory.cs MemoryColouredText.cs PuzzleCube.cs MemoryWords.cs PuzzleFigureLetter.cs CustomGameDialog.cs PuzzleDivideCircle.cs CalculationGreatestDivisor.cs CalculationTwoNumbers.cs CalculationWhichNumber.cs PuzzleMatrixGroups.cs PuzzleBalance.cs PuzzleOstra
 cism.cs MemoryCountDots.cs CalculationOperator.cs PuzzleFigurePattern.cs ColorPalette.cs PuzzlePeopleTable.cs GameDrawingArea.cs MemoryFigures.cs PuzzleMissingSlice.cs PuzzleLines.cs PuzzleTetris.cs PreferencesDialog.cs PuzzleMissingPiece.cs MemoryIndications.cs PuzzleMostInCommon.cs PuzzleBuildTriangle.cs CairoContextEx.cs PuzzleClocks.cs gbrainy.cs Defines.cs -pkg:gnome-sharp-2.0 -pkg:gtk-sharp-2.0 -pkg:glade-sharp-2.0 -r:Mono.Cairo.dll -r:Mono.Posix -resource:gbrainy.glade -resource:../data/resume-32.png -resource:../data/endgame-32.png -resource:../data/pause-32.png -resource:../data/allgames-32.png -resource:../data/gbrainy.png -resource:../data/logic-games-32.png -resource:../data/math-games-32.png -resource:../data/memory-games-32.png -resource:../data/gbrainy.svg
+
+
+

Added: trunk/platforms/win32/src/win32.patch
==============================================================================
--- (empty file)
+++ trunk/platforms/win32/src/win32.patch	Mon Jun  2 08:30:40 2008
@@ -0,0 +1,99 @@
+Index: gbrainy.cs
+===================================================================
+--- gbrainy.cs	(revision 360)
++++ gbrainy.cs	(working copy)
+@@ -23,12 +23,11 @@
+ using Cairo;
+ using Gtk;
+ using Gdk;
+-using Gnome;
+ using Mono.Unix;
+ using System.Text;
+ 
+ 
+-public class gbrainy: Program
++public class gbrainy
+ {
+ 	[Glade.Widget("gbrainy")] Gtk.Window app_window;
+ 	[Glade.Widget] Box drawing_vbox;
+@@ -41,6 +40,14 @@
+ 	[Glade.Widget] Gtk.Statusbar statusbar;
+ 	[Glade.Widget] Gtk.Toolbar toolbar;
+ 	[Glade.Widget] Gtk.Label label_answser;
++	[Glade.Widget] Gtk.MenuItem menuitem3;
++	[Glade.Widget] Gtk.MenuItem menuitem4;
++	[Glade.Widget] Gtk.MenuItem menuitem5;
++	[Glade.Widget] Gtk.MenuItem menuitem6;
++	[Glade.Widget] Gtk.MenuItem menuitem7;	
++	[Glade.Widget] Gtk.MenuItem custom_game;
++	[Glade.Widget] Gtk.MenuItem toolbar_item;
++	[Glade.Widget] Gtk.MenuItem players_game_history;
+ 	GameDrawingArea drawing_area;
+ 	GameSession session;
+ 	const int ok_buttonid = -5;
+@@ -53,12 +60,10 @@
+ 	public static Preferences preferences = null;
+  
+ 	public gbrainy (string [] args, params object [] props)
+-	: base ("gbrainy", Defines.VERSION, Modules.UI,  args, props)
+ 	{
+ 		Gdk.Color color;
++		Gtk.Application.Init ();
+ 
+-		Catalog.Init ("gbrainy", Defines.GNOME_LOCALE_DIR);
+-
+ 		IconFactory icon_factory = new IconFactory ();
+                 AddIcon (icon_factory, "logic-games", "logic-games-32.png");
+ 		AddIcon (icon_factory, "math-games", "math-games-32.png");
+@@ -67,11 +72,24 @@
+ 		AddIcon (icon_factory, "resume", "resume-32.png");
+ 		AddIcon (icon_factory, "endgame", "endgame-32.png");
+ 		AddIcon (icon_factory, "allgames", "allgames-32.png");
+-		icon_factory.AddDefault ();
+-
+-		Glade.XML gXML = new Glade.XML (null, "gbrainy.glade", "gbrainy", null);
++		icon_factory.AddDefault ();		
++	
++		//libgnomeui-2.0.mo		
++		Catalog.Init ("libgnomeui-2.0", "mono/lib/locale");
++		Glade.XML gXML = new Glade.XML (null, "gbrainy.glade", "gbrainy", null);		
+ 		gXML.Autoconnect (this);
++		
++		Catalog.Init ("gbrainy", Defines.GNOME_LOCALE_DIR);
+ 
++		(((Gtk.Label)menuitem3.Child)).Text = Catalog.GetString ("All Games and Trainers (Logic, Mental Calculation and Memory)");
++		(((Gtk.Label)menuitem4.Child)).Text = Catalog.GetString ("Trainers Only (Mental Calculation and Memory)");
++		(((Gtk.Label)menuitem5.Child)).Text = Catalog.GetString ("Logic Puzzles Only");
++		(((Gtk.Label)menuitem6.Child)).Text = Catalog.GetString ("Mental Calculation Trainers Only");
++		(((Gtk.Label)menuitem7.Child)).Text = Catalog.GetString ("Memory Trainers Only");
++		(((Gtk.Label)custom_game.Child)).Text = Catalog.GetString ("Custom Game Selection...");
++		(((Gtk.Label)toolbar_item.Child)).Text = Catalog.GetString ("Toolbar");
++		(((Gtk.Label)players_game_history.Child)).Text = Catalog.GetString ("Player's Game History");
++
+ 		toolbar.IconSize = Gtk.IconSize.Dnd;
+ 	
+ 		Tooltips tooltips = new Tooltips ();
+@@ -315,12 +333,12 @@
+ 
+ 	void OnQuit (object sender, EventArgs args)
+ 	{
+-		Quit ();	
++		Gtk.Application.Quit ();
+ 	}	
+ 
+ 	void OnDeleteWindow (object sender, DeleteEventArgs args)
+ 	{
+-		Quit ();	
++		Gtk.Application.Quit ();
+ 	}	
+ 
+ 	void OnNextButtonClicked (object sender, EventArgs args)
+@@ -526,7 +544,7 @@
+ 		} catch {}
+ 
+ 		gbrainy gui = new gbrainy (args);
+-		gui.Run ();	
++		Gtk.Application.Run ();
+ 	}
+ }
+