Commit d0077eb0 authored by Bruno Coudoin's avatar Bruno Coudoin

Fixed horse2.png not found in erase.

Fixed bad color title in boards/paintings/board3_1.xml.in
parent c71755a2
*** RELEASE 8.0BETA5 ***
2006-09-14 Bruno coudoin <bruno.coudoin@free.fr>
- Added Turk voices by Meltem Turhan Yndem
......
......@@ -4,7 +4,7 @@
# Description: Top Makefile for win32 (mingw) port of GCompris
#
VERSION = "8.0BETA4"
VERSION = "8.0BETA5"
pkgdatadir = gcompris
......
......@@ -5,7 +5,7 @@
<Title x="405" y="485" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<_name>Kandinsky, Wassily, Composition VIII - 1923</_name>
</Title>
<Title x="405" y="505" justification="GTK_JUSTIFY_CENTER">
<Title x="405" y="505" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button">
<_name>Oil on canvas, 140 x 201 cm; Solomon R. Guggenheim Museum, New York</_name>
</Title>
<Shape name="A" pixmapfile="paintings//kandinky.comp8/puzzle1.png" x="168" y="150" zoomx="1" zoomy="1" position="0"/>
......
......@@ -91,7 +91,7 @@ static gchar *imageList[] =
"gcompris/animals/tigerdrink001.jpg",
"gcompris/animals/tigerplay001.jpg",
"gcompris/animals/horses.jpg",
"gcompris/animals/horse2.jpg",
"gcompris/animals/horses2.jpg",
"gcompris/animals/squirrel.jpg",
"gcompris/animals/sheep_irish.jpg",
"gcompris/animals/sheep_irish2.jpg",
......@@ -175,9 +175,9 @@ static void start_board (GcomprisBoard *agcomprisBoard)
gcomprisBoard->maxlevel=6;
gcomprisBoard->sublevel=1;
gcomprisBoard->number_of_sublevel=10; /* Go to next level after this number of 'play' */
gc_score_start(SCORESTYLE_NOTE,
gcomprisBoard->width - 220,
gcomprisBoard->height - 50,
gc_score_start(SCORESTYLE_NOTE,
gcomprisBoard->width - 220,
gcomprisBoard->height - 50,
gcomprisBoard->number_of_sublevel);
gc_bar_set(GC_BAR_LEVEL);
......@@ -185,7 +185,7 @@ static void start_board (GcomprisBoard *agcomprisBoard)
board_mode = DOUBLECLIC;
else if (strcmp(gcomprisBoard->mode,"clic")==0)
board_mode = CLIC;
else
else
board_mode = NORMAL;
if (board_mode == DOUBLECLIC){
......@@ -194,9 +194,9 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if (DefaultsGtkSettings == NULL) {
g_warning("Couldn't get GTK settings");
} else {
g_object_get(G_OBJECT(DefaultsGtkSettings),
g_object_get(G_OBJECT(DefaultsGtkSettings),
"gtk-double-click-time", &DefaultDoubleClicDistance, NULL);
g_warning("Double-click default value %d.",DefaultDoubleClicDistance);
}
......@@ -246,7 +246,7 @@ static void set_level (guint level)
DoubleClicLevel[gcomprisBoard->level-1]);
g_warning("Double click value is now %d.",DoubleClicLevel[gcomprisBoard->level-1]);
}
}
/* ======================================= */
static gboolean is_our_board (GcomprisBoard *gcomprisBoard)
......@@ -283,14 +283,14 @@ static void erase_next_level()
gamewon = FALSE;
/* Select level difficulty */
if (board_mode != NORMAL) {
number_of_item_x = 5;
number_of_item_y = 5;
} else {
number_of_item_x = ((gcomprisBoard->level+1)%2+1)*5;
number_of_item_y = ((gcomprisBoard->level+1)%2+1)*5;
}
}
/* Select the number of layer depending on the level */
......@@ -300,14 +300,14 @@ static void erase_next_level()
else if(gcomprisBoard->level>2)
layers = 2;
}
/* Try the next level */
erase_create_item(layers);
gc_score_set(gcomprisBoard->sublevel);
}
/* ==================================== */
/* Destroy all the items */
static void erase_destroy_all_items()
......@@ -463,7 +463,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
return FALSE;
}
}
gtk_object_destroy(GTK_OBJECT(item));
if(--number_of_item == 0)
......@@ -472,7 +472,7 @@ item_event(GnomeCanvasItem *item, GdkEvent *event, gpointer data)
erase_destroy_all_items();
timer_id = gtk_timeout_add (4000, (GtkFunction) bonus, NULL);
}
return FALSE;
}
......
......@@ -38,7 +38,7 @@
#include <gcompris.h>
#include "profile.h"
#define KEYLOG_MAX 256
#if defined _WIN32 || defined __WIN32__
......@@ -61,7 +61,7 @@ static time_t start_time_key;
/* By default, we use local time, not UTC */
#define USE_UTC 0
/** gc_log_start
/** gc_log_start
* \param GcomprisBoard *gcomprisBoard: the board for which the event happen
*
*/
......@@ -159,7 +159,7 @@ void gc_log_end (GcomprisBoard *gcomprisBoard, gchar *status) {
char *fmt = "%F %T";
char buf[256];
/* get the current time from the Unix kernel */
time_t end_time = time(NULL);
double duration = difftime(end_time,start_time);
......@@ -189,28 +189,33 @@ void gc_log_end (GcomprisBoard *gcomprisBoard, gchar *status) {
file = g_strconcat(g_get_home_dir(), "/.gcompris/gcompris.log", NULL);
} else {
/* On WIN98, No home dir */
file = g_strdup("gcompris/gcompris.log");
file = g_strdup("gcompris.log");
}
flog = fopen(file,"a");
/* date,computer,user,board,level,sublevel,status, duration,comment */
fprintf(flog, "%s;%s;%s;gcompris;%s;%d;%d;%s;%d;%s;%s\n", buf, hostname, username,
gcomprisBoard->name,
gcomprisBoard->level, gcomprisBoard->sublevel,
status,
(guint)duration,
comment_set,
keylog);
printf("%s;%s;%s;gcompris;%s;%d;%d;%s;%d;%s;%s\n", buf, hostname, username,
gcomprisBoard->name,
gcomprisBoard->level, gcomprisBoard->sublevel,
status,
(guint)duration,
comment_set,
keylog);
fclose(flog);
if(flog)
fprintf(flog, "%s;%s;%s;gcompris;%s;%d;%d;%s;%d;%s;%s\n", buf, hostname, username,
gcomprisBoard->name,
gcomprisBoard->level, gcomprisBoard->sublevel,
status,
(guint)duration,
comment_set,
keylog);
else
g_warning("Failed to save the log in file '%s'", file);
g_warning("%s;%s;%s;gcompris;%s;%d;%d;%s;%d;%s;%s\n", buf, hostname, username,
gcomprisBoard->name,
gcomprisBoard->level, gcomprisBoard->sublevel,
status,
(guint)duration,
comment_set,
keylog);
if(flog)
fclose(flog);
g_free(file);
}
......
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