added melody board by Jose JORGE

src/boards/py-mod-utils.c: (py_gcompris_set_image_focus): cleanup, removed traces

1 files changed, 257 insertions, 95 deletions

diff --git a/po/hr.po b/po/hr.po
index d8a877a..a4539d0 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gcompris 0\n"
-"POT-Creation-Date: 2003-11-06 18:07+0100\n"
+"POT-Creation-Date: 2003-12-15 21:10+0100\n"
 "PO-Revision-Date: 2003-11-10 16:49+CET\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -364,7 +364,8 @@ msgid ""
 msgstr ""
 
 #: boards/algebra_guesscount.xml.in.h:2
-msgid "Deploy a strategy to arrange a set of arithmetic operations to find a value"
+msgid ""
+"Deploy a strategy to arrange a set of arithmetic operations to find a value"
 msgstr ""
 
 #: boards/algebra_guesscount.xml.in.h:3
@@ -560,7 +561,7 @@ msgstr ""
 msgid "None"
 msgstr "Nijedan"
 
-#: boards/clickgame.xml.in.h:1 src/boards/clickgame.c:85
+#: boards/clickgame.xml.in.h:1 src/boards/clickgame.c:86
 msgid "Click On Me"
 msgstr ""
 
@@ -577,7 +578,7 @@ msgid ""
 "Location: Unknown (image nur03011) Location: Unknown (image nur03013)"
 msgstr ""
 
-#: boards/clickgame.xml.in.h:3 src/boards/clickgame.c:86
+#: boards/clickgame.xml.in.h:3 src/boards/clickgame.c:87
 msgid ""
 "Left-Click with the mouse on all swimming fishes before they leave the "
 "fishtank"
@@ -665,11 +666,11 @@ msgid ""
 "the double entry table."
 msgstr ""
 
-#: boards/draw.xml.in.h:1 src/boards/draw.c:205
+#: boards/draw.xml.in.h:1 src/boards/draw.c:206
 msgid "A simple vector drawing tool"
 msgstr ""
 
-#: boards/draw.xml.in.h:2 src/boards/draw.c:206
+#: boards/draw.xml.in.h:2 src/boards/draw.c:207
 msgid "Creative board where you can freely draw"
 msgstr ""
 
@@ -821,7 +822,7 @@ msgstr ""
 #: boards/imageid.xml.in.h:3 boards/imagename.xml.in.h:4
 #: boards/readingh.xml.in.h:5 boards/readingv.xml.in.h:4
 #: src/boards/imageid.c:109 src/boards/missingletter.c:101
-#: src/boards/reading.c:100
+#: src/boards/reading.c:101
 msgid "Reading"
 msgstr "Čitam"
 
@@ -1369,7 +1370,7 @@ msgid ""
 "rebuild the original painting."
 msgstr ""
 
-#: boards/paintings.xml.in.h:3 src/boards/shapegame.c:160
+#: boards/paintings.xml.in.h:3 src/boards/shapegame.c:161
 msgid "Make the puzzle"
 msgstr ""
 
@@ -1430,7 +1431,8 @@ msgid "Paratrooper"
 msgstr ""
 
 #: boards/paratrooper.xml.in.h:5
-msgid "This board is game oriented. It doesnt needs specific skills to play with."
+msgid ""
+"This board is game oriented. It doesnt needs specific skills to play with."
 msgstr ""
 
 #: boards/planegame.xml.in.h:1
@@ -1464,7 +1466,8 @@ msgid "Test board for the python plugin"
 msgstr ""
 
 #: boards/pythontest.xml.in.h:5
-msgid "Thanks to Guido van Rossum and the python team for this powerfull language !"
+msgid ""
+"Thanks to Guido van Rossum and the python team for this powerfull language !"
 msgstr ""
 
 #: boards/railroad.xml.in.h:1
@@ -1579,6 +1582,21 @@ msgid "Vertical reading practice"
 msgstr ""
 
 #: boards/redraw.xml.in.h:1
