diff options
| -rw-r--r-- | ChangeLog | 25 | ||||
| -rw-r--r-- | boards/chronos/board4_0.xml.in | 2 | ||||
| -rw-r--r-- | boards/hanoi.xml.in | 7 | ||||
| -rw-r--r-- | boards/paintings/board3_0.xml.in | 2 | ||||
| -rw-r--r-- | config.h.mingw.in | 6 | ||||
| -rw-r--r-- | src/boards/Makefile.mingw | 1 | ||||
| -rw-r--r-- | src/boards/mypaint/Makefile.am | 17 | ||||
| -rw-r--r-- | src/gcompris/Makefile.mingw | 2 | ||||
| -rw-r--r-- | src/gcompris/board.c | 10 | ||||
| -rw-r--r-- | src/gcompris/gcompris.c | 6 | ||||
| -rw-r--r-- | src/gcompris/help.c | 2 | ||||
| -rw-r--r-- | src/gcompris/log.c | 15 |
12 files changed, 58 insertions, 37 deletions
@@ -1,6 +1,26 @@ +2007-03-12 Bruno coudoin <bruno.coudoin@free.fr> + + Fixed translation issue + * boards/chronos/board4_0.xml.in: + * boards/hanoi.xml.in: + * boards/paintings/board3_0.xml.in: + + Fixed for windows compilation: + * config.h.mingw.in: + * src/boards/Makefile.mingw: + * src/gcompris/Makefile.mingw: + * src/gcompris/board.c: (gc_board_init): + * src/gcompris/help.c: (gc_help_has_board): + * src/gcompris/log.c: (gc_log_start): + + + Added missing .h and mypaint.py + * src/boards/mypaint/Makefile.am: + + 2007-03-12 Yves Combe <yves@ycombe.net> - fix configure.in error on non OSX + fix configure.in error on non OSX * configure.in: * src/boards/mypaint/brush.py: @@ -12,7 +32,7 @@ Prepared for OSX bundlisation. * acinclude.m4: add SDL.m4 inside. NEEDS cleaning (probably), we don't need that on OSX. - * configure.in: detect apple darwin platform. Detect SDL and SDL_mixer frameworks. + * configure.in: detect apple darwin platform. Detect SDL and SDL_mixer frameworks. * src/boards/chess.c: (start_board): check for gnuchess in same bin/ * src/boards/mypaint/mydrawwidget.override: NO_IMPORT_PYGOBJECT * src/boards/py-gcompris-board.c: NO_IMPORT_PYGOBJECT @@ -40,7 +60,6 @@ *** RELEASE 8.3BETA1 *** - 2007-03-11 Bruno coudoin <bruno.coudoin@free.fr> * boards/menu.xml.in: Fixed help diff --git a/boards/chronos/board4_0.xml.in b/boards/chronos/board4_0.xml.in index db9a9b2..cb1f68f 100644 --- a/boards/chronos/board4_0.xml.in +++ b/boards/chronos/board4_0.xml.in @@ -10,7 +10,7 @@ </Title> <Shape zoomy="1" zoomx="1" y="120" x="550" position="0" pixmapfile="chronos/images/wright_flyer.png" name="E"/> <Title y="215" x="534" justification="GTK_JUSTIFY_CENTER"> - <_name>1903 The Wright brothers' Flyer III </_name> + <_name>1903 The Wright brothers' Flyer III</_name> </Title> <Shape zoomy="1" zoomx="1" y="380" x="570" position="0" pixmapfile="chronos/images/bleriot.png" name="C"/> <Title y="460" x="585" justification="GTK_JUSTIFY_CENTER"> diff --git a/boards/hanoi.xml.in b/boards/hanoi.xml.in index c955c9f..dafde34 100644 --- a/boards/hanoi.xml.in +++ b/boards/hanoi.xml.in @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <GCompris> - <Board + <Board name="hanoi" type="hanoi" section="/puzzle" - icon="boardicons/hanoi.png" + icon="boardicons/hanoi.png" difficulty="2" author="Bruno Coudoin (bruno.coudoin@free.fr)" boarddir=""> @@ -13,7 +13,6 @@ <_prerequisite>Mouse-manipulation</_prerequisite> <_goal>Reproduce the tower on the right in the empty space on the left</_goal> <_manual>Drag and Drop one top piece at a time, from one peg to another, to reproduce the tower on the right in the empty space on the left.</_manual> - <_credit>Concept taken from EPI games. - </_credit> + <_credit>Concept taken from EPI games.</_credit> </Board> </GCompris> diff --git a/boards/paintings/board3_0.xml.in b/boards/paintings/board3_0.xml.in index 0465bae..704e9bb 100644 --- a/boards/paintings/board3_0.xml.in +++ b/boards/paintings/board3_0.xml.in @@ -3,7 +3,7 @@ <Shape name="1" pixmapfile="skin:gcompris-shapelabel.png" type="SHAPE_BACKGROUND" x="405" y="495" zoomx="1" zoomy="1" position="0"/> <Title x="405" y="495" justification="GTK_JUSTIFY_CENTER" color_skin="gcompris/text button"> - <_name> Pierre-Auguste Renoir, Girls At The Piano - 1892</_name> + <_name>Pierre-Auguste Renoir, Girls At The Piano - 1892</_name> </Title> <Shape name="A" pixmapfile="paintings/level6/renoir-filles_piano-1.png" x="323" y="69" zoomx="1" zoomy="1" position="0"/> <Shape name="B" pixmapfile="paintings/level6/renoir-filles_piano-2.png" x="478" y="69" zoomx="1" zoomy="1" position="0"/> diff --git a/config.h.mingw.in b/config.h.mingw.in index 645564a..8f5f627 100644 --- a/config.h.mingw.in +++ b/config.h.mingw.in @@ -127,3 +127,9 @@ /* Date at which GCompris has been built */ #define BUILD_DATE "@BUILD_DATE@" +/* don't build dynamic modules on windows */ +#define STATIC_MODULE 1 + +/* SQLITE Database, Profiles are enabled */ +#define USE_SQLITE 1 + diff --git a/src/boards/Makefile.mingw b/src/boards/Makefile.mingw index 3255bcc..2d0eb92 100644 --- a/src/boards/Makefile.mingw +++ b/src/boards/Makefile.mingw @@ -172,6 +172,7 @@ BOARDS_C_SRC = \ read_colors.c \ reading.c \ reversecount.c \ + scale.c \ shapegame.c \ smallnumbers.c \ submarine.c \ diff --git a/src/boards/mypaint/Makefile.am b/src/boards/mypaint/Makefile.am index e465ee9..b6a0395 100644 --- a/src/boards/mypaint/Makefile.am +++ b/src/boards/mypaint/Makefile.am @@ -24,15 +24,20 @@ mydrawwidget_la_LIBADD = $(MYPAINT_LIBS) $(PYTHON_LIBS) nodist_mydrawwidget_la_CFLAGS = $(MYPAINT_CFLAGS) nodist_mydrawwidget_la_SOURCES = \ - mydrawwidget.defs.c + mydrawwidget.defs.c mydrawwidget_la_SOURCES = \ - mydrawwidgetmodule.c \ + brush_dab.c \ + brush_dab.h \ + gtkmybrush.c \ + gtkmybrush.h \ gtkmydrawwidget.c \ + gtkmydrawwidget.h \ + helpers.c \ + helpers.h \ + mydrawwidgetmodule.c \ surface.c \ - gtkmybrush.c \ - brush_dab.c \ - helpers.c + surface.h CLEANFILES = mydrawwidget.c mydrawwidget.defs mydrawwidget.defs.c brushsettings.h $(wildcard *.pyc) @@ -44,7 +49,7 @@ pyboard_SCRIPTS = mypaint.py mypaintlibdir = $(PYTHON_PLUGIN_DIR)/mypaint -EXTRA_DIST += caller_owns_return.py generate.py mypaint +EXTRA_DIST += caller_owns_return.py generate.py mypaint mypaint.py mypaintlib_PYTHON = \ application.py \ diff --git a/src/gcompris/Makefile.mingw b/src/gcompris/Makefile.mingw index 7d1c677..53eca67 100644 --- a/src/gcompris/Makefile.mingw +++ b/src/gcompris/Makefile.mingw @@ -96,6 +96,7 @@ EXE_C_SRC = \ cache.c \ config.c \ dialog.c \ + drag.c \ file_selector.c \ gameutil.c \ gcompris.c \ @@ -107,7 +108,6 @@ EXE_C_SRC = \ help.c \ images_selector.c \ log.c \ - main.c \ menu.c \ pixbuf_util.c \ profile.c \ diff --git a/src/gcompris/board.c b/src/gcompris/board.c index cbde963..cb58b80 100644 --- a/src/gcompris/board.c +++ b/src/gcompris/board.c @@ -64,6 +64,7 @@ extern BoardPlugin * get_railroad_bplugin_info(); extern BoardPlugin * get_read_colors_bplugin_info(); extern BoardPlugin * get_reading_bplugin_info(); extern BoardPlugin * get_reversecount_bplugin_info(); +extern BoardPlugin * get_scale_bplugin_info(); extern BoardPlugin * get_shapegame_bplugin_info(); extern BoardPlugin * get_smallnumbers_bplugin_info(); extern BoardPlugin * get_submarine_bplugin_info(); @@ -72,6 +73,7 @@ extern BoardPlugin * get_target_bplugin_info(); extern BoardPlugin * get_traffic_bplugin_info(); extern BoardPlugin * get_wordsgame_bplugin_info(); extern BoardPlugin * get_python_bplugin_info(); +extern BoardPlugin * get_wordprocessor_bplugin_info(); #define MAX_NUMBER_OF_BOARDS 200 static BoardPlugin *static_boards_demo[MAX_NUMBER_OF_BOARDS]; @@ -105,20 +107,22 @@ void gc_board_init(void) static_boards_demo[i++] = get_menu_bplugin_info(); static_boards_demo[i++] = get_money_bplugin_info(); static_boards_demo[i++] = get_reading_bplugin_info(); + static_boards_demo[i++] = get_scale_bplugin_info(); static_boards_demo[i++] = get_submarine_bplugin_info(); static_boards_demo[i++] = get_superbrain_bplugin_info(); static_boards_demo[i++] = get_target_bplugin_info(); + static_boards_demo[i++] = get_wordprocessor_bplugin_info(); static_boards_demo[i++] = NULL; gc_board_number_in_demo = i - 2; i=0; - static_boards[i++] = get_awele_bplugin_info(); static_boards[i++] = get_advanced_colors_bplugin_info(); static_boards[i++] = get_algebra_bplugin_info(); static_boards[i++] = get_algebra_bplugin_info(); static_boards[i++] = get_algebra_guesscount_bplugin_info(); + static_boards[i++] = get_awele_bplugin_info(); static_boards[i++] = get_canal_lock_bplugin_info(); static_boards[i++] = get_chess_bplugin_info(); static_boards[i++] = get_click_on_letter_bplugin_info(); @@ -145,18 +149,20 @@ void gc_board_init(void) static_boards[i++] = get_money_bplugin_info(); static_boards[i++] = get_paratrooper_bplugin_info(); static_boards[i++] = get_planegame_bplugin_info(); + static_boards[i++] = get_python_bplugin_info(); static_boards[i++] = get_railroad_bplugin_info(); static_boards[i++] = get_read_colors_bplugin_info(); static_boards[i++] = get_reading_bplugin_info(); static_boards[i++] = get_reversecount_bplugin_info(); + static_boards[i++] = get_scale_bplugin_info(); static_boards[i++] = get_shapegame_bplugin_info(); static_boards[i++] = get_smallnumbers_bplugin_info(); static_boards[i++] = get_submarine_bplugin_info(); static_boards[i++] = get_superbrain_bplugin_info(); static_boards[i++] = get_target_bplugin_info(); static_boards[i++] = get_traffic_bplugin_info(); + static_boards[i++] = get_wordprocessor_bplugin_info(); static_boards[i++] = get_wordsgame_bplugin_info(); - static_boards[i++] = get_python_bplugin_info(); static_boards[i++] = NULL; i=0; diff --git a/src/gcompris/gcompris.c b/src/gcompris/gcompris.c index ca816aa..74f1bdb 100644 --- a/src/gcompris/gcompris.c +++ b/src/gcompris/gcompris.c @@ -108,7 +108,6 @@ static gchar *popt_root_menu = NULL; static gchar *popt_local_activity = NULL; static gint popt_administration = FALSE; static gchar *popt_database = NULL; -static gchar *popt_logs_database = NULL; static gint popt_create_db = FALSE; static gint popt_reread_menu = FALSE; static gchar *popt_profile = NULL; @@ -167,9 +166,6 @@ static GOptionEntry options[] = { {"database", 'b', 0, G_OPTION_ARG_STRING, &popt_database, N_("Use alternate database for profiles [$HOME/.config/gcompris/gcompris_sqlite.db]"), NULL}, - {"logs", 'j', 0, G_OPTION_ARG_STRING, &popt_logs_database, - N_("Use alternate database for logs"), NULL}, - {"create-db",'\0', 0, G_OPTION_ARG_NONE, &popt_create_db, N_("Create the alternate database for profiles"), NULL}, @@ -1380,7 +1376,7 @@ main (int argc, char *argv[]) /* usefull for OSX bundle app */ if (g_path_is_absolute (argv[0])) { const gchar *dirname = g_path_get_dirname((const gchar *)argv[0]); - exec_prefix = g_build_filename (dirname, "..", NULL); + exec_prefix = g_build_filename (dirname, "..", NULL); printf("dirname %s\n", dirname); printf("exec_prefix %s\n", exec_prefix); } diff --git a/src/gcompris/help.c b/src/gcompris/help.c index 3eaf359..3b7d4a5 100644 --- a/src/gcompris/help.c +++ b/src/gcompris/help.c @@ -72,6 +72,8 @@ static GtkTextBuffer *buffer_content; */ gboolean gc_help_has_board (GcomprisBoard *gcomprisBoard) { + if(!gcomprisBoard) + return FALSE; prerequisite = gcomprisBoard->prerequisite; goal = gcomprisBoard->goal; diff --git a/src/gcompris/log.c b/src/gcompris/log.c index 591183b..c2767b5 100644 --- a/src/gcompris/log.c +++ b/src/gcompris/log.c @@ -31,10 +31,7 @@ * */ -#include <unistd.h> -#include <glib/gstdio.h> #include <time.h> -#include <string.h> #include <gcompris.h> #include "gcompris_db.h" @@ -42,12 +39,6 @@ #define KEYLOG_MAX 256 -#ifdef WIN32 -static gchar hostname[256]="unknown"; -#else -static gchar hostname[256]; -#endif - static gchar *comment_set; static gchar keylog[KEYLOG_MAX]; static GcomprisBoard *gcomprisBoard_set; @@ -67,11 +58,7 @@ void gc_log_start (GcomprisBoard *gcomprisBoard) { start_time = time(NULL); start_time_key = time(NULL); -#ifndef WIN32 - gethostname(hostname, 256); -#endif - - comment_set = strdup(""); + comment_set = g_strdup(""); keylog[0] = '\0'; } |