Commit 45d030da authored by Bruno Coudoin's avatar Bruno Coudoin

Fixed comilation option --disable-sqlite.

	Should work as expected now.

	Changed all original message to use > and < in .xml.in files.
	Not using them bugs the libxml2 parsing.
	I added them around all http://... reference because translators tend to use
	the form <http://...>
	now hopefully they will respect this syntax.
parent d4278015
2005-09-11 Bruno coudoin <bruno.coudoin@free.fr>
Fixed comilation option --disable-sqlite.
Should work as expected now.
Changed all original message to use &gt; and &lt; in .xml.in files.
Not using them bugs the libxml2 parsing.
I added them around all http://... reference because translators tend to use
the form <http://...>
now hopefully they will respect this syntax.
* boards/algebra_guesscount.xml.in:
* boards/chronos.xml.in:
* boards/clickgame.xml.in:
* boards/connect4.xml.in:
* boards/erase.xml.in:
* boards/erase_clic.xml.in:
* boards/erase_double_clic.xml.in:
* boards/hanoi_real.xml.in:
* boards/sudoku.xml.in:
* docs/create_thumbnails.pl:
* docs/screenshots/billard_small.jpg:
* docs/screenshots/hanoi_real.jpg:
* docs/screenshots/hanoi_real_small.jpg:
* src/gcompris/gameutil.c: (gcompris_add_xml_to_data),
(gcompris_read_xml_file), (gcompris_load_menus_dir),
(gcompris_load_menus):
* src/gcompris/gcompris.c: (gcompris_init):
* src/gcompris/gcompris_db.c: (gcompris_set_board_conf),
(gcompris_get_conf_with_table), (gcompris_get_conf):
2005-09-11 Bruno coudoin <bruno.coudoin@free.fr>
Reworked icons by Bruno.
* boards/boardicons/fifteen.png:
* boards/boardicons/hanoi.png:
* boards/boardicons/hanoi_real.png:
2005-09-10 Bruno coudoin <bruno.coudoin@free.fr>
Complete the real hanoi game, including new images.
moved configure to 7.0
* boards/boardicons/hanoi_real.png:
* boards/hanoi_real.xml.in:
* boards/images/disc1.png:
* boards/images/disc2.png:
* boards/images/disc3.png:
* boards/images/disc4.png:
* boards/images/disc_support.png:
* configure.in:
* src/boards/hanoi_real.c: (start_board), (hanoi_create_item),
(item_event):
2005-09-11 Yves Combe,,, <yves@ycombe.net>
cleaning unused files
......@@ -70,6 +125,7 @@
* src/boards/reading.c: (reading_next_level),
(reading_destroy_all_items), (get_wordfile):
>>>>>>> 1.630
2005-09-10 Bruno coudoin <bruno.coudoin@free.fr>
Added non functionnal hanoi_real game (the real tower of hanoi).
......
......@@ -23,7 +23,7 @@ top of the board area that give the specified result. The numbers and
operators can be unselected by clicking on them.</_manual>
<_credit>Animal pictures are taken from the Animal
Photography Page of Ralf Schmode (http://schmode.net/) Ralf has given
Photography Page of Ralf Schmode &lt;http://schmode.net/&gt; Ralf has given
gcompris the authorization to include his pictures. Thanks a lot Ralf.
</_credit>
</Board>
......
......@@ -17,7 +17,7 @@
<_credit>Moon photo is copyright NASA.
The space sounds come from Tuxpaint and Vegastrike which are released under the GPL license.
The transportation images are copyright Franck Doucet.
Dates of Transportation are based on those found in http://www.wikipedia.org.
Dates of Transportation are based on those found in &lt;http://www.wikipedia.org&gt;.
</_credit>
</Board>
</GCompris>
......
......@@ -15,7 +15,7 @@
<_manual>Click with the left mouse button on the moving fish.</_manual>
<_credit>Fish are taken from the Unix utility xfishtank.
Images are taken from the National Undersea Research Program (NURP) Collection
at http://www.photolib.noaa.gov
at &lt;http://www.photolib.noaa.gov&gt;
All image credits belong to the OAR/National Undersea Research Program (NURP),
except for the first image, which is property of the University of North Carolina at Wilmington.
The images used in each level are:
......
......@@ -12,6 +12,6 @@
<_prerequisite>Mouse manipulation</_prerequisite>
<_goal>Create a line of 4 pieces either horizontally or vertically</_goal>
<_manual>Click anywhere in the line in which you want to drop a piece</_manual>
<_credit>Laurent Lacheny. Images and Artificial Intelligence taken from project 4stattack by Jeroen Vloothuis. The original project can be found on http://forcedattack.sourceforge.net</_credit>
<_credit>Laurent Lacheny. Images and Artificial Intelligence taken from project 4stattack by Jeroen Vloothuis. The original project can be found on &lt;http://forcedattack.sourceforge.net&gt;</_credit>
</Board>
</GCompris>
......@@ -16,7 +16,7 @@
<_manual>
Move the mouse until all the blocks disappear.
</_manual>
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode (http://schmode.net/) and from LE BERRE Daniel. They gave GCompris the authorization to include their pictures. Thanks a lot.
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode &lt;http://schmode.net/&gt; and from LE BERRE Daniel. They gave GCompris the authorization to include their pictures. Thanks a lot.
</_credit>
</Board>
</GCompris>
......@@ -16,7 +16,7 @@
<_manual>
Click on rectangles with the mouse until all the blocks disappear.
</_manual>
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode (http://schmode.net/)
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode &lt;http://schmode.net/&gt;
Ralf has given gcompris the authorization to include his pictures. Thanks a lot Ralf.
</_credit>
</Board>
......
......@@ -16,7 +16,7 @@
<_manual>
Double click on rectangles with the mouse until all the blocks disappear.
</_manual>
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode (http://schmode.net/)
<_credit>Animal pictures are taken from the Animal Photography Page of Ralf Schmode &lt;http://schmode.net/&gt;
Ralf has given gcompris the authorization to include his pictures. Thanks a lot Ralf.
</_credit>
</Board>
......
......@@ -17,7 +17,7 @@
<_manual>Drag and Drop the top pieces only from one peg to another, to
reproduce the tower on the right in the empty space on the left.
</_manual>
<_credit>The puzzle was invented by the French mathematician Edouard Lucas in 1883. There is a legend about a Hindu temple whose priests were constantly engaged in moving a set of 64 discs according to the rules of the Tower of Hanoi puzzle. According to the legend, the world would end when the priests finished their work. The puzzle is therefore also known as the Tower of Brahma puzzle. It is not clear whether Lucas invented this legend or was inspired by it. (source Wikipedia http://en.wikipedia.org/wiki/Tower_of_hanoi)
<_credit>The puzzle was invented by the French mathematician Edouard Lucas in 1883. There is a legend about a Hindu temple whose priests were constantly engaged in moving a set of 64 discs according to the rules of the Tower of Hanoi puzzle. According to the legend, the world would end when the priests finished their work. The puzzle is therefore also known as the Tower of Brahma puzzle. It is not clear whether Lucas invented this legend or was inspired by it. (source Wikipedia &lt;http://en.wikipedia.org/wiki/Tower_of_hanoi&gt;)
</_credit>
</Board>
</GCompris>
......@@ -12,7 +12,7 @@
<_description>Symbols must be unique in a row,
in a column, and (if defined) each region.</_description>
<_prerequisite>Completing the puzzle requires patience and logical ability</_prerequisite>
<_goal>The aim of the puzzle is to enter a symbol or numeral from 1 through 9 in each cell of a grid, most frequently a 9x9 grid made up of 3x3 subgrids (called 'regions'), starting with various symbols or numerals given in some cells (the 'givens'). Each row, column and region must contain only one instance of each symbol or numeral (Source http://en.wikipedia.org/wiki/Sudoku).</_goal>
<_goal>The aim of the puzzle is to enter a symbol or numeral from 1 through 9 in each cell of a grid, most frequently a 9x9 grid made up of 3x3 subgrids (called 'regions'), starting with various symbols or numerals given in some cells (the 'givens'). Each row, column and region must contain only one instance of each symbol or numeral (Source &lt;http://en.wikipedia.org/wiki/Sudoku&gt;).</_goal>
<_manual>For the first level with colored symbols, drag symbols on the left to their target position.
For the higher levels, click on an empty square to give it the keyboard focus. Then enter a possible letter or number. GCompris will not let you enter invalid data.
</_manual>
......
......@@ -24,6 +24,7 @@ foreach my $image (@files) {
next if (-f "$thumb");
print "Creating $thumb\n";
system ("convert -geometry ".$thumb_size.
" -quality 100 $file $thumb") == 0
|| die "Problems with convert: $?\n";
......
docs/screenshots/billard_small.jpg

6.85 KB | W: | H:

docs/screenshots/billard_small.jpg

8.76 KB | W: | H:

docs/screenshots/billard_small.jpg
docs/screenshots/billard_small.jpg
docs/screenshots/billard_small.jpg
docs/screenshots/billard_small.jpg
  • 2-up
  • Swipe
  • Onion skin
/* gcompris - gameutil.c
*
* Time-stamp: <2005/08/29 00:26:24 yves>
* Time-stamp: <2005/09/11 18:12:34 bruno>
*
* Copyright (C) 2000 Bruno Coudoin
*
......@@ -548,7 +548,9 @@ gcompris_add_xml_to_data(xmlDocPtr doc, xmlNodePtr xmlnode, GNode * child, Gcomp
credit
);
g_warning("db board written %d in %d %s/%s", gcomprisBoard->board_id, gcomprisBoard->section_id, gcomprisBoard->section, gcomprisBoard->name);
g_warning("db board written %d in %d %s/%s",
gcomprisBoard->board_id, gcomprisBoard->section_id,
gcomprisBoard->section, gcomprisBoard->name);
}
}
......@@ -582,7 +584,7 @@ GcomprisBoard *gcompris_read_xml_file(GcomprisBoard *gcomprisBoard,
/* pointer to the new doc */
xmlDocPtr doc;
g_return_val_if_fail(fname!=NULL,FALSE);
g_return_val_if_fail(fname!=NULL, NULL);
filename = g_strdup(fname);
......@@ -826,12 +828,20 @@ void gcompris_load_menus_dir(char *dirname, gboolean db){
list_old_boards_id = suppress_int_from_list(list_old_boards_id, board_read->board_id);
if (properties->administration)
boards_list = g_list_append(boards_list, board_read);
else
else {
if ((strncmp(board_read->section,
"/administration",
strlen("/administration"))!=0) &&
(!(g_list_find_custom(gcompris_get_current_profile()->activities, &(board_read->board_id), compare_id))))
boards_list = g_list_append(boards_list, board_read);
strlen("/administration"))!=0)) {
if (gcompris_get_current_profile() &&
!(g_list_find_custom(gcompris_get_current_profile()->activities,
&(board_read->board_id), compare_id))) {
boards_list = g_list_append(boards_list, board_read);
} else {
boards_list = g_list_append(boards_list, board_read);
}
}
}
}
}
g_free(filename);
......@@ -884,8 +894,9 @@ void gcompris_load_menus()
}
}
else {
int db = (gcompris_get_current_profile() ? TRUE: FALSE);
properties->reread_menu = TRUE;
gcompris_load_menus_dir(properties->package_data_dir, TRUE);
gcompris_load_menus_dir(properties->package_data_dir, db);
GDate *today = g_date_new();
g_date_set_time (today, time (NULL));
......
......@@ -1102,10 +1102,10 @@ gcompris_init (int argc, char *argv[])
/* shared_dir initialised, now we can set the default */
properties->database = get_default_database_name ( properties->shared_dir );
printf( " Infos: %s %s %s \n",
properties->shared_dir,
properties->users_dir,
properties->database);
g_warning( "Infos:\n Shared dir '%s'\n Users dir '%s'\n Database '%s'\n",
properties->shared_dir,
properties->users_dir,
properties->database);
if (popt_database){
if (g_file_test(popt_database, G_FILE_TEST_EXISTS)) {
......
......@@ -1190,6 +1190,7 @@ void gcompris_set_board_conf(GcomprisProfile *profile,
int ncolumn;
gchar *request;
#ifdef USE_SQLITE
request = g_strdup_printf(CHECK_CONF(profile->profile_id,
board->board_id,
key));
......@@ -1247,6 +1248,7 @@ void gcompris_set_board_conf(GcomprisProfile *profile,
g_free(request);
}
#endif
}
#define GET_CONF(p, b) \
......@@ -1264,6 +1266,7 @@ GHashTable *gcompris_get_conf_with_table(int profile_id, int board_id, GHashTabl
GHashTable *hash_conf = table;
#ifdef USE_SQLITE
request = g_strdup_printf(GET_CONF(profile_id,
board_id));
......@@ -1296,7 +1299,7 @@ GHashTable *gcompris_get_conf_with_table(int profile_id, int board_id, GHashTabl
}
sqlite3_free_table(result);
#endif
return hash_conf;
}
......@@ -1304,8 +1307,11 @@ GHashTable *gcompris_get_conf(GcomprisProfile *profile, GcomprisBoard *board )
{
GHashTable *hash_result = g_hash_table_new_full(g_str_hash, g_str_equal, g_free, g_free);
#ifdef USE_SQLITE
return gcompris_get_conf_with_table( profile->profile_id, board->board_id, hash_result) ;
#else
return hash_result;
#endif
}
GHashTable *gcompris_get_board_conf()
......
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