[Tux4kids-commits] r434 - in tuxtype/trunk: . tuxtype tuxtype/data/images/icons tuxtype/data/images/menu tuxtype/data/images/tux
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Fri Feb 22 19:54:23 UTC 2008
Author: dbruce-guest
Date: 2008-02-22 19:54:22 +0000 (Fri, 22 Feb 2008)
New Revision: 434
Added:
tuxtype/trunk/tuxtype/data/images/menu/tux_config0.png
tuxtype/trunk/tuxtype/data/images/menu/tux_config1.png
tuxtype/trunk/tuxtype/data/images/menu/tux_configd.png
Modified:
tuxtype/trunk/ChangeLog
tuxtype/trunk/tuxtype/data/images/icons/Makefile.am
tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
tuxtype/trunk/tuxtype/data/images/menu/Makefile.am
tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
tuxtype/trunk/tuxtype/data/images/menu/comet0.png
tuxtype/trunk/tuxtype/data/images/menu/comet1.png
tuxtype/trunk/tuxtype/data/images/menu/comet2.png
tuxtype/trunk/tuxtype/data/images/menu/comet3.png
tuxtype/trunk/tuxtype/data/images/menu/comet4.png
tuxtype/trunk/tuxtype/data/images/menu/comet5.png
tuxtype/trunk/tuxtype/data/images/menu/cometd.png
tuxtype/trunk/tuxtype/data/images/menu/lesson0.png
tuxtype/trunk/tuxtype/data/images/menu/lesson1.png
tuxtype/trunk/tuxtype/data/images/menu/lesson2.png
tuxtype/trunk/tuxtype/data/images/menu/lesson3.png
tuxtype/trunk/tuxtype/data/images/menu/lessond.png
tuxtype/trunk/tuxtype/data/images/menu/main0.png
tuxtype/trunk/tuxtype/data/images/menu/main1.png
tuxtype/trunk/tuxtype/data/images/menu/main2.png
tuxtype/trunk/tuxtype/data/images/menu/main3.png
tuxtype/trunk/tuxtype/data/images/menu/main4.png
tuxtype/trunk/tuxtype/data/images/menu/main5.png
tuxtype/trunk/tuxtype/data/images/menu/main6.png
tuxtype/trunk/tuxtype/data/images/menu/main7.png
tuxtype/trunk/tuxtype/data/images/menu/maind.png
tuxtype/trunk/tuxtype/data/images/menu/quit0.png
tuxtype/trunk/tuxtype/data/images/menu/quit1.png
tuxtype/trunk/tuxtype/data/images/menu/quit2.png
tuxtype/trunk/tuxtype/data/images/menu/quit3.png
tuxtype/trunk/tuxtype/data/images/menu/quit4.png
tuxtype/trunk/tuxtype/data/images/menu/quit5.png
tuxtype/trunk/tuxtype/data/images/menu/quit6.png
tuxtype/trunk/tuxtype/data/images/menu/quit7.png
tuxtype/trunk/tuxtype/data/images/menu/quit8.png
tuxtype/trunk/tuxtype/data/images/menu/quitd.png
tuxtype/trunk/tuxtype/data/images/tux/Makefile.am
tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
tuxtype/trunk/tuxtype/titlescreen.c
tuxtype/trunk/tuxtype/titlescreen.h
Log:
updated some of menu icon graphics
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/ChangeLog 2008-02-22 19:54:22 UTC (rev 434)
@@ -1,3 +1,7 @@
+22 Feb 2008
+[ David Bruce <dbruce at tampabay.rr.com> ]
+ - replaced many of menu icon images with new shiny ones.
+
19 Feb 2008
[ David Bruce <dbruce at tampabay.rr.com> ]
- updated remainder of Makefile.am's to use automake
Modified: tuxtype/trunk/tuxtype/data/images/icons/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/icons/Makefile.am 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/icons/Makefile.am 2008-02-22 19:54:22 UTC (rev 434)
@@ -1,6 +1,6 @@
## Makefile.am for tuxtype - data/images/icons:
## Process with Automake to create Makefile.in
-images_iconsdir = $(pkgdatadir)/data/images_icons
+images_iconsdir = $(pkgdatadir)/data/images/icons
dist_images_icons_DATA = tuxtype.ico tuxtype.icns
Modified: tuxtype/trunk/tuxtype/data/images/icons/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/icons/Makefile.in 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/icons/Makefile.in 2008-02-22 19:54:22 UTC (rev 434)
@@ -160,7 +160,7 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-images_iconsdir = $(pkgdatadir)/data/images_icons
+images_iconsdir = $(pkgdatadir)/data/images/icons
dist_images_icons_DATA = tuxtype.ico tuxtype.icns
all: all-am
Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.am 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.am 2008-02-22 19:54:22 UTC (rev 434)
@@ -1,7 +1,7 @@
## Makefile.am for tuxtype - data/images/menu:
## Process with Automake to create Makefile.in
-images_menudir = $(pkgdatadir)/data/images_menu
+images_menudir = $(pkgdatadir)/data/images/menu
dist_images_menu_DATA = cascade0.png\
cascade1.png\
@@ -66,4 +66,7 @@
reg2.png\
sel0.png\
sel1.png\
-sel2.png
+sel2.png\
+tux_config0.png\
+tux_config1.png\
+tux_configd.png
Modified: tuxtype/trunk/tuxtype/data/images/menu/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/menu/Makefile.in 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/menu/Makefile.in 2008-02-22 19:54:22 UTC (rev 434)
@@ -160,7 +160,7 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-images_menudir = $(pkgdatadir)/data/images_menu
+images_menudir = $(pkgdatadir)/data/images/menu
dist_images_menu_DATA = cascade0.png\
cascade1.png\
cascade10.png\
@@ -224,7 +224,10 @@
reg2.png\
sel0.png\
sel1.png\
-sel2.png
+sel2.png\
+tux_config0.png\
+tux_config1.png\
+tux_configd.png
all: all-am
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet0.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet1.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet2.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet3.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet4.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/comet5.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/cometd.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/lesson0.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/lesson1.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/lesson2.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/lesson3.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/lessond.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main0.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main1.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main2.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main3.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main4.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main5.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main6.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/main7.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/maind.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit0.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit1.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit2.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit3.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit4.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit5.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit6.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit7.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quit8.png
===================================================================
(Binary files differ)
Modified: tuxtype/trunk/tuxtype/data/images/menu/quitd.png
===================================================================
(Binary files differ)
Added: tuxtype/trunk/tuxtype/data/images/menu/tux_config0.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype/data/images/menu/tux_config0.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/trunk/tuxtype/data/images/menu/tux_config1.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype/data/images/menu/tux_config1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tuxtype/trunk/tuxtype/data/images/menu/tux_configd.png
===================================================================
(Binary files differ)
Property changes on: tuxtype/trunk/tuxtype/data/images/menu/tux_configd.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.am 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.am 2008-02-22 19:54:22 UTC (rev 434)
@@ -1,6 +1,6 @@
## Makefile.am for tuxtype - data/images/tux:
## Process with Automake to create Makefile.in
-images_tuxdir = $(pkgdatadir)/data/images_tux
+images_tuxdir = $(pkgdatadir)/data/images/tux
dist_images_tux_DATA = console.png\
gulp0.png\
Modified: tuxtype/trunk/tuxtype/data/images/tux/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/data/images/tux/Makefile.in 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/data/images/tux/Makefile.in 2008-02-22 19:54:22 UTC (rev 434)
@@ -160,7 +160,7 @@
target_vendor = @target_vendor@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-images_tuxdir = $(pkgdatadir)/data/images_tux
+images_tuxdir = $(pkgdatadir)/data/images/tux
dist_images_tux_DATA = console.png\
gulp0.png\
gulp1.png\
Modified: tuxtype/trunk/tuxtype/titlescreen.c
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.c 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/titlescreen.c 2008-02-22 19:54:22 UTC (rev 434)
@@ -111,8 +111,8 @@
/* FIXME phrase(s) should come from file */
-// ConvertFromUTF8(phrase, "Now is the time for all good men to come to the aid of their country.");
- ConvertFromUTF8(phrase, "To all that believe in his name he gave power to become children of God");
+ ConvertFromUTF8(phrase, "Now is the time for all good men to come to the aid of their country.");
+// ConvertFromUTF8(phrase, "To all that believe in his name he gave power to become children of God");
// wcscpy(phrase, "Now is the time for all good men to come to the aid of their country.");
start = SDL_GetTicks();
@@ -691,17 +691,24 @@
menu_button[i].w = menu_width[menu_depth] + (2*reg->frame[2]->w);
}
+
update_locs = 0;
/* --- draw the full menu --- */
for (j = 1; j <= TITLE_MENU_ITEMS; j++)
{
+ DOUT(j);
draw_button(j, reg);
- SDL_BlitSurface(reg_text[j][menu_depth], NULL, screen, &text_dst[j]);
- SDL_BlitSurface(menu_gfx[j][menu_depth]->default_img, NULL, screen, &menu_gfxdest[j]);
+ if (reg_text[j][menu_depth] != NULL)
+ SDL_BlitSurface(reg_text[j][menu_depth], NULL, screen, &text_dst[j]);
+ if (menu_gfx[j][menu_depth] != NULL)
+ SDL_BlitSurface(menu_gfx[j][menu_depth]->default_img, NULL, screen, &menu_gfxdest[j]);
}
+
SDL_UpdateRect(screen, 0, 0, 0, 0);
+
+ LOG("TitleScreen() - update_locs completed\n");
}
Modified: tuxtype/trunk/tuxtype/titlescreen.h
===================================================================
--- tuxtype/trunk/tuxtype/titlescreen.h 2008-02-19 20:28:54 UTC (rev 433)
+++ tuxtype/trunk/tuxtype/titlescreen.h 2008-02-22 19:54:22 UTC (rev 434)
@@ -33,7 +33,7 @@
{"", "cascade", "easy", "grade1_", "list" },
{"", "comet", "medium", "grade2_", "practice" },
{"", "lesson","hard", "grade3_", "keyboard" },
- {"", "option", "tutor", "grade4_", "lang" },
+ {"", "tux_config", "tutor", "grade4_", "lang" },
{"", "quit", "main", "main", "main" }};
/* --- timings for tux blinking --- */
More information about the Tux4kids-commits
mailing list