gcompris r3694 - in branches/gcomprixogoo: . boards/skins/gartoon src/wordprocessor-activity src/wordprocessor-activity/resources src/wordprocessor-activity/resources/wordprocessor

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Jan 25 23:46:07 2009
New Revision: 3694
URL: http://svn.gnome.org/viewvc/gcompris?rev=3694&view=rev

Log:
Fixed wordprocessor activity.
removed the no more use skin file compris-shapebg.jpg


Added:
   branches/gcomprixogoo/src/wordprocessor-activity/resources/Makefile.am
   branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/
   branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/Makefile.am
   branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/tool-load.png   (contents, props changed)
   branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/tool-save.png   (contents, props changed)
Removed:
   branches/gcomprixogoo/boards/skins/gartoon/gcompris-shapebg.jpg
Modified:
   branches/gcomprixogoo/configure.in
   branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c

Modified: branches/gcomprixogoo/configure.in
==============================================================================
--- branches/gcomprixogoo/configure.in	(original)
+++ branches/gcomprixogoo/configure.in	Sun Jan 25 23:46:07 2009
@@ -810,6 +810,8 @@
 src/watercycle-activity/resources/Makefile
 src/watercycle-activity/resources/watercycle/Makefile
 src/wordprocessor-activity/Makefile
+src/wordprocessor-activity/resources/Makefile
+src/wordprocessor-activity/resources/wordprocessor/Makefile
 src/wordsgame-activity/Makefile
 ])
 

Added: branches/gcomprixogoo/src/wordprocessor-activity/resources/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/wordprocessor-activity/resources/Makefile.am	Sun Jan 25 23:46:07 2009
@@ -0,0 +1 @@
+SUBDIRS = wordprocessor

Added: branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/Makefile.am
==============================================================================
--- (empty file)
+++ branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/Makefile.am	Sun Jan 25 23:46:07 2009
@@ -0,0 +1,6 @@
+imgdir = $(pkgdatadir)/@PACKAGE_DATA_DIR@/anim
+img_DATA = \
+	tool-load.png \
+	tool-save.png
+
+EXTRA_DIST = $(img_DATA)

Added: branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/tool-load.png
==============================================================================
Binary file. No diff available.

Added: branches/gcomprixogoo/src/wordprocessor-activity/resources/wordprocessor/tool-save.png
==============================================================================
Binary file. No diff available.

Modified: branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c
==============================================================================
--- branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c	(original)
+++ branches/gcomprixogoo/src/wordprocessor-activity/wordprocessor.c	Sun Jan 25 23:46:07 2009
@@ -166,7 +166,7 @@
 #define word_area_x1 120
 #define word_area_y1 20
 #define word_area_width 650
-#define word_area_height 430
+#define word_area_height 485
 
 #define combo_style_x1 5
 #define combo_style_width 105
@@ -247,19 +247,15 @@
 
   if(agcomprisBoard!=NULL)
     {
-      gchar *img;
-
       gcomprisBoard=agcomprisBoard;
       gcomprisBoard->level=1;
       gcomprisBoard->maxlevel=1;
       gcomprisBoard->sublevel=1;
       gcomprisBoard->number_of_sublevel=1; /* Go to next level after this number of 'play' */
       gc_bar_set(0);
+      gc_bar_location(10, -1, 0.6);
 
-      img = gc_skin_image_get("gcompris-shapebg.jpg");
-      gc_set_background(goo_canvas_get_root_item(gcomprisBoard->canvas),
-			      img);
-      g_free(img);
+      gc_set_default_background(goo_canvas_get_root_item(gcomprisBoard->canvas));
 
       wordprocessor_create();
 
@@ -361,7 +357,7 @@
   /*
    * The save button
    */
-  pixmap = gc_skin_pixmap_load("draw/tool-save.png");
+  pixmap = gc_pixmap_load("wordprocessor/tool-save.png");
   item = \
     goo_canvas_image_new (boardRootItem,
 			  pixmap,
@@ -377,7 +373,7 @@
   /*
    * The load button
    */
-  pixmap = gc_skin_pixmap_load("draw/tool-load.png");
+  pixmap = gc_pixmap_load("wordprocessor/tool-load.png");
   item = \
     goo_canvas_image_new (boardRootItem,
 			  pixmap,