+msgid ""
+"At each level, a drawing is displayed in the right area. You must redraw it "
+"in the left area."
+msgstr ""
+
+#: boards/redraw.xml.in.h:2
+msgid ""
+"First you must select the proper tool in the tool bar. Then, you must drag "
+"the mouse to create objects. When you are done, click on the OK button, you "
+"will be told were the errors are with little red cross. The order of objects "
+"(above/under) is not important but take care not to have unwanted object "
+"under others."
+msgstr ""
+
+#: boards/redraw.xml.in.h:3
 msgid "Redraw the given item"
 msgstr ""
 
@@ -1702,7 +1720,8 @@ msgid "Tux has hidden several items, find them back in the correct order"
 msgstr ""
 
 #: boards/target.xml.in.h:1
-msgid "Can move the mouse, can read numbers and count up to 15 for the first level"
+msgid ""
+"Can move the mouse, can read numbers and count up to 15 for the first level"
 msgstr ""
 
 #: boards/target.xml.in.h:2
@@ -1725,7 +1744,7 @@ msgstr ""
 msgid "Touch the target and count your points"
 msgstr ""
 
-#: boards/traffic.xml.in.h:1 src/boards/traffic.c:97
+#: boards/traffic.xml.in.h:1 src/boards/traffic.c:99
 msgid "A sliding block puzzle game"
 msgstr ""
 
@@ -1752,11 +1771,11 @@ msgid ""
 "party on his boat. Help him to have a shower."
 msgstr ""
 
-#: boards/wordsgame.xml.in.h:1 src/boards/wordsgame.c:86
+#: boards/wordsgame.xml.in.h:1 src/boards/wordsgame.c:87
 msgid "Falling Words"
 msgstr ""
 
-#: boards/wordsgame.xml.in.h:2 src/boards/wordsgame.c:87
+#: boards/wordsgame.xml.in.h:2 src/boards/wordsgame.c:88
 msgid "Fully type the falling words before they reach the ground"
 msgstr ""
 
@@ -1778,18 +1797,18 @@ msgstr ""
 
 #: src/boards/advanced_colors.c:538 src/boards/imageid.c:580
 #: src/boards/missingletter.c:587 src/boards/read_colors.c:497
-#: src/boards/shapegame.c:1725 src/boards/traffic.c:623
-#: src/gcompris/gameutil.c:93 src/gcompris/gameutil.c:177
-#: src/gcompris/gameutil.c:511 src/gcompris/gameutil.c:512
+#: src/boards/shapegame.c:1735 src/gcompris/gameutil.c:93
+#: src/gcompris/gameutil.c:177 src/gcompris/gameutil.c:511
+#: src/gcompris/gameutil.c:512 src/gcompris/gcompris.c:369
 #: src/gcompris/images_selector.c:477 src/gcompris/skin.c:83
-#: src/gcompris/skin.c:261 src/gcompris/soundutil.c:369
+#: src/gcompris/skin.c:261
 #, c-format
 msgid "Couldn't find file %s !"
 msgstr ""
 
 #: src/boards/advanced_colors.c:541 src/boards/imageid.c:583
 #: src/boards/missingletter.c:590 src/boards/read_colors.c:500
-#: src/boards/shapegame.c:1728
+#: src/boards/shapegame.c:1738
 #, c-format
 msgid "find file %s !"
 msgstr ""
@@ -1879,7 +1898,7 @@ msgid ""
 "enable the sound"
 msgstr ""
 
-#: src/boards/clickgame.c:182
+#: src/boards/clickgame.c:183
 #, c-format
 msgid "Couldn't open pixmap dir: %s"
 msgstr ""
@@ -1938,6 +1957,141 @@ msgstr ""
 msgid "Special board that embed python into gcompris."
 msgstr ""
 
