gcompris r3728 - in branches/GCOMPRIS_8_3: . po src/boards src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Thu Feb 19 23:34:22 2009
New Revision: 3728
URL: http://svn.gnome.org/viewvc/gcompris?rev=3728&view=rev

Log:
	- Merged 3727 from trunk


Removed:
   branches/GCOMPRIS_8_3/create_dist_sounds
   branches/GCOMPRIS_8_3/gcompris.spec.in
Modified:
   branches/GCOMPRIS_8_3/   (props changed)
   branches/GCOMPRIS_8_3/ChangeLog
   branches/GCOMPRIS_8_3/po/POTFILES.in
   branches/GCOMPRIS_8_3/po/fr.po
   branches/GCOMPRIS_8_3/src/boards/missingletter_config.c
   branches/GCOMPRIS_8_3/src/boards/reading.c
   branches/GCOMPRIS_8_3/src/gcompris/gcompris.c
   branches/GCOMPRIS_8_3/src/gcompris/log.c

Modified: branches/GCOMPRIS_8_3/po/POTFILES.in
==============================================================================
--- branches/GCOMPRIS_8_3/po/POTFILES.in	(original)
+++ branches/GCOMPRIS_8_3/po/POTFILES.in	Thu Feb 19 23:34:22 2009
@@ -66,15 +66,15 @@
 boards/chronos/board4_1.xml.in
 boards/chronos/board4_2.xml.in
 boards/chronos/board4_3.xml.in
-boards/clickanddraw.xml.in
 boards/click_on_letter.xml.in
+boards/clickanddraw.xml.in
 boards/clickgame.xml.in
 boards/clockgame.xml.in
 boards/colors.xml.in
 boards/colors_group.xml.in
 boards/computer.xml.in
-boards/connect4.xml.in
 boards/connect4-2players.xml.in
+boards/connect4.xml.in
 boards/crane.xml.in
 boards/discovery.xml.in
 boards/doubleclick.xml.in
@@ -87,8 +87,8 @@
 boards/electric.xml.in
 boards/enumerate.xml.in
 boards/erase.xml.in
-boards/erase_doubleclick.xml.in
 boards/erase_clic.xml.in
+boards/erase_doubleclick.xml.in
 boards/experience.xml.in
 boards/experimental.xml.in
 boards/fifteen.xml.in
@@ -138,8 +138,8 @@
 boards/keyboard.xml.in
 boards/leftright.xml.in
 boards/login.xml.in
-boards/magic_hat_plus.xml.in
 boards/magic_hat_minus.xml.in
+boards/magic_hat_plus.xml.in
 boards/math.xml.in
 boards/maze.xml.in
 boards/maze2DRelative.xml.in
@@ -172,6 +172,9 @@
 boards/miscelaneous.xml.in
 boards/missing_letter.xml.in
 boards/missing_letter/board1.xml.in
+boards/missing_letter/board2.xml.in
+boards/missing_letter/board3.xml.in
+boards/missing_letter/board4.xml.in
 boards/money.xml.in
 boards/money_cents.xml.in
 boards/mosaic.xml.in
@@ -214,8 +217,8 @@
 boards/traffic.xml.in
 boards/tuxpaint.xml.in
 boards/watercycle.xml.in
-boards/wordsgame.xml.in
 boards/wordprocessor.xml.in
+boards/wordsgame.xml.in
 gcompris-edit.desktop.in
 gcompris.desktop.in
 src/boards/advanced_colors.c
@@ -241,6 +244,7 @@
 src/boards/memory.c
 src/boards/menu2.c
 src/boards/missingletter.c
+src/boards/missingletter_config.c
 src/boards/money.c
 src/boards/paratrooper.c
 src/boards/planegame.c
@@ -264,14 +268,14 @@
 src/boards/python/admin/user_list.py
 src/boards/python/admin/wordlist.py
 src/boards/python/anim.py
-src/boards/python/doubleclick.py
 src/boards/python/chat.py
+src/boards/python/doubleclick.py
 src/boards/python/electric.py
 src/boards/python/gnumch.py
 src/boards/python/guessnumber.py
 src/boards/python/login.py
-src/boards/python/mosaic.py
 src/boards/python/melody.py
