Commit 0f7e1daa authored by Bruno Coudoin's avatar Bruno Coudoin

some more fixes

svn path=/branches/gcomprixo/; revision=2811
parent d02fe5d1
......@@ -34,7 +34,7 @@ class Gcompris_ballcatch:
self.gcomprisBoard.sublevel=1
self.gcomprisBoard.number_of_sublevel=1
gcompris.bar_set(gcompris.BAR_LEVEL)
gcompris.set_background(self.gcomprisBoard.canvas.root(),"opt/beach1.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(),"ballcatch/beach1.png")
gcompris.bar_set_level(self.gcomprisBoard)
......@@ -52,7 +52,7 @@ class Gcompris_ballcatch:
# Tux
self.lefthand = self.rootitem.add(
gnomecanvas.CanvasPixbuf,
pixbuf = gcompris.utils.load_pixmap("gcompris/misc/tux.png"),
pixbuf = gcompris.utils.load_pixmap("ballcatch/tux.png"),
x=gcompris.BOARD_WIDTH/2 - 60,
y=135.0
)
......@@ -70,7 +70,7 @@ class Gcompris_ballcatch:
# The Left Hand
self.lefthand = self.rootitem.add(
gnomecanvas.CanvasPixbuf,
pixbuf = gcompris.utils.load_pixmap("gcompris/misc/hand.png"),
pixbuf = gcompris.utils.load_pixmap("ballcatch/hand.png"),
x=gcompris.BOARD_WIDTH/2-150.0,
y=gcompris.BOARD_HEIGHT - 150
)
......@@ -78,7 +78,7 @@ class Gcompris_ballcatch:
# The Right Hand
item = self.lefthand = self.rootitem.add(
gnomecanvas.CanvasPixbuf,
pixbuf = gcompris.utils.load_pixmap("gcompris/misc/hand.png"),
pixbuf = gcompris.utils.load_pixmap("ballcatch/hand.png"),
x=gcompris.BOARD_WIDTH/2+100.0,
y=gcompris.BOARD_HEIGHT - 150.0
)
......@@ -90,7 +90,7 @@ class Gcompris_ballcatch:
# The Left Shift KEY
self.leftkey = self.rootitem.add(
gnomecanvas.CanvasPixbuf,
pixbuf = gcompris.utils.load_pixmap("images/shift_key.png"),
pixbuf = gcompris.utils.load_pixmap("ballcatch/shift_key.png"),
x=gcompris.BOARD_WIDTH/2-240.0,
y=gcompris.BOARD_HEIGHT - 80
)
......@@ -98,7 +98,7 @@ class Gcompris_ballcatch:
# The Right Shift KEY
self.rightkey = self.rootitem.add(
gnomecanvas.CanvasPixbuf,
pixbuf = gcompris.utils.load_pixmap("images/shift_key.png"),
pixbuf = gcompris.utils.load_pixmap("ballcatch/shift_key.png"),
x=gcompris.BOARD_WIDTH/2+100.0,
y=gcompris.BOARD_HEIGHT - 80
)
......@@ -183,22 +183,22 @@ class Gcompris_ballcatch:
if(self.gcomprisBoard.level == 1):
self.timerinc = 900
gcompris.set_background(self.gcomprisBoard.canvas.root(),"opt/beach1.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(),"ballcatch/beach1.png")
elif(self.gcomprisBoard.level == 2):
self.timerinc = 350
elif(self.gcomprisBoard.level == 3):
self.timerinc = 300
gcompris.set_background(self.gcomprisBoard.canvas.root(),"opt/beach2.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(),"ballcatch/beach2.png")
elif(self.gcomprisBoard.level == 4):
self.timerinc = 200
elif(self.gcomprisBoard.level == 5):
self.timerinc = 150
gcompris.set_background(self.gcomprisBoard.canvas.root(),"opt/beach3.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(),"ballcatch/beach3.png")
elif(self.gcomprisBoard.level == 6):
self.timerinc = 100
elif(self.gcomprisBoard.level == 7):
self.timerinc = 60
gcompris.set_background(self.gcomprisBoard.canvas.root(),"opt/beach4.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(),"ballcatch/beach4.png")
elif(self.gcomprisBoard.level == 8):
self.timerinc = 30
elif(self.gcomprisBoard.level == 9):
......
SUBDIRS = activity
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= clickanddraw.py
......@@ -2,6 +2,6 @@ SUBDIRS = activity
pythondir = $(PYTHON_PLUGIN_DIR)
dist_python_DATA= drawnumber.py
dist_python_DATA= drawnumber.py clickanddraw.py
......@@ -216,38 +216,38 @@ class Gcompris_drawnumber :
if level==1 : #Picture with 1 to 20 points
data={}
data[1]=[[6,"images/dn_fond1.png", "images/dn_fond1.png"],
data[1]=[[6,"drawnumber/dn_fond1.png", "drawnumber/dn_fond1.png"],
[407,121],[489,369],[279,216],[537,214],[330,369],[407,121]]
data[2]=[[13,"images/dn_de1.png", "images/dn_de2.png"],
data[2]=[[13,"drawnumber/dn_de1.png", "drawnumber/dn_de2.png"],
[404,375],[406,271],[503,233],[588,278],[588,337],[611,311],[727,320],[728,424],[682,486],[560,474],[560,397],[495,423],[404,375]]
data[3]=[[14,"images/dn_house1.png", "images/dn_house2.png"],
data[3]=[[14,"drawnumber/dn_house1.png", "drawnumber/dn_house2.png"],
[406,360],[512,360],[513,175],[456,120],[455,70],[430,70],[430,96],[372,40],[219,177],[220,361],[353,361],[352,276],[406,276],[406,360]]
data[4]=[[20,"images/dn_sapin1.png", "images/dn_sapin2.png"],
data[4]=[[20,"drawnumber/dn_sapin1.png", "drawnumber/dn_sapin2.png"],
[244,463],[341,361],[267,373],[361,238],[300,251],[377,127],[329,146],[399,52],[464,144],[416,128],[492,251],[435,239],[527,371],[458,362],[557,466],[422,453],[422,504],[374,504],[374,453],[244,463]]
elif level==2 : #Picture with 21 to 50 points
data={}
data[1]=[[28,"images/dn_epouvantail1.png", "images/dn_epouvantail2.png"],
data[1]=[[28,"drawnumber/dn_epouvantail1.png", "drawnumber/dn_epouvantail2.png"],
[255,449],[340,340],[340,224],[212,233],[208,168],[395,160],[368,135],[367,77],[340,79],[339,68],[363,65],[359,18],[460,9],[464,56],[488,54],[489,66],[463,68],[462,135],[434,161],[612,163],[607,223],[477,221],[477,337],[561,457],[507,487],[413,377],[309,491],[255,449]]
data[2]=[[37,"images/dn_plane1.png", "images/dn_plane2.png"],
data[2]=[[37,"drawnumber/dn_plane1.png", "drawnumber/dn_plane2.png"],
[342,312],[163,317],[141,309],[128,285],[141,256],[165,236],[246,212],[170,127],[149,86],[165,70],[190,69],[234,92],[369,200],[500,198],[577,188],[534,161],[533,147],[545,141],[567,144],[604,163],[631,116],[649,105],[664,117],[671,197],[708,212],[718,227],[712,238],[688,238],[652,224],[576,263],[459,288],[533,334],[575,380],[573,398],[551,407],[404,343],[342,312]]
data[3]=[[42,"images/dn_poisson1.png", "images/dn_poisson2.png"],
data[3]=[[42,"drawnumber/dn_poisson1.png", "drawnumber/dn_poisson2.png"],
[33,338],[78,238],[152,172],[320,158],[378,84],[423,70],[450,83],[463,117],[448,154],[453,164],[478,174],[526,144],[552,158],[555,168],[545,188],[557,215],[623,241],[685,222],[712,188],[739,176],[761,194],[766,274],[740,380],[721,422],[678,408],[654,362],[558,349],[488,367],[498,394],[495,427],[461,448],[414,443],[350,389],[312,387],[320,404],[315,431],[291,433],[267,400],[78,400],[55,384],[47,340],[33,338]]
elif level==3 : #Picture with 51 to ... points
data={}
data[1]=[[36,"images/dn_fou1.png", "images/dn_fou2.png"],
data[1]=[[36,"drawnumber/dn_fou1.png", "drawnumber/dn_fou2.png"],
[285,204],[342,143],[374,180],[396,118],[415,188],[419,120],[427,179],[462,154],[514,203],[465,188],[436,224],[436,236],[434,296],[429,315],[470,306],[514,262],[534,184],[554,186],[536,279],[463,366],[454,473],[462,518],[358,518],[370,473],[352,365],[327,402],[350,468],[330,483],[298,407],[330,333],[377,317],[369,295],[364,235],[363,223],[333,189],[285,204]]
data[2]=[[71,"images/dn_bear1.png", "images/dn_bear2.png"],
data[2]=[[71,"drawnumber/dn_bear1.png", "drawnumber/dn_bear2.png"],
[304,256],[262,240],[216,206],[192,174],[195,159],[216,154],[257,167],[300,188],[334,220],[352,206],[370,200],[342,185],[321,154],[319,117],[337,90],[320,76],[315,55],[335,38],[360,40],[376,52],[377,66],[400,59],[431,60],[450,66],[451,48],[468,37],[490,36],[507,48],[510,70],[501,82],[486,86],[502,110],[506,136],[499,164],[479,189],[458,200],[480,212],[522,180],[578,158],[611,154],[622,164],[618,184],[592,213],[550,236],[515,251],[529,286],[532,329],[526,364],[548,354],[566,360],[576,384],[571,417],[548,455],[520,470],[493,456],[490,419],[461,440],[414,453],[360,441],[330,422],[331,450],[317,471],[284,467],[255,434],[242,402],[248,366],[271,354],[296,364],[288,326],[292,282],[304,256]]
data[3]=[[85,"images/dn_hibou1.png", "images/dn_hibou2.png"],
data[3]=[[85,"drawnumber/dn_hibou1.png", "drawnumber/dn_hibou2.png"],
[443,133],[423,11],[434,10],[472,56],[458,20],[467,19],[495,71],[491,30],[501,33],[522,116],[519,72],[529,75],[537,153],[539,119],[546,125],[547,159],[555,154],[556,208],[583,169],[724,98],[739,99],[703,137],[743,109],[742,121],[691,165],[742,143],[741,155],[654,200],[716,182],[713,195],[650,215],[689,212],[680,219],[615,235],[661,229],[653,238],[604,250],[622,250],[615,255],[582,260],[600,263],[590,268],[577,268],[606,300],[644,294],[643,302],[599,314],[625,311],[623,318],[593,323],[615,323],[611,327],[586,329],[599,332],[591,336],[553,335],[535,357],[534,377],[527,368],[511,367],[493,375],[501,366],[485,371],[493,363],[482,365],[492,355],[514,354],[532,332],[520,331],[505,317],[500,291],[501,303],[490,289],[486,297],[479,282],[473,287],[466,269],[448,252],[446,224],[460,201],[456,191],[459,182],[467,197],[479,196],[443,133]]
return data
......@@ -17,6 +17,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
import gobject
import gnomecanvas
import gcompris
import gcompris.utils
......@@ -88,7 +89,7 @@ class Gcompris_guessnumber:
gcompris.bar_set_level(self.gcomprisBoard)
gcompris.set_background(self.gcomprisBoard.canvas.root(), "opt/cave.png")
gcompris.set_background(self.gcomprisBoard.canvas.root(), "guessnumber/cave.png")
self.display_game()
......@@ -249,7 +250,7 @@ class Gcompris_guessnumber:
#
# Display the helico
#
pixmap = gcompris.utils.load_pixmap("gcompris/misc/tuxhelico.png")
pixmap = gcompris.utils.load_pixmap("guessnumber/tuxhelico.png")
self.helico_width = pixmap.get_width()
self.helico_height = pixmap.get_height()
self.orig_x = self.x_old = self.x = pixmap.get_width()/2 + 10
......@@ -387,4 +388,4 @@ class Gcompris_guessnumber:
self.move_stepnum = 0
# it takes self.num_moveticks iterations of duration self.move_tick to move squares
self.movestep_timer = gtk.timeout_add(self.move_tick, self.move_step)
self.movestep_timer = gobject.timeout_add(self.move_tick, self.move_step)
......@@ -95,7 +95,7 @@ class Gcompris_mosaic:
gcompris.bar_set_level(self.gcomprisBoard)
gcompris.set_background(self.gcomprisBoard.canvas.root(),
"opt/mosaic_bg.png")
"mosaic/mosaic_bg.png")
self.display_game()
......@@ -242,7 +242,7 @@ class Gcompris_mosaic:
self.current_index_x = -1
self.current_index_y = -1
palette = gcompris.utils.load_pixmap("images/mosaic_palette.png")
palette = gcompris.utils.load_pixmap("mosaic/mosaic_palette.png")
self.display_mosaic(self.orig_x, self.orig_y, True, palette)
......
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