+#. gcompris - redraw
+#.
+#. Time-stamp: <2001/08/20 00:54:45 bruno>
+#.
+#. Copyright (C) 2003 Bruno Coudoin
+#.
+#. This program is free software; you can redistribute it and/or modify
+#. it under the terms of the GNU General Public License as published by
+#. the Free Software Foundation; either version 2 of the License, or
+#. (at your option) any later version.
+#.
+#. This program is distributed in the hope that it will be useful,
+#. but WITHOUT ANY WARRANTY; without even the implied warranty of
+#. MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#. GNU General Public License for more details.
+#.
+#. You should have received a copy of the GNU General Public License
+#. along with this program; if not, write to the Free Software
+#. Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#.
+#. PythonTest Board module
+#. TOOL SELECTION
+#. COLOR SELECTION
+#. Define the coord of each drawing area
+#. Global used for the select event
+#. The error root item
+#. Set it to 1 to let you create new forms
+#. Once set, draw your shape in the right area. Then clic on OK to display
+#. the data for the form (in the console). Then copy the data in the list at the end of
+#. this file in init_item_list
+#. Set self.editing_mode = None to forbid drawing in the right area
+#. self.editing_mode = 1
+#. Create our rootitem. We put each canvas item in it so at the end we
+#. only have to kill it. The canvas deletes all the items it contains automaticaly.
+#. Remove the root item removes all the others inside it
+#. Delete error previous mark if any
+#. Do nothing special
+#. Save a copy of the target drawing future comparison
+#. Save a copy of the drawing cause we need to remove empty items
+#. Remove all empty items
+#. Need to check if target image equals drawing image
+#. Delete previous mark if any
+#. Create our rootitem for error items mark
+#. display where there is errors
+#. if in_target is set then error are displayed in the target area
+#. Bad Icon Width and Height / 2
+#. The images target are always drawn on the drawing area to ease the final comparison
+#. Called by gcompris when the user click on the level icon
+#. Erase any displayed items (drawing and target)
+#. Display the current level target
+#. Set the level in the control bar
+#. Calc the index in drawlist
+#. the current board is finished : bail out
+#. Prepare an item for the coord display
+#. Create our rootitem for drawing items
+#. Reset the drawing
+#. Code that increments the sublevel and level
+#. And bail out if no more levels are available
+#. return 1 if continue, 0 if bail out
+#. Try the next level
+#. the current board is finished : bail out
+#. display current/sublevel number
+#: src/boards/python/redraw.py:314 src/boards/python/redraw.py:324
+msgid "Level"
+msgstr ""
+
+#. Display the tools
+#. Display the tools
+#. The last item is select, we select it by default
+#. Event when a tool is selected
+#. Deactivate old button
+#. Activate new button
+#. Display the color selector
+#. Display the tools
+#. The last item is the one we select by default
+#. Color event
+#. Deactivate old button
+#. Activate new button
+#. Display the drawing area
+#.
+#. Given coord are returned swapped
+#. Work fine for rect and ellipse but not line
+#. so that y2 > y1 and x2 > x1
+#.
+#. Draw the image target
+#. Save the drawing in image_target for future comparison
+#. Create our rootitem for target items
+#. The images target are always drawn on the drawing area to ease the final comparison
+#.
+#. Can specify the item type to draw via a real GTK type or a TOOL string
+#.
+#. Draw the grid
+#.
+#. Coord of the written numbers
+#. We manage a 2 colors grid
+#. Shadow for text number
+#. Text number
+#. Clicking on lines let you create object
+#. Shadow for text number
+#. Text number
+#. Clicking on lines let you create object
+#. Given x,y return a new x,y snapped to the grid
+#. Event when a click on any item. Perform the move
+#.
+#. MOUSE DRAG STOP
+#. ---------------
+#. Reset thein_select_ofx ofset
+#. Workaround for bad line positionning
+#. Save the ofset between the mouse pointer and the upper left corner of the object
+#. Check drawing boundaries
+#. We need to realign x cause the bounds values are not precise enough
+#. We need to realign y cause the bounds values are not precise enough
+#. Need to update current_drawing
+#. It's not a line
+#. It can only be a line
+#. Now perform the object move
+#. Workaround for bad line positionning
+#. Event when a click on an item happen on fill in type object
+#. Reset the item to our list
+#. Event when a click on an item happen on border fill type object
+#. Reset the item to our list
+#. Del an item and internal struct cleanup
+#. Warning, do not realy delete it or we bug the index of other items
+#. Event when a click on an item happen
+#.
+#. Display the mouse coord in the drawing or target area
+#. type:
+#. 1 = in drawing area
+#. 2 = in target area
+#. 3 = out of both area
+#.
+#: src/boards/python/redraw.py:815 src/boards/python/redraw.py:818
+msgid "Coordinate"
+msgstr ""
+
 #: src/boards/railroad.c:96
 msgid "Memory game"
 msgstr ""
