Commit 1c283916 authored by Yves Combe's avatar Yves Combe
Browse files

pass text colors for menu into skin (Franck Doucet need it).

parent da0a46b6
2005-09-21 Yves Combe <yves@ycombe.net>
pass text colors for menu into skin (Franck Doucet need it).
* boards/skins/babytoy/skin.xml:
* boards/skins/default/skin.xml:
* boards/skins/linha_verde/skin.xml:
* boards/skins/pink/skin.xml:
* po/Makefile.in.in:
* src/boards/menu.c: (menu_start), (create_info_area):
2005-09-20 Yves Combe <yves@ycombe.net>
Add missing files.
......
......@@ -48,8 +48,8 @@
<color id="erase/rectangle out2" rgba="0X0E0E0EFF"/>
<color id="erase/rectangle in3" rgba="0xf49a9a66"/>
<color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
<color id="maze/wall color" rgba="0x0000FFFF"/>
<color id="menu/text" rgba="0xFFFFFFFF"/>
</Skin>
</GCompris>
......@@ -50,6 +50,8 @@
<color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
<color id="maze/wall color" rgba="0xFFFFFFFF"/>
<color id="menu/text" rgba="0x000000FF"/>
</Skin>
</GCompris>
......@@ -50,6 +50,8 @@
<color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
<color id="maze/wall color" rgba="0xFF00FFFF"/>
<color id="menu/text" rgba="0xFF00FFFF"/>
</Skin>
</GCompris>
......@@ -47,5 +47,7 @@
<color id="erase/rectangle out3" rgba="0XFFFFFFFF"/>
<color id="maze/wall color" rgba="0xFFFFFFFF"/>
<color id="menu/text" rgba="0xFFFF00FF"/>
</Skin>
</GCompris>
\ No newline at end of file
......@@ -45,6 +45,7 @@ INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
CC = @CC@
GENCAT = @GENCAT@
GMSGFMT = @GMSGFMT@
MSGFMT = @MSGFMT@
XGETTEXT = @XGETTEXT@
......@@ -72,6 +73,7 @@ POTFILES = \
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
INSTOBJEXT = @INSTOBJEXT@
.SUFFIXES:
.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
......@@ -92,7 +94,7 @@ CATOBJEXT = @CATOBJEXT@
.po.cat:
sed -f ../intl/po2msg.sed < $< > $*.msg \
&& rm -f $@ && gencat $@ $*.msg
&& rm -f $@ && $(GENCAT) $@ $*.msg
all: all-@USE_NLS@
......@@ -128,22 +130,22 @@ install-data-yes: all
$(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \
fi; \
if test -r $$cat; then \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE).mo; \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE).mo"; \
$(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
else \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE).mo; \
$(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE).mo"; \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \
fi; \
if test -r $$cat.m; then \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE).mo.m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \
$(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
if test -r $(srcdir)/$$cat.m ; then \
$(INSTALL_DATA) $(srcdir)/$$cat.m \
$$dir/$(GETTEXT_PACKAGE).mo.m; \
$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
echo "installing $(srcdir)/$$cat as" \
"$$dir/$(GETTEXT_PACKAGE).mo.m"; \
"$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \
else \
true; \
fi; \
......@@ -169,10 +171,10 @@ uninstall:
for cat in $$catalogs; do \
cat=`basename $$cat`; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \
rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \
done
if test "$(PACKAGE)" = "glib"; then \
rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
......
/* gcompris - menu.c
*
* Time-stamp: <2005/08/29 13:17:32 yves>
* Time-stamp: <2005/09/21 00:10:23 yves>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -115,7 +115,6 @@ static void menu_pause (gboolean pause)
*/
static void menu_start (GcomprisBoard *agcomprisBoard)
{
current_x = 0.0;
current_y = 0.0;
......@@ -462,7 +461,7 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems)
"x", (double) x,
"y", (double) y,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"fill_color_rgba", gcompris_skin_get_color("menu/text"),
NULL);
menuitems->description_item = \
......@@ -473,7 +472,7 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems)
"x", (double) x,
"y", (double) y + 28,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"fill_color_rgba", gcompris_skin_get_color("menu/text"),
NULL);
menuitems->author_item = \
......@@ -484,7 +483,7 @@ static void create_info_area(GnomeCanvasGroup *parent, MenuItems *menuitems)
"x", (double) x,
"y", (double) y + 90,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"fill_color_rgba", gcompris_skin_get_color("menu/text"),
"justification", GTK_JUSTIFY_CENTER,
NULL);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment