gcompris r3777 - in branches/GCOMPRIS_8_3: . src/boards src/gcompris
- From: bcoudoin svn gnome org
- To: svn-commits-list gnome org
- Subject: gcompris r3777 - in branches/GCOMPRIS_8_3: . src/boards src/gcompris
- Date: Sun, 15 Mar 2009 22:52:17 +0000 (UTC)
Author: bcoudoin
Date: Sun Mar 15 22:52:17 2009
New Revision: 3777
URL: http://svn.gnome.org/viewvc/gcompris?rev=3777&view=rev
Log:
cleanup, removed Timestamps in file headers
Modified:
branches/GCOMPRIS_8_3/ (props changed)
branches/GCOMPRIS_8_3/ChangeLog
branches/GCOMPRIS_8_3/src/boards/algebra.c
branches/GCOMPRIS_8_3/src/boards/clickgame.c
branches/GCOMPRIS_8_3/src/boards/clockgame.c
branches/GCOMPRIS_8_3/src/boards/gletters.c
branches/GCOMPRIS_8_3/src/boards/hanoi.c
branches/GCOMPRIS_8_3/src/boards/memory.c
branches/GCOMPRIS_8_3/src/boards/menu2.c
branches/GCOMPRIS_8_3/src/boards/paratrooper.c
branches/GCOMPRIS_8_3/src/boards/planegame.c
branches/GCOMPRIS_8_3/src/boards/py-mod-gcompris.c
branches/GCOMPRIS_8_3/src/boards/reading.c
branches/GCOMPRIS_8_3/src/boards/shapegame.c
branches/GCOMPRIS_8_3/src/boards/smallnumbers.c
branches/GCOMPRIS_8_3/src/boards/wordsgame.c
branches/GCOMPRIS_8_3/src/gcompris/about.c
branches/GCOMPRIS_8_3/src/gcompris/about.h
branches/GCOMPRIS_8_3/src/gcompris/anim.c
branches/GCOMPRIS_8_3/src/gcompris/anim.h
branches/GCOMPRIS_8_3/src/gcompris/bar.c
branches/GCOMPRIS_8_3/src/gcompris/board_config.c
branches/GCOMPRIS_8_3/src/gcompris/bonus.c
branches/GCOMPRIS_8_3/src/gcompris/bonus.h
branches/GCOMPRIS_8_3/src/gcompris/dialog.c
branches/GCOMPRIS_8_3/src/gcompris/file_selector.c
branches/GCOMPRIS_8_3/src/gcompris/gc_core.h
branches/GCOMPRIS_8_3/src/gcompris/gc_net.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris-board.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.c
branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris_config.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris_confirm.c
branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.h
branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.c
branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.h
branches/GCOMPRIS_8_3/src/gcompris/images_selector.c
branches/GCOMPRIS_8_3/src/gcompris/log.c
branches/GCOMPRIS_8_3/src/gcompris/menu.c
branches/GCOMPRIS_8_3/src/gcompris/plugin.h
branches/GCOMPRIS_8_3/src/gcompris/profile.c
branches/GCOMPRIS_8_3/src/gcompris/profile.h
branches/GCOMPRIS_8_3/src/gcompris/properties.c
branches/GCOMPRIS_8_3/src/gcompris/properties.h
branches/GCOMPRIS_8_3/src/gcompris/score.c
branches/GCOMPRIS_8_3/src/gcompris/score.h
branches/GCOMPRIS_8_3/src/gcompris/sdlplayer.c
branches/GCOMPRIS_8_3/src/gcompris/soundutil.h
branches/GCOMPRIS_8_3/src/gcompris/timer.c
branches/GCOMPRIS_8_3/src/gcompris/timer.h
Modified: branches/GCOMPRIS_8_3/src/boards/algebra.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/algebra.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/algebra.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - algebra.c
*
- * Time-stamp: <2006/08/21 23:29:57 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/clickgame.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/clickgame.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/clickgame.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - clickgame.c
*
- * Time-stamp: <2006/08/21 23:30:07 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/clockgame.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/clockgame.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/clockgame.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - clockgame.c
*
- * Time-stamp: <2006/08/21 23:33:07 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/gletters.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/gletters.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/gletters.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gletters.c
*
- * Time-stamp: <2007-04-15 21:15:19 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/hanoi.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/hanoi.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/hanoi.c Sun Mar 15 22:52:17 2009
@@ -69,7 +69,7 @@
static guint colorlist [] =
{
- 0x00FFFFFF,
+ 0x00C0C0C0,
0xA00000FF,
0xF00000FF,
0x00A000FF,
@@ -78,7 +78,7 @@
0x0000FFFF,
0x505000FF,
0xA0A000FF,
- 0xF0F000FF,
+ 0xC0C080FF,
0x005050FF,
0x00A0A0FF,
0x500050FF,
@@ -87,6 +87,24 @@
};
#define NUMBER_OF_COLOR G_N_ELEMENTS(colorlist)
+static char symbollist [NUMBER_OF_COLOR] =
+ {
+ '!',
+ '/',
+ '<',
+ '>',
+ '&',
+ '~',
+ '#',
+ '{',
+ '%',
+ '|',
+ '?',
+ '}',
+ '=',
+ '+',
+ '*'
+ };
/* Description of this plugin */
static BoardPlugin menu_bp =
@@ -530,16 +548,16 @@
"width_units", (double)1,
NULL);
- car[0] = 'a' + position[i][j]->color;
+ car[0] = symbollist[position[i][j]->color];
car[1] = '\0';
position[i][j]->item_text = \
gnome_canvas_item_new (boardRootItem,
gnome_canvas_text_get_type (),
"text", &car,
- "font", gc_skin_font_board_tiny,
+ "font", "sans bold 14",
"x", (double) position[i][j]->xt,
- "y", (double) position[i][j]->yt,
+ "y", (double) position[i][j]->yt - 3,
"anchor", GTK_ANCHOR_NORTH,
"fill_color", "white",
"justification", GTK_JUSTIFY_CENTER,
Modified: branches/GCOMPRIS_8_3/src/boards/memory.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/memory.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/memory.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - memory.c
*
- * Time-stamp: <2006/08/21 23:33:28 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/menu2.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/menu2.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/menu2.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - menu2.c
*
- * Time-stamp: <2007-04-15 21:19:36 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/paratrooper.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/paratrooper.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/paratrooper.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - paratrooper.c
*
- * Time-stamp: <2006/08/21 23:34:30 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/planegame.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/planegame.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/planegame.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - planegame.c
*
- * Time-stamp: <2006/08/21 23:34:38 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/py-mod-gcompris.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/py-mod-gcompris.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/py-mod-gcompris.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - py-mod-gcompris.c
*
- * Time-stamp: <2006/08/21 23:36:37 bruno>
- *
* Copyright (C) 2003 Olivier Samyn <osamyn ulb ac be>
*
* This program is free software; you can redistribute it and/or modify
@@ -1227,9 +1225,9 @@
/* Parse arguments */
if(!PyArg_ParseTuple(args, "Ossiiii:gc_board_config_radio_buttons", &py_bconf, &label, &key, &min, &max, &step, &init))
return NULL;
-
+
bconf = (pyGcomprisBoardConfigObject*)py_bconf;
-
+
return (PyObject *)pygobject_new((GObject*) \
gc_board_config_spin_int(bconf->cdata, (const gchar *)label,
key,
@@ -1246,7 +1244,7 @@
py_gc_board_conf_separator(PyObject* self, PyObject* args)
{
PyObject *py_bconf;
- pyGcomprisBoardConfigObject * bconf;
+ pyGcomprisBoardConfigObject * bconf;
/* Parse arguments */
if(!PyArg_ParseTuple(args, "O:gc_board_conf_separator", &py_bconf))
@@ -1271,7 +1269,7 @@
if(!PyArg_ParseTuple(args, "Os:gc_board_config_combo_locales", &py_bconf, &init))
return NULL;
bconf = (pyGcomprisBoardConfigObject*)py_bconf;
-
+
return (PyObject *)pygobject_new((GObject*) \
gc_board_config_combo_locales(bconf->cdata, init));
}
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 Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - reading.c
*
- * Time-stamp: <2006/08/21 23:34:48 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/shapegame.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/shapegame.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/shapegame.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - shapegame.c
*
- * Time-stamp: <2006/08/21 23:35:01 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/smallnumbers.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/smallnumbers.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/smallnumbers.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - smallnumbers.c
*
- * Time-stamp: <2007-04-15 21:17:41 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/boards/wordsgame.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/boards/wordsgame.c (original)
+++ branches/GCOMPRIS_8_3/src/boards/wordsgame.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - wordsgame.c
*
- * Time-stamp: <2007-04-15 21:17:08 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -657,8 +655,8 @@
gnome_canvas_item_move (item->rootitem,(double) (g_random_int()%(gcomprisBoard->width-(gint)(x2))),(double) 0);
else
{
- double new_x = (double)( g_random_int()%gcomprisBoard->width);
- if ( new_x < -x1 )
+ double new_x = (double)( g_random_int()%gcomprisBoard->width);
+ if ( new_x < -x1 )
new_x -= x1;
gnome_canvas_item_move (item->rootitem, new_x ,(double) 0);
}
Modified: branches/GCOMPRIS_8_3/src/gcompris/about.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/about.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/about.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - about.c
*
- * Time-stamp: <2006/08/21 23:27:24 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/about.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/about.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/about.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* GCompris -- about.h
*
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/anim.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/anim.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/anim.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - anim.c
*
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
* Copyright (C) 2005 Joe Neeman
*
* This program is free software; you can redistribute it and/or modify
@@ -58,7 +56,7 @@
while(fscanf(f, "%99s", tmp) == 1)
{
GcomprisBoard *gcomprisBoard = gc_board_get_current();
- files = g_slist_append(files,
+ files = g_slist_append(files,
g_strdup_printf("%s/%s", gcomprisBoard->board_dir, tmp));
}
fclose(f);
@@ -185,7 +183,7 @@
GcomprisAnimCanvasItem *a = (GcomprisAnimCanvasItem*)cur->data;
if( gdk_pixbuf_animation_iter_advance( a->iter, NULL) )
{
- gnome_canvas_item_set((GnomeCanvasItem*)a->canvas, "pixbuf",
+ gnome_canvas_item_set((GnomeCanvasItem*)a->canvas, "pixbuf",
gdk_pixbuf_animation_iter_get_pixbuf(a->iter),
NULL);
}
Modified: branches/GCOMPRIS_8_3/src/gcompris/anim.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/anim.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/anim.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - anim.h
*
- * Time-stamp: <2005/02/13 11:59:55 joe>
- *
* Copyright (C) 2000 Joe Neeman
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/bar.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/bar.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/bar.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - bar.c
*
- * Time-stamp: <2007-04-15 21:03:40 bruno>
- *
* Copyright (C) 2000-2003 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/board_config.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/board_config.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/board_config.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - board_config.c
*
- * Time-stamp: <2006/08/21 23:27:57 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
* This program is free software; you can redistribute it and/or modify
@@ -342,7 +340,7 @@
gtk_spin_button_set_digits ( GTK_SPIN_BUTTON(spin), 0);
gtk_spin_button_set_value ( GTK_SPIN_BUTTON(spin), (gdouble) init);
-
+
_gc_boardconf_key *u = g_malloc0(sizeof(_gc_boardconf_key));
u->key = g_strdup(key);
u->config = config;
@@ -352,7 +350,7 @@
G_CALLBACK(spin_changed),
u);
g_signal_connect( G_OBJECT(spin),
- "destroy",
+ "destroy",
G_CALLBACK(_gc_destroy_boardconf_key),
u);
Modified: branches/GCOMPRIS_8_3/src/gcompris/bonus.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/bonus.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/bonus.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - bonus.c
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal George
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/bonus.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/bonus.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/bonus.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - bonus.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/dialog.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/dialog.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/dialog.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - dialog.c
*
- * Time-stamp: <2006/08/20 09:52:47 bruno>
- *
* Copyright (C) 2000-2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/file_selector.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/file_selector.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/file_selector.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - file_selector.c
*
- * Time-stamp: <2006/08/20 10:29:31 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gc_core.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gc_core.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gc_core.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gc_core.h
*
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
* Copyright (C) 2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gc_net.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gc_net.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gc_net.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gc_net.h
*
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
* Copyright (C) 2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris-board.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris-board.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris-board.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris-board.h
*
- * Time-stamp: <2005/09/21 22:14:01 yves>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris.h
*
- * Time-stamp: <2006/08/20 10:03:53 bruno>
- *
* Copyright (C) 2000,2001,2002 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris_alphabeta.c
*
- * Time-stamp: <2006/08/21 23:28:14 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -46,13 +44,13 @@
gint m, t, nextBest, index;
g_assert (depth >= 0);
-
+
child = firstChild(treeGame);
*bestChild = -1;
/* g_warning("gc_alphabeta %d %d %d", depth, alpha, beta); */
-
+
/* directly return value for leaf node*/
if ((!child) || (depth == 0)){
/* g_warning("gc_alphabeta %d returns %d bestChild %d", depth, heuristic(treeGame), *bestChild); */
@@ -60,7 +58,7 @@
}
index = 0;
-
+
if (maximize) {
m = alpha;
while (child){
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_alphabeta.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris_alphabeta.h
*
- * Time-stamp: <2006/08/28 21:20:56 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_config.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_config.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_config.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* GCompris -- config.h
*
- * Time-stamp: <2001/12/26 23:13:29 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_confirm.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_confirm.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_confirm.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gc_confirm_box.c
*
- * Time-stamp: <2006/08/20 10:14:18 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -37,7 +35,7 @@
static gint
button_event(GnomeCanvasItem *item, GdkEvent *event, gchar *answer);
-static void set_content(GnomeCanvasRichText *item_content,
+static void set_content(GnomeCanvasRichText *item_content,
GnomeCanvasRichText *item_content_s,
gchar *text);
@@ -89,15 +87,15 @@
#define T_Z_H 115
/* Buttons */
-#define T_B_X 80
+#define T_B_X 80
#define T_B_Y 250
-#define T_B_W 620
+#define T_B_W 620
#define T_B_H 192
#define T_B_X_INT 30
/*
- * Main entry point
+ * Main entry point
* ----------------
*
*/
@@ -107,14 +105,14 @@
* file_types is A Comma separated text explaining the different file types
*/
-void gc_confirm_box (gchar *title,
+void gc_confirm_box (gchar *title,
gchar *question_text,
gchar *yes_text,
gchar *no_text,
ConfirmCallBack iscb)
{
- display_confirm(title,
- question_text,
+ display_confirm(title,
+ question_text,
yes_text,
no_text,
iscb);
@@ -141,7 +139,7 @@
gtk_object_destroy(GTK_OBJECT(rootitem));
}
- rootitem = NULL;
+ rootitem = NULL;
if(gcomprisBoard!=NULL && confirm_displayed)
gc_board_pause(FALSE);
@@ -216,7 +214,7 @@
x_start = (BOARDWIDTH)/2;
item = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", (double) x_start,
"y", (double) y_start,
"anchor", GTK_ANCHOR_NORTH,
@@ -274,11 +272,11 @@
"editable", FALSE,
NULL);
- set_content (GNOME_CANVAS_RICH_TEXT(richtext),
- GNOME_CANVAS_RICH_TEXT(richtext_s),
+ set_content (GNOME_CANVAS_RICH_TEXT(richtext),
+ GNOME_CANVAS_RICH_TEXT(richtext_s),
question_text);
-
-
+
+
/*
* Buttons
* -------
@@ -291,7 +289,7 @@
// CANCEL
no_button = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", (double) button_x ,
"y", (double) button_y + 2*button_h/3,
"anchor", GTK_ANCHOR_WEST,
@@ -310,7 +308,7 @@
// CANCEL CROSS
no_cross = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap_cross,
+ "pixbuf", pixmap_cross,
"x", (double) button_x + gdk_pixbuf_get_width(pixmap)/2,
"y", (double) button_y + 2*button_h/3,
"anchor", GTK_ANCHOR_CENTER,
@@ -339,14 +337,14 @@
// OK
yes_button = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", (double) button_x ,
"y", (double) button_y + button_h/3,
"anchor", GTK_ANCHOR_WEST,
NULL);
-
+
gdk_pixbuf_unref(pixmap);
-
+
gtk_signal_connect(GTK_OBJECT(yes_button), "event",
(GtkSignalFunc) button_event,
"/yes/");
@@ -358,7 +356,7 @@
// OK stick
yes_stick = gnome_canvas_item_new (GNOME_CANVAS_GROUP(rootitem),
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap_stick,
+ "pixbuf", pixmap_stick,
"x", (double) button_x + gdk_pixbuf_get_width(pixmap)/2,
"y", (double) button_y + button_h/3,
"anchor", GTK_ANCHOR_CENTER,
@@ -390,14 +388,14 @@
/* Apply the style to the given RichText item */
static void
-set_content(GnomeCanvasRichText *item_content,
+set_content(GnomeCanvasRichText *item_content,
GnomeCanvasRichText *item_content_s,
gchar *text) {
GtkTextIter iter_start, iter_end;
GtkTextBuffer *buffer;
GtkTextTag *txt_tag;
- gboolean success;
+ gboolean success;
gchar *color_string;
GdkColor *color_s = (GdkColor *)malloc(sizeof(GdkColor));
GdkColor *color = (GdkColor *)malloc(sizeof(GdkColor));
@@ -420,12 +418,12 @@
color_string = g_strdup_printf("#%x", gc_skin_color_shadow >> 8);
gdk_color_parse(color_string, color_s);
g_free(color_string);
- success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
+ success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
color_s,
- FALSE, TRUE);
+ FALSE, TRUE);
buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content_s));
- txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
+ txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
"foreground-gdk", color_s,
"font", gc_skin_font_board_medium,
NULL);
@@ -434,18 +432,18 @@
gtk_text_buffer_apply_tag(buffer, txt_tag, &iter_start, &iter_end);
- /*
+ /*
* Set the text
*/
color_string = g_strdup_printf("#%x", gc_skin_get_color("gcompris/helpunselect") >> 8);
gdk_color_parse(color_string, color);
g_free(color_string);
- success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
+ success = gdk_colormap_alloc_color(gdk_colormap_get_system(),
color,
- FALSE, TRUE);
+ FALSE, TRUE);
buffer = gnome_canvas_rich_text_get_buffer(GNOME_CANVAS_RICH_TEXT(item_content));
- txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
+ txt_tag = gtk_text_buffer_create_tag(buffer, NULL,
"foreground-gdk", color,
"font", gc_skin_font_board_medium,
NULL);
@@ -474,5 +472,5 @@
gc_confirm_box_stop();
return TRUE;
-
+
}
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_db.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris_db.h
*
- * Time-stamp: <2007/02/13 23:03:39 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris_im.c
*
- * Time-stamp: <2006/08/21 23:26:19 bruno>
- *
* Copyright (C) 2000,2003 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -45,8 +43,8 @@
if(gc_profile_get_current())
{
GHashTable *init_im = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
- init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id,
- -1,
+ init_im = gc_db_conf_with_table_get (gc_profile_get_current()->profile_id,
+ -1,
init_im );
properties->default_context = g_hash_table_lookup ( init_im, "default_im");
@@ -71,7 +69,7 @@
g_signal_connect (GTK_WIDGET (window), "focus-out-event",
G_CALLBACK(window_focus_callback), NULL);
-
+
}
void
@@ -81,7 +79,7 @@
gtk_im_context_reset (properties->context);
}
-
+
static gint
im_context_commit_callback (GtkIMContext *imcontext,
gchar *arg1,
@@ -95,7 +93,7 @@
}
return FALSE;
}
-
+
static gint
im_context_preedit_callback (GtkIMContext *imcontext,
gpointer user_data)
@@ -129,6 +127,6 @@
gtk_im_context_focus_in (properties->context);
else
gtk_im_context_focus_out (properties->context);
-
+
return FALSE;
}
Modified: branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/gcompris_im.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gcompris_im.h
*
- * Time-stamp: <2006/08/29 01:18:09 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/images_selector.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/images_selector.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/images_selector.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - images_selector.c
*
- * Time-stamp: <2006/08/21 23:26:43 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
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 Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - log.c
*
- * Time-stamp: <2003/10/29 18:55:55 bcoudoin>
- *
* Copyright (C) 2004 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/menu.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/menu.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/menu.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - menu.c
*
- * Time-stamp: <2006/08/20 10:45:56 bruno>
- *
* Copyright (C) 2000-2006 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/plugin.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/plugin.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/plugin.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - plugin.h
*
- * Time-stamp: <2005/09/14 23:30:48 yves>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/profile.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/profile.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/profile.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - profile.c
*
- * Time-stamp: <2006/08/21 23:26:49 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/profile.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/profile.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/profile.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - profile.h
*
- * Time-stamp: <2006/08/29 01:16:51 bruno>
- *
* Copyright (C) 2005 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -67,7 +65,7 @@
/*name of group -- must be unique */
gchar *name;
-
+
/* GcomprisClass containing the group */
gint class_id;
@@ -100,7 +98,7 @@
/* Last Name */
gchar *lastname;
-
+
/* First Name */
gchar *firstname;
@@ -128,7 +126,7 @@
gchar *description;
/* list of GcomprisGroup. if empty user management is disabled */
- GList *group_ids;
+ GList *group_ids;
/* list of activities to play -- gchar section/name */
GList *activities;
Modified: branches/GCOMPRIS_8_3/src/gcompris/properties.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/properties.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/properties.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - properties.c
*
- * Time-stamp: <2006/08/21 23:26:56 bruno>
- *
* Copyright (C) 2000,2003 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/properties.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/properties.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/properties.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - properties.h
*
- * Time-stamp: <2006/08/28 23:54:33 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/score.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/score.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/score.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - score.c
*
- * Time-stamp: <2006/08/21 23:27:04 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -34,13 +32,13 @@
/*
* Forward declarations
*/
-static void display_number(GnomeCanvasGroup *parent,
+static void display_number(GnomeCanvasGroup *parent,
guint x,
- guint y,
+ guint y,
char *operand_str);
/*
- * Main entry score
+ * Main entry score
* ----------------
*
*/
@@ -73,7 +71,7 @@
{
if(boardRootItem!=NULL)
gtk_object_destroy (GTK_OBJECT(boardRootItem));
-
+
boardRootItem=NULL;
}
@@ -126,9 +124,9 @@
#define NUMBERSWIDTH 110
static void
-display_number(GnomeCanvasGroup *parent,
+display_number(GnomeCanvasGroup *parent,
guint x,
- guint y,
+ guint y,
char *operand_str)
{
Modified: branches/GCOMPRIS_8_3/src/gcompris/score.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/score.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/score.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - bonus.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/sdlplayer.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/sdlplayer.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/sdlplayer.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* sdlplayer - sdlplayer.c
*
- * Time-stamp: <2004/05/04 01:33:46 bcoudoin>
- *
* Copyright (C) 2004 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/soundutil.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/soundutil.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/soundutil.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - gameutil.h
*
- * Time-stamp: <2000/07/16 00:32:26 bruno>
- *
* Copyright (C) 2000 Bruno Coudoin
*
* This program is free software; you can redistribute it and/or modify
Modified: branches/GCOMPRIS_8_3/src/gcompris/timer.c
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/timer.c (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/timer.c Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - timer.c
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2002 Bruno coudoin
*
* This program is free software; you can redistribute it and/or modify
@@ -84,7 +82,7 @@
gchar *filefull = NULL;
gchar *filename = NULL;
gint fileid;
-
+
switch(type)
{
case GCOMPRIS_TIMER_SAND:
@@ -100,18 +98,18 @@
fileid = (gint)timer;
filename = g_strdup_printf(image_prefix, fileid);
filefull = g_strdup_printf("%s/%s", properties->package_data_dir, filename);
-
+
if (g_file_test ((filefull), G_FILE_TEST_EXISTS))
{
pixmap = gc_pixmap_load(filename);
gc_timer_item = gnome_canvas_item_new (boardRootItem,
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", x,
"y", y,
NULL);
-
+
gdk_pixbuf_unref(pixmap);
}
g_free(filename);
@@ -138,7 +136,7 @@
pixmap = gc_pixmap_load("gcompris/misc/tuxballoon.png");
gc_timer_item = gnome_canvas_item_new (boardRootItem,
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", x,
"y", y,
NULL);
@@ -151,7 +149,7 @@
pixmap = gc_pixmap_load("gcompris/misc/sea.png");
gnome_canvas_item_new (boardRootItem,
gnome_canvas_pixbuf_get_type (),
- "pixbuf", pixmap,
+ "pixbuf", pixmap,
"x", (double) 0,
"y", (double) BOARDHEIGHT - gdk_pixbuf_get_height(pixmap),
"width", (double) gdk_pixbuf_get_width(pixmap),
@@ -204,7 +202,7 @@
if (animate_id)
gtk_timeout_remove (animate_id);
animate_id = 0;
-
+
if (subanimate_id)
gtk_timeout_remove (subanimate_id);
subanimate_id = 0;
Modified: branches/GCOMPRIS_8_3/src/gcompris/timer.h
==============================================================================
--- branches/GCOMPRIS_8_3/src/gcompris/timer.h (original)
+++ branches/GCOMPRIS_8_3/src/gcompris/timer.h Sun Mar 15 22:52:17 2009
@@ -1,7 +1,5 @@
/* gcompris - timer.h
*
- * Time-stamp: <2001/10/15 01:10:21 bruno>
- *
* Copyright (C) 2001 Pascal Georges
*
* This program is free software; you can redistribute it and/or modify
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