@@ -1954,27 +2108,27 @@ msgstr ""
 msgid "Click on the corresponding color"
 msgstr ""
 
-#: src/boards/reading.c:101
+#: src/boards/reading.c:102
 msgid "Read a list of words and then tell if the given word is in it"
 msgstr ""
 
-#: src/boards/reading.c:313
+#: src/boards/reading.c:314
 msgid "Please, check if the word"
 msgstr ""
 
-#: src/boards/reading.c:333
+#: src/boards/reading.c:334
 msgid "is being displayed"
 msgstr ""
 
-#: src/boards/reading.c:516
+#: src/boards/reading.c:517
 msgid "I am Ready"
 msgstr ""
 
-#: src/boards/reading.c:553
+#: src/boards/reading.c:554
 msgid "Yes I saw it"
 msgstr ""
 
-#: src/boards/reading.c:583
+#: src/boards/reading.c:584
 msgid "No, it was not there"
 msgstr ""
 
@@ -1982,12 +2136,12 @@ msgstr ""
 msgid "Reverse count"
 msgstr ""
 
-#: src/boards/shapegame.c:161
+#: src/boards/shapegame.c:162
 msgid "Drag and Drop the items to rebuild the object"
 msgstr ""
 
 #. Enter Edit Mode
-#: src/boards/shapegame.c:407
+#: src/boards/shapegame.c:409
 msgid ""
 "You entered the Edit mode\n"
 "Move the puzzle items and\n"
@@ -1995,7 +2149,7 @@ msgid ""
 "'d' to display all the shapes"
 msgstr ""
 
-#: src/boards/shapegame.c:415
+#: src/boards/shapegame.c:417
 msgid ""
 "This board data are saved under\n"
 "/tmp/gcompris-board.xml"
@@ -2045,238 +2199,241 @@ msgid "GCompris Home Page"
 msgstr ""
 
 #: src/gcompris/about.c:227
-msgid "This software is a GNU Package and is released under the Gnu Public Licence"
+msgid ""
+"This software is a GNU Package and is released under the Gnu Public Licence"
 msgstr ""
 
 #: src/gcompris/about.c:255
 msgid "Help"
 msgstr "Pomoć"
 
-#: src/gcompris/about.c:289 src/gcompris/config.c:178 src/gcompris/help.c:341
+#: src/gcompris/about.c:289 src/gcompris/config.c:179 src/gcompris/help.c:341
 #: src/gcompris/images_selector.c:152
 msgid "OK"
 msgstr "U redu"
 
 #: src/gcompris/config.c:52
-msgid "Amharic"
+msgid "Your system default"
 msgstr ""
 
 #: src/gcompris/config.c:53
+msgid "Amharic"
+msgstr ""
+
+#: src/gcompris/config.c:54
 msgid "Arabic"
 msgstr "Arapski"
 
-#: src/gcompris/config.c:54
+#: src/gcompris/config.c:55
 msgid "Azerbaijani Turkic"
 msgstr ""
 
-#: src/gcompris/config.c:55
+#: src/gcompris/config.c:56
 msgid "Catalan"
 msgstr "Katalonski"
 
-#: src/gcompris/config.c:56
+#: src/gcompris/config.c:57
 msgid "Czech"
 msgstr "Češki"
 
-#: src/gcompris/config.c:57
+#: src/gcompris/config.c:58
 msgid "German"
 msgstr "Njemački"
 
-#: src/gcompris/config.c:58
+#: src/gcompris/config.c:59
 msgid "Greek"
 msgstr "Grčki"
 
-#: src/gcompris/config.c:59
+#: src/gcompris/config.c:60
 msgid "English"
 msgstr "Engleski"
 
-#: src/gcompris/config.c:60
+#: src/gcompris/config.c:61
 msgid "Spanish"
 msgstr "Španjolski"
 
-#: src/gcompris/config.c:61
+#: src/gcompris/config.c:62
 msgid "Finnish"
 msgstr "Finski"
 
-#: src/gcompris/config.c:62
+#: src/gcompris/config.c:63
 msgid "French"
 msgstr "Francuski"
 
-#: src/gcompris/config.c:63
+#: src/gcompris/config.c:64
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: src/gcompris/config.c:64
+#: src/gcompris/config.c:65
 msgid "Indian"
 msgstr "Min"
 
-#: src/gcompris/config.c:65
+#: src/gcompris/config.c:66
 msgid "Hungarian"
 msgstr "Mađarski"
 
-#: src/gcompris/config.c:66
+#: src/gcompris/config.c:67
 msgid "Italian"
 msgstr "Talijanski"
 
-#: src/gcompris/config.c:67
+#: src/gcompris/config.c:68
 msgid "Lithuanian"
 msgstr "Litvanski"
 
-#: src/gcompris/config.c:68
+#: src/gcompris/config.c:69
 msgid "Macedonian"
 msgstr "Makedonska"
 
-#: src/gcompris/config.c:69
+#: src/gcompris/config.c:70
 msgid "Malayalam"
 msgstr "Malajalamski"
 
-#: src/gcompris/config.c:70
+#: src/gcompris/config.c:71
 msgid "Malay"
 msgstr "Malajski"
 
-#: src/gcompris/config.c:71
+#: src/gcompris/config.c:72
 msgid "Dutch"
 msgstr "Nizozemski"
 
-#: src/gcompris/config.c:72
+#: src/gcompris/config.c:73
 msgid "Norwegian"
 msgstr "Norveški"
 
-#: src/gcompris/config.c:73
+#: src/gcompris/config.c:74
 msgid "Polish"
 msgstr "Poljski"
 
-#: src/gcompris/config.c:74
+#: src/gcompris/config.c:75
 msgid "Portuguese"
 msgstr "Portugalski"
 
-#: src/gcompris/config.c:75
+#: src/gcompris/config.c:76
 msgid "Brazil Portuguese"
 msgstr ""
 
-#: src/gcompris/config.c:76
+#: src/gcompris/config.c:77
 msgid "Romanian"
 msgstr "Rumunjski"
 
-#: src/gcompris/config.c:77
+#: src/gcompris/config.c:78
 msgid "Russian"
 msgstr "Ruski"
 
-#: src/gcompris/config.c:78
+#: src/gcompris/config.c:79
 msgid "Slovak"
 msgstr "Slovački"
 
-#: src/gcompris/config.c:79
+#: src/gcompris/config.c:80
 msgid "Slovenian"
 msgstr ""
 
-#: src/gcompris/config.c:80
+#: src/gcompris/config.c:81
 msgid "Serbian (Latin)"
 msgstr "Srpski (latinica)"
 
-#: src/gcompris/config.c:81
+#: src/gcompris/config.c:82
 msgid "Serbian"
 msgstr "Srpski"
 
-#: src/gcompris/config.c:82
+#: src/gcompris/config.c:83
 msgid "Swedish"
 msgstr "Švedski"
 
-#: src/gcompris/config.c:83
+#: src/gcompris/config.c:84
 msgid "Turkish"
 msgstr "Turski"
 
-#: src/gcompris/config.c:88
+#: src/gcompris/config.c:89
 msgid "No time limit"
 msgstr ""
 
-#: src/gcompris/config.c:89
+#: src/gcompris/config.c:90
 msgid "Slow timer"
 msgstr ""
 
-#: src/gcompris/config.c:90
+#: src/gcompris/config.c:91
 msgid "Normal timer"
 msgstr ""
 
-#: src/gcompris/config.c:91
+#: src/gcompris/config.c:92
 msgid "Fast timer"
 msgstr ""
 
-#: src/gcompris/config.c:96
+#: src/gcompris/config.c:97
 msgid "800x600 (Default for gcompris)"
 msgstr ""
 
-#: src/gcompris/config.c:152
+#: src/gcompris/config.c:153
 msgid "GCompris Configuration"
 msgstr ""
 
-#: src/gcompris/config.c:258
+#: src/gcompris/config.c:262
 msgid "Fullscreen"
 msgstr "Cijeli zaslon"
 
