GNOME.org
 

gcompris r3741 - in trunk: . boards boards/babyshapes src/boards src/boards/python/admin src/gcompris

Author: bcoudoin
Date: Tue Feb 24 23:30:48 2009
New Revision: 3741
URL: http://svn.gnome.org/viewvc/gcompris?rev=3741&view=rev

Log:
	- Fixed strings:
	* boards/babyshapes.xml.in:
	* boards/babyshapes/board8_1.xml.in:
	* boards/babyshapes/board8_4.xml.in:
	* src/boards/reading.c: (reading_create_item):
	* src/gcompris/board_config_wordlist.c: (gc_board_config_wordlist):

	- Fixed bug, the configuration was crashing uppon startup from the admin mode
	* src/boards/missingletter.c: (_init), (start_board),
	(config_start):
	* src/boards/missingletter_config.c:
	* src/boards/python/admin/board_list.py:



Modified:
   trunk/ChangeLog
   trunk/boards/babyshapes.xml.in
   trunk/boards/babyshapes/board8_1.xml.in
   trunk/boards/babyshapes/board8_4.xml.in
   trunk/src/boards/missingletter.c
   trunk/src/boards/missingletter_config.c
   trunk/src/boards/python/admin/board_list.py
   trunk/src/boards/reading.c
   trunk/src/gcompris/board_config_wordlist.c

Modified: trunk/boards/babyshapes.xml.in
==============================================================================
--- trunk/boards/babyshapes.xml.in	(original)
+++ trunk/boards/babyshapes.xml.in	Tue Feb 24 23:30:48 2009
@@ -13,10 +13,10 @@
 	 <_prerequisite>Good mouse-control</_prerequisite>
 	<_credit xml:space="preserve">The dog is provided by Andre Connes and released under the GPL.
 Artist: Gauguin, Paul. Title Arearea. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Paul_Gauguin_006.jpg
-Artist: Bruegel d. Ã. Title: Bauernhochzeit. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Pieter_Bruegel_d._Ã._011.jpg
-Description: The Lady and the Unicorn (tapestries). Author: Pierre-Emmanuel Malissin et frÃdÃric Valdes. Licence: Free but requires the site and author. Source: http://www.galerie.roi-president.com
+Artist: Pieter Bruegel the Elder. Title: The peasants wedding. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Pieter_Bruegel_d._Ã._011.jpg
+Description: The Lady and the Unicorn (tapestries). Author: Pierre-Emmanuel Malissin and FrÃdÃric Valdes. Licence: Free but requires the site and author. Source: http://www.galerie.roi-president.com
 Artist: Vincent van Gogh. Title: Bedroom in Arles. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Vincent_Van_Gogh_0011.jpg
-Artist: Ambrosius Bosschaert. Title: The Elder. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Ambrosius_Bosschaert,_the_Elder_04.jpg</_credit>
+Artist: Ambrosius Bosschaert the Elder. Title: Flower Still Life. Licence: Public Domain. Source: http://commons.wikimedia.org/wiki/Image:Ambrosius_Bosschaert,_the_Elder_04.jpg</_credit>
 	<_manual>Complete the puzzle by dragging each piece from the set of pieces on the left, to the matching space in the puzzle.</_manual>
   </Board>
 </GCompris>

Modified: trunk/boards/babyshapes/board8_1.xml.in
==============================================================================
--- trunk/boards/babyshapes/board8_1.xml.in	(original)
+++ trunk/boards/babyshapes/board8_1.xml.in	Tue Feb 24 23:30:48 2009
@@ -2,7 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <!-- Source http://commons.wikimedia.org/wiki/Image:Pieter_Bruegel_d._%C3%84._011.jpg -->
 <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
-<_name>Pieter Bruegel, Bauernhochzeit - 1568</_name></title>
+<_name>Pieter Bruegel the Elder, The peasants wedding - 1568</_name></title>
 <shape name="service" pixmapfile="babyshapes/Pieter_Bruegel/service.png" position="0" x="533.0" y="324.0">
 </shape>
 <shape name="Mur" pixmapfile="babyshapes/Pieter_Bruegel/mur.png" position="0" x="664.5" y="81.5">

Modified: trunk/boards/babyshapes/board8_4.xml.in
==============================================================================
--- trunk/boards/babyshapes/board8_4.xml.in	(original)
+++ trunk/boards/babyshapes/board8_4.xml.in	Tue Feb 24 23:30:48 2009
@@ -2,7 +2,7 @@
 <ShapeGame><!-- Created with GComprisShapegame gimp script -->
 <!-- Source http://commons.wikimedia.org/wiki/Image:Ambrosius_Bosschaert,_the_Elder_04.jpg -->
 <title justification="GTK_JUSTIFY_CENTER" x="600" y="495">
-<_name>Ambrosius Bosschaert, The Elder - 1614</_name></title>
+<_name>Ambrosius Bosschaert the Elder, Flower Still Life - 1614</_name></title>
 <shape name="6" pixmapfile="babyshapes/Bosschaert_04/6.png" position="0"  x="356.5" y="376.0">
 </shape>
 <shape name="5" pixmapfile="babyshapes/Bosschaert_04/5.png" position="0"  x="434.0" y="160.0">

Modified: trunk/src/boards/missingletter.c
==============================================================================
--- trunk/src/boards/missingletter.c	(original)
+++ trunk/src/boards/missingletter.c	Tue Feb 24 23:30:48 2009
@@ -140,12 +140,31 @@
   board_paused = pause;
 }
 
