Commit bffdb7db authored by Bruno Coudoin's avatar Bruno Coudoin

- Minor fixes for windows version

	- Fixed configure.in to set SQLITE even if pysqlite is not detected

	* configure.in:
	* gcompris-installer.nsi:
	* src/boards/Makefile.mingw:
	* src/gcompris/board.c: (init_plugins):
	* src/gcompris/gcompris.c: (setup_window), (map_cb),
	(gcompris_terminate):
parent c3099202
2005-12-14 Bruno coudoin <bruno.coudoin@free.fr>
- Minor fixes for windows version
- Fixed configure.in to set SQLITE even if pysqlite is not detected
* configure.in:
* gcompris-installer.nsi:
* src/boards/Makefile.mingw:
* src/gcompris/board.c: (init_plugins):
* src/gcompris/gcompris.c: (setup_window), (map_cb),
(gcompris_terminate):
*** RELEASE 7.2 ***
2005-12-11 Bruno coudoin <bruno.coudoin@free.fr>
......
......@@ -308,25 +308,29 @@ else
dnl Set this variable for the .spec.in file
REQUIRE_PYTHON="python gnome-python gnome-python-canvas pygtk2.0"
dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas
dnl gnomecanvas not supported yet in gcompris
dnl
dnl AM_CHECK_PYMOD(gnome.canvas,,test_gnomecanvas="no",test_gnomevanvas="yes")
dnl if test x$test_gnomecanvas = xyes ; then
dnl AM_CHECK_PYMOD(gnomecanvas,,,AC_MSG_ERROR([*** gnome.canvas or gnomecanvas installed but not visible from python ]))
dnl fi
if test x$with_sqlite = xyes; then
PKG_CHECK_MODULES(SQLITE3, sqlite3,, AC_MSG_ERROR([*** SQLITE3 not found!]))
AC_DEFINE([USE_SQLITE], 1,[SQLITE Database, Profiles are enabled])
AM_CHECK_PYMOD(pysqlite2,,,AC_MSG_ERROR([*** pysqlite2 missing ]))
REQUIRE_PYTHON="$REQUIRE_PYTHON python-sqlite2"
fi
dnl with gnome-python >= 2.10 gnome.canvas is obsolete. use gnomecanvas
dnl gnomecanvas not supported yet in gcompris
dnl
dnl AM_CHECK_PYMOD(gnome.canvas,,test_gnomecanvas="no",test_gnomevanvas="yes")
dnl if test x$test_gnomecanvas = xyes ; then
dnl AM_CHECK_PYMOD(gnomecanvas,,,AC_MSG_ERROR([*** gnome.canvas or gnomecanvas installed but not visible from python ]))
dnl fi
if test x$with_sqlite = xyes; then
AM_CHECK_PYMOD(pysqlite2,,,AC_MSG_ERROR([*** pysqlite2 missing ]))
REQUIRE_PYTHON="$REQUIRE_PYTHON python-sqlite2"
fi
else
AC_MSG_WARN([py-build-only: Skipping python modules dependancies])
AC_MSG_WARN([py-build-only: Do not forget to install pygtk, gnome-python, pysqlite2 and pyxml])
fi
if test x$with_sqlite = xyes; then
PKG_CHECK_MODULES(SQLITE3, sqlite3,, AC_MSG_ERROR([*** SQLITE3 not found!]))
AC_DEFINE([USE_SQLITE], 1,[SQLITE Database, Profiles are enabled])
fi
fi
AM_CONDITIONAL(USE_SQLITE, test x$with_sqlite = xyes)
......
......@@ -18,7 +18,7 @@ Var STARTUP_RUN_KEY
;The name var is set in .onInit
Name $name
!define GCOMPRIS_VERSION "7.1"
!define GCOMPRIS_VERSION "7.2"
OutFile "gcompris-${GCOMPRIS_VERSION}.exe"
......@@ -371,15 +371,15 @@ Section Uninstall
; Remove Language preference info
DeleteRegKey HKCU ${GCOMPRIS_REG_KEY} ;${MUI_LANGDLL_REGISTRY_ROOT} ${MUI_LANGDLL_REGISTRY_KEY}
RMDir /r "$INSTDIR\locale"
RMDir /r "$INSTDIR\pixmaps"
RMDir /r "$INSTDIR\perlmod"
RMDir "$INSTDIR\plugins"
RMDir /r "$INSTDIR\etc"
RMDir /r "$INSTDIR\GTK"
RMDir /r "$INSTDIR\lib"
RMDir /r "$INSTDIR\share"
Delete "$INSTDIR\gcompris.exe"
Delete "$INSTDIR\${GCOMPRIS_UNINST_EXE}"
;Try to remove Gcompris install dir .. if empty
RMDir "$INSTDIR"
RMDir /r "$INSTDIR"
; Shortcuts..
RMDir /r "$SMPROGRAMS\Gcompris"
......
......@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: gcompris-7.0.x-fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2005-11-18 23:14+0100\n"
"PO-Revision-Date: 2005-11-19 00:28+0100\n"
"PO-Revision-Date: 2005-12-12 23:44+0100\n"
"Last-Translator: Bruno Coudoin <bruno.coudoin@free.fr>\n"
"Language-Team: <fr@li.org>\n"
"MIME-Version: 1.0\n"
......@@ -4712,7 +4712,7 @@ msgid ""
msgstr ""
"GCompris est un logiciel libre distribué sous les termes de la licence GPL. Afin de supporter son développement, la version Windows ne propose que %d des %d activités. Vous pouvez obtenir la version complète contre une petite contribution, en allant sur\n"
"<http://gcompris.net>\n"
"La version Linux ne contient pas cette restriction. Notez que GCompris est aussi développé pour libérer les écoles du monopole des vendeurs de logiciels propriétaires. Si vous aussi, vous pensez que nous devons apprendre la liberté à nos enfants, merci d'utiliser GNU/Linux. Vous pouvez obtenirplus d'informations sur http://www.fsf.org/philosophy"
"La version Linux ne contient pas cette restriction. Notez que GCompris est aussi développé pour libérer les écoles du monopole des vendeurs de logiciels propriétaires. Si vous aussi, vous pensez que nous devons apprendre la liberté à nos enfants, merci d'utiliser GNU/Linux. Vous pouvez obtenir plus d'informations sur http://www.fsf.org/philosophy"
#: ../src/gcompris/gcompris.c:1141
#, c-format
......
......@@ -118,6 +118,7 @@ BOARDS_C_SRC = \
enumerate.c \
fifteen.c \
gletters.c \
gtans.c gtans_callbacks.c gtans_support.c gtans_interface.c \
hanoi.c \
hanoi_real.c \
imageid.c \
......
......@@ -46,6 +46,7 @@ extern BoardPlugin * get_enumerate_bplugin_info();
extern BoardPlugin * get_erase_bplugin_info();
extern BoardPlugin * get_fifteen_bplugin_info();
extern BoardPlugin * get_gletters_bplugin_info();
extern BoardPlugin * get_gtans_bplugin_info();
extern BoardPlugin * get_hanoi_bplugin_info();
extern BoardPlugin * get_hanoi_real_bplugin_info();
extern BoardPlugin * get_imageid_bplugin_info();
......@@ -107,48 +108,50 @@ void init_plugins(void)
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_gtans_bplugin_info();
static_boards_demo[i++] = NULL;
i=0;
static_boards[i++] = get_algebra_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_canal_lock_bplugin_info();
static_boards[i++] = get_chess_bplugin_info();
static_boards[i++] = get_click_on_letter_bplugin_info();
static_boards[i++] = get_clickgame_bplugin_info();
static_boards[i++] = get_clockgame_bplugin_info();
static_boards[i++] = get_colors_bplugin_info();
static_boards[i++] = get_draw_bplugin_info();
static_boards[i++] = get_enumerate_bplugin_info();
static_boards[i++] = get_erase_bplugin_info();
static_boards[i++] = get_fifteen_bplugin_info();
static_boards[i++] = get_gletters_bplugin_info();
static_boards[i++] = get_gtans_bplugin_info();
static_boards[i++] = get_hanoi_bplugin_info();
static_boards[i++] = get_hanoi_real_bplugin_info();
static_boards[i++] = get_imageid_bplugin_info();
static_boards[i++] = get_leftright_bplugin_info();
static_boards[i++] = get_machpuzzle_bplugin_info();
static_boards[i++] = get_maze_bplugin_info();
static_boards[i++] = get_memory_bplugin_info();
static_boards[i++] = get_menu_bplugin_info();
static_boards[i++] = get_missingletter_bplugin_info();
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_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_shapegame_bplugin_info();
static_boards[i++] = get_smallnumbers_bplugin_info();
static_boards[i++] = get_traffic_bplugin_info();
static_boards[i++] = get_wordsgame_bplugin_info();
static_boards[i++] = get_fifteen_bplugin_info();
static_boards[i++] = get_algebra_bplugin_info();
static_boards[i++] = get_click_on_letter_bplugin_info();
static_boards[i++] = get_colors_bplugin_info();
static_boards[i++] = get_canal_lock_bplugin_info();
static_boards[i++] = get_clickgame_bplugin_info();
static_boards[i++] = get_clockgame_bplugin_info();
static_boards[i++] = get_enumerate_bplugin_info();
static_boards[i++] = get_erase_bplugin_info();
static_boards[i++] = get_gletters_bplugin_info();
static_boards[i++] = get_hanoi_bplugin_info();
static_boards[i++] = get_hanoi_real_bplugin_info();
static_boards[i++] = get_menu_bplugin_info();
static_boards[i++] = get_railroad_bplugin_info();
static_boards[i++] = get_reading_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_chess_bplugin_info();
static_boards[i++] = get_traffic_bplugin_info();
static_boards[i++] = get_wordsgame_bplugin_info();
static_boards[i++] = NULL;
i=0;
......
......@@ -772,8 +772,8 @@ static void setup_window ()
board_play (board_to_start);
#ifdef WIN32
#define WIN_ACTIVITY_COUNT 15
#define TOTAL_ACTIVITY_COUNT 55
#define WIN_ACTIVITY_COUNT 16
#define TOTAL_ACTIVITY_COUNT 58
{
if(strncmp(properties->key, "thanks_for_your_help", 20)!=0) {
char *msg = g_strdup_printf(_("GCompris is free software released under the GPL License. In order to support its development, the Windows version provides only %d of the %d activities. You can get the full version for a small fee at\n<http://gcompris.net>\nThe Linux version does not have this restriction. Note that GCompris is being developed to free schools from monopolistic software vendors. If you also believe that we should teach freedom to children, please consider using GNU/Linux. Get more information at FSF:\n<http://www.fsf.org/philosophy>"), WIN_ACTIVITY_COUNT, TOTAL_ACTIVITY_COUNT);
......@@ -905,8 +905,7 @@ static void map_cb (GtkWidget *widget, gpointer data)
is_mapped = TRUE;
gcompris_set_fullscreen(properties->fullscreen);
}
printf("\nEVENT\n============================================================\n\n");
g_warning("gcompris window is now mapped");
}
/*
......@@ -916,7 +915,12 @@ static void map_cb (GtkWidget *widget, gpointer data)
void gcompris_terminate(int signum)
{
#ifndef WIN32 /* Not supported on windows */
g_warning("gcompris got the %s signal, starting exit procedure", strsignal(signum));
#else
g_warning("gcompris got the %d signal, starting exit procedure", signum);
#endif
gcompris_exit();
}
......
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