-#: src/gcompris/config.c:301
+#: src/gcompris/config.c:305
 msgid "Music"
 msgstr ""
 
-#: src/gcompris/config.c:329
+#: src/gcompris/config.c:333
 msgid "Effect"
 msgstr "Efekt"
 
-#: src/gcompris/config.c:366
+#: src/gcompris/config.c:370
 #, c-format
 msgid "Couldn't open skin dir: %s"
 msgstr ""
 
-#: src/gcompris/config.c:400 src/gcompris/config.c:706
-#: src/gcompris/config.c:717
+#: src/gcompris/config.c:403 src/gcompris/config.c:720
+#: src/gcompris/config.c:731
 #, c-format
 msgid "Skin : %s"
 msgstr ""
 
-#: src/gcompris/gcompris.c:67
-msgid "run gcompris in fullscreen mode."
-msgstr ""
-
 #: src/gcompris/gcompris.c:69
-msgid "run gcompris in window mode."
+msgid "run gcompris in fullscreen mode."
 msgstr ""
 
 #: src/gcompris/gcompris.c:71
-msgid "run gcompris with sound enabled."
+msgid "run gcompris in window mode."
 msgstr ""
 
 #: src/gcompris/gcompris.c:73
-msgid "run gcompris without sound."
+msgid "run gcompris with sound enabled."
 msgstr ""
 
 #: src/gcompris/gcompris.c:75
-msgid "run gcompris with the default gnome cursor."
+msgid "run gcompris without sound."
 msgstr ""
 
 #: src/gcompris/gcompris.c:77
-msgid "display only activities with this difficulty level."
+msgid "run gcompris with the default gnome cursor."
 msgstr ""
 
 #: src/gcompris/gcompris.c:79
-msgid "select the audio output, one of 'default alsa09 arts esd oss'"
+msgid "display only activities with this difficulty level."
 msgstr ""
 
 #: src/gcompris/gcompris.c:81
-msgid "Prints the version of "
+msgid ""
+"select the audio output. Use '-A list' to get the list of available audio "
+"output"
 msgstr ""
 
 #: src/gcompris/gcompris.c:83
-msgid "Use the antialiased canvas (slower)."
+msgid "Prints the version of "
 msgstr ""
 
-#: src/gcompris/gcompris.c:353
-msgid "GCompris I Have Understood"
+#: src/gcompris/gcompris.c:85
+msgid "Use the antialiased canvas (slower)."
 msgstr ""
 
-#: src/gcompris/gcompris.c:570
+#: src/gcompris/gcompris.c:614
 #, c-format
 msgid ""
 "GCompris\n"
-"Version: %s\n"
+"Version: %d\n"
 "Licence: GPL\n"
 "More infos on http://ofset.sourceforge.net/gcompris\n"
 msgstr ""
@@ -2330,7 +2487,7 @@ msgstr "Autor"
 msgid "Directory"
 msgstr "Direktorij"
 
-#: src/gcompris/interface.c:286 src/gcompris/oggplayer.c:243
+#: src/gcompris/interface.c:286 src/gcompris/oggplayer.c:274
 msgid "Title"
 msgstr "Naslov"
 
@@ -2343,15 +2500,21 @@ msgstr "lokalizacija@linux.hr"
 msgid "Released under GPL"
 msgstr ""
 
-#: src/gcompris/oggplayer.c:206 src/gcompris/oggplayer.c:217
+#: src/gcompris/oggplayer.c:165
+msgid ""
+"Possible audio output devices are:\n"
+"default "
+msgstr ""
+
+#: src/gcompris/oggplayer.c:237 src/gcompris/oggplayer.c:248
 msgid "Now Playing Music"
 msgstr ""
 
-#: src/gcompris/oggplayer.c:247
+#: src/gcompris/oggplayer.c:278
 msgid "Artist"
 msgstr ""
 
-#: src/gcompris/soundutil.c:116
+#: src/gcompris/soundutil.c:113
 #, c-format
 msgid "Couldn't open music dir: %s"
 msgstr ""
@@ -2369,4 +2532,3 @@ msgstr ""
 #, c-format
 msgid "Remaining Time = %d"
 msgstr ""
-