+static void _init(GcomprisBoard *agcomprisBoard)
+{
+  gchar * filename;
+  gcomprisBoard_missing->level=1;
+
+  /* Calculate the maxlevel based on the available data file for this board */
+  gcomprisBoard_missing->maxlevel = 1;
+  while((filename = gc_file_find_absolute("%s/board%d.xml",
+					  gcomprisBoard_missing->boarddir,
+					  ++gcomprisBoard_missing->maxlevel)))
+    g_free(filename);
+
+  gcomprisBoard_missing->maxlevel--;
+
+  gcomprisBoard_missing->sublevel=1;
+  gcomprisBoard_missing->number_of_sublevel=G_MAXINT;
+
+  init_xml();
+}
+
 /*
  */
 static void start_board (GcomprisBoard *agcomprisBoard)
 {
   GHashTable *config = gc_db_get_board_conf();
-  gchar * filename;
 
   gc_locale_set(g_hash_table_lookup( config, "locale"));
 
@@ -156,20 +175,7 @@
       gcomprisBoard_missing=agcomprisBoard;
       gc_set_background(gnome_canvas_root(gcomprisBoard_missing->canvas),
 			"opt/missingletter-bg.jpg");
-      gcomprisBoard_missing->level=1;
-
-      /* Calculate the maxlevel based on the available data file for this board */
-      gcomprisBoard_missing->maxlevel = 1;
-      while((filename = gc_file_find_absolute("%s/board%d.xml",
-      	gcomprisBoard_missing->boarddir, ++gcomprisBoard_missing->maxlevel)))
-	  g_free(filename);
-
-      gcomprisBoard_missing->maxlevel--;
-
-      gcomprisBoard_missing->sublevel=1;
-      gcomprisBoard_missing->number_of_sublevel=G_MAXINT;
-
-      init_xml();
+      _init(agcomprisBoard);
       gc_bar_set(GC_BAR_CONFIG | GC_BAR_LEVEL);
 
       missing_letter_next_level();
@@ -760,13 +766,18 @@
 
 static void
 config_start(GcomprisBoard *agcomprisBoard,
-		    GcomprisProfile *aProfile)
+	     GcomprisProfile *aProfile)
 {
   board_conf = agcomprisBoard;
   profile_conf = aProfile;
 
   if (gcomprisBoard_missing)
     pause_board(TRUE);
+  else
+    {
+      gcomprisBoard_missing=agcomprisBoard;
+      _init(agcomprisBoard);
+    }
 
   gchar *label = g_strdup_printf(_("<b>%s</b> configuration\n for profile <b>%s</b>"),
 				 agcomprisBoard->name,

Modified: trunk/src/boards/missingletter_config.c
==============================================================================
--- trunk/src/boards/missingletter_config.c	(original)
+++ trunk/src/boards/missingletter_config.c	Tue Feb 24 23:30:48 2009
@@ -443,7 +443,7 @@
     gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 8);
 
     /* combo level */
-    label = gtk_label_new(_("Choice of the level"));
+    label = gtk_label_new(_("Level:"));
     gtk_widget_show(label);
     gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
 
@@ -541,7 +541,7 @@
     gtk_widget_show(label);
     gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, 0, 1);
 
-    pixmap = gtk_file_chooser_button_new(_("Choice of the filename"),
+    pixmap = gtk_file_chooser_button_new(_("Filename:"),
                                          GTK_FILE_CHOOSER_ACTION_OPEN);
 
     file_filter = gtk_file_filter_new();

Modified: trunk/src/boards/python/admin/board_list.py
==============================================================================
--- trunk/src/boards/python/admin/board_list.py	(original)
+++ trunk/src/boards/python/admin/board_list.py	Tue Feb 24 23:30:48 2009
@@ -382,6 +382,8 @@
     print 'preference', board.title
 
   def row_selected(self, treeview,  model):
+    if treeview.get_selection().count_selected_rows() != 1:
+      return
     path = model.get_path(treeview.get_selection().get_selected()[1])
     print "Row selected:", model[path][3]
 

Modified: trunk/src/boards/reading.c
==============================================================================
--- trunk/src/boards/reading.c	(original)
+++ trunk/src/boards/reading.c	Tue Feb 24 23:30:48 2009
@@ -459,7 +459,7 @@
 
   if(word==NULL)
   {
-  	gc_dialog(_("We skip this level because there are not enough words in the list !"),
+  	gc_dialog(_("We skip this level because there are not enough words in the list!"),
 		(DialogBoxCallBack)reading_next_level);
 	gcomprisBoard->level++;
 	if(gcomprisBoard->level>gcomprisBoard->maxlevel) // the current board is finished : bail out

Modified: trunk/src/gcompris/board_config_wordlist.c
==============================================================================
--- trunk/src/gcompris/board_config_wordlist.c	(original)
+++ trunk/src/gcompris/board_config_wordlist.c	Tue Feb 24 23:30:48 2009
@@ -206,7 +206,7 @@
 
 	gtk_widget_show(combo_lang);
 	hbox = gtk_hbox_new(FALSE, 8);
-	label = gtk_label_new(_("Choice of the language"));
+	label = gtk_label_new(_("Language:"));
 	gtk_widget_show(label);
 	gtk_widget_show(hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
@@ -218,7 +218,7 @@
 
 	gtk_widget_show(combo_level);
 	hbox = gtk_hbox_new(FALSE, 8);
-	label = gtk_label_new(_("Choice of the level"));
+	label = gtk_label_new(_("Level:"));
 	gtk_widget_show(label);
 	gtk_widget_show(hbox);
 	gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 8);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]