diff options
| author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-10-03 19:49:02 (GMT) |
|---|---|---|
| committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2005-10-03 19:49:02 (GMT) |
| commit | 4bcd799bb59994f147f32d1542d9e9cdbed7f4cb (patch) | |
| tree | 117e3a22d28dd90ff954bf2064f3949ad70ead06 | |
| parent | 71497e41f2c9244d99088b758cd3d8f36fc64b55 (diff) | |
fixed reload images in the bar that was thrinked.
* Makefile.mingw: added a prep target to prepare gcompris for nsis installer
* src/gcompris/bar.c: (gcompris_bar_start):
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makefile.mingw | 7 | ||||
| -rw-r--r-- | src/gcompris/bar.c | 38 |
3 files changed, 16 insertions, 36 deletions
@@ -1,5 +1,12 @@ 2005-10-03 Bruno coudoin <bruno.coudoin@free.fr> + fixed reload images in the bar that was thrinked. + + * Makefile.mingw: added a prep target to prepare gcompris for nsis installer + * src/gcompris/bar.c: (gcompris_bar_start): + +2005-10-03 Bruno coudoin <bruno.coudoin@free.fr> + updated mingw makefiles. Added a new background for traffic from Franck. Since I also did one I added traffic background in skins, one from me in babytoy, the new one diff --git a/Makefile.mingw b/Makefile.mingw index 5046927..443d02b 100644 --- a/Makefile.mingw +++ b/Makefile.mingw @@ -105,4 +105,9 @@ clean: # prep: mkdir -p $(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards - cd boards ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ;
\ No newline at end of file + cd boards ; tar cf - --exclude "Makefile.in" --exclude "*.in" --exclude "*~" --exclude "Makefile" --exclude "Makefile.am" --exclude CVS --exclude .xvpics --exclude "*.assetml" * | ( cd ../$(GCOMPRIS_INSTALL_DIR)/share/$(pkgdatadir)/boards ; tar xf -) ; cd .. ; + echo "WARNING: MAKE SURE TO HAVE RUN A MAKE INSTALL OF GCOMPRIS IN /USR/LOCAL FIRST" + mkdir -p $(GCOMPRIS_INSTALL_DIR)/lib/locale + cp -r /usr/local/share/locale/* $(GCOMPRIS_INSTALL_DIR)/lib/locale/ + echo "Remove other .mo file not from gcompris" + find ./win32-install-dir/lib/locale/ -name \*.mo | grep -v gcompris.mo | xargs rm -f
\ No newline at end of file diff --git a/src/gcompris/bar.c b/src/gcompris/bar.c index b82011f..b43f56c 100644 --- a/src/gcompris/bar.c +++ b/src/gcompris/bar.c @@ -1,6 +1,6 @@ /* gcompris - bar.c * - * Time-stamp: <2005/09/28 20:59:17 bruno> + * Time-stamp: <2005/10/03 21:36:37 bruno> * * Copyright (C) 2000-2003 Bruno Coudoin * @@ -24,6 +24,8 @@ * */ +#include <string.h> + #include "gcompris.h" #include "gcompris_config.h" #include "about.h" @@ -88,8 +90,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "pixbuf", pixmap, "x", (double) 0, "y", (double) 0, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), NULL); gdk_pixbuf_unref(pixmap); @@ -102,10 +102,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 1 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -127,10 +123,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 9 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -152,10 +144,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 7 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -177,10 +165,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 5 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -202,10 +186,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 6 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -226,10 +206,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 4 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -250,10 +226,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 3 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); @@ -274,10 +246,6 @@ void gcompris_bar_start (GnomeCanvas *theCanvas) "x", (double) (width/NUMBER_OF_ITEMS) * 2 - gdk_pixbuf_get_width(pixmap)/2, "y", (double) (height-gdk_pixbuf_get_height(pixmap)*zoom)/2, - "width", (double) gdk_pixbuf_get_width(pixmap), - "height", (double) gdk_pixbuf_get_height(pixmap), - "width_set", TRUE, - "height_set", TRUE, NULL); gdk_pixbuf_unref(pixmap); |