+src/boards/python/mosaic.py
 src/boards/python/pythontest.py
 src/boards/python/redraw.py
 src/boards/python/searace.py
@@ -287,12 +291,14 @@
 src/boards/superbrain.c
 src/boards/target.c
 src/boards/traffic.c
-src/boards/wordsgame.c
 src/boards/wordprocessor.c
+src/boards/wordsgame.c
 src/gcompris/about.c
 src/gcompris/bar.c
 src/gcompris/board.c
 src/gcompris/board_config.c
+src/gcompris/board_config_combo.c
+src/gcompris/board_config_wordlist.c
 src/gcompris/bonus.c
 src/gcompris/config.c
 src/gcompris/dialog.c

Modified: branches/GCOMPRIS_8_3/src/boards/missingletter_config.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/missingletter_config.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/missingletter_config.c	Thu Feb 19 23:34:22 2009
@@ -387,7 +387,7 @@
 
   /* pixbuf column */
   renderer = gtk_cell_renderer_pixbuf_new();
-  column = gtk_tree_view_column_new_with_attributes(_("Pixbuf"),
+  column = gtk_tree_view_column_new_with_attributes(_("Picture"),
                                                     renderer, "pixbuf", PIXBUF_COLUMN, NULL);
   gtk_tree_view_append_column(treeview, column);
 
@@ -409,9 +409,9 @@
                                                     renderer, "text", CHOICE_COLUMN, NULL);
   gtk_tree_view_append_column(treeview, column);
 #if 0
-  /* pixmap column */
+  /* pixmap column (debug only)*/
   renderer = gtk_cell_renderer_text_new();
-  column = gtk_tree_view_column_new_with_attributes(_("Pixmap"),
+  column = gtk_tree_view_column_new_with_attributes("File"),
                                                     renderer, "text", PIXMAP_COLUMN, NULL);
   gtk_tree_view_append_column(treeview, column);
 #endif

Modified: branches/GCOMPRIS_8_3/src/boards/reading.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/reading.c	(original)
+++ branches/GCOMPRIS_8_3/src/boards/reading.c	Thu Feb 19 23:34:22 2009
@@ -214,7 +214,7 @@
 
 
 
-      
+
 
       gc_wordlist = gc_wordlist_get_from_file("wordsgame/default-$LOCALE.xml");
 
@@ -231,16 +231,16 @@
 	    }
 	}
 
-      
-      currentMode=MODE_VERTICAL; // Default mode 
+
+      currentMode=MODE_VERTICAL; // Default mode
       if(gcomprisBoard->mode && g_strcasecmp(gcomprisBoard->mode, "horizontal")==0)
         {
-          if (pango_unichar_direction(g_utf8_get_char(gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level))) == PANGO_DIRECTION_RTL)	
+          if (pango_unichar_direction(g_utf8_get_char(gc_wordlist_random_word_get(gc_wordlist, gcomprisBoard->level))) == PANGO_DIRECTION_RTL)
               currentMode=MODE_HORIZONTAL_RTL;
           else
                currentMode=MODE_HORIZONTAL;
         }
-   
+
        reading_next_level();
     }
 }
@@ -460,7 +460,7 @@
 
   if(word==NULL)
   {
-  	gc_dialog(_("Skip this level. Not enough word 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: branches/GCOMPRIS_8_3/src/gcompris/gcompris.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris.c	Thu Feb 19 23:34:22 2009
@@ -1792,7 +1792,7 @@
       printf("   Server '%s'\n", properties->server);
 #else
       printf(_("The --server option cannot be used because"
-	       "GCompris has been compiled without network support!"));
+	       " GCompris has been compiled without network support!"));
       exit(1);
 #endif
   }

Modified: branches/GCOMPRIS_8_3/src/gcompris/log.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/log.c	(original)
+++ branches/GCOMPRIS_8_3/src/gcompris/log.c	Thu Feb 19 23:34:22 2009
@@ -95,7 +95,8 @@
   /* Prepare our log */
 
   /* The default format for time represenation.  See strftime(3) */
-  char *fmt = "%F %T";
+  /* Warning %F not supported on Windows */
+  char *fmt = "%Y-%m-%d %H:%M:%S";
 
   char buf[256];