diff options
author | Bruno Coudoin <bcoudoin@src.gnome.org> | 2001-11-25 21:19:10 (GMT) |
---|---|---|
committer | Bruno Coudoin <bcoudoin@src.gnome.org> | 2001-11-25 21:19:10 (GMT) |
commit | 2f7463f063d1dd31a48f35c7c71be0338c8f5083 (patch) | |
tree | d5172061b87870cbe0cf5b897e265e8cfb44f183 /boards/scales | |
parent | 90edbbb633b5da7d4e3ef6cd6ed89c6ffefd72a9 (diff) |
Complete redraw by Renaud Blanchard
* boards/scales/*.png: Complete redraw by Renaud Blanchard
* src/gcompris/bar.c: shifted all buttons on the left to free the home
* src/gcompris/bonus.[ch]: implemented BONUS_RANDOM, changed bonus.h to be an enum
* src/boards/Makefile.am: changed PTHREAD_LIBS by PTHREAD_LIB as it should be
* src/boards/algebra.c change operation order and other fix
* src/boards/draw.c: Corrected a bug where you can delete the white background
Diffstat (limited to 'boards/scales')
31 files changed, 58 insertions, 57 deletions
diff --git a/boards/scales/README b/boards/scales/README new file mode 100644 index 0000000..ccc8350 --- /dev/null +++ b/boards/scales/README @@ -0,0 +1 @@ +The scale and masse drawing are made by Renaud Blanchard
\ No newline at end of file diff --git a/boards/scales/board1_0.xml b/boards/scales/board1_0.xml index c5e086d..53c1e9f 100644 --- a/boards/scales/board1_0.xml +++ b/boards/scales/board1_0.xml @@ -6,6 +6,6 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="5" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="4" pixmapfile="scales/masse4.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="4" pixmapfile="scales/masse4.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board1_1.xml b/boards/scales/board1_1.xml index 7618b54..0fe86fe 100644 --- a/boards/scales/board1_1.xml +++ b/boards/scales/board1_1.xml @@ -6,7 +6,7 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="7" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="1" pixmapfile="scales/masse1.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board1_2.xml b/boards/scales/board1_2.xml index cb9e723..93dd45c 100644 --- a/boards/scales/board1_2.xml +++ b/boards/scales/board1_2.xml @@ -6,8 +6,8 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="8" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="3" pixmapfile="scales/masse3.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/board1_3.xml b/boards/scales/board1_3.xml index 1da8b7b..196682e 100644 --- a/boards/scales/board1_3.xml +++ b/boards/scales/board1_3.xml @@ -6,8 +6,8 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="10" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="1" pixmapfile="scales/masse1.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board1_4.xml b/boards/scales/board1_4.xml index 369c998..c0c4f9f 100644 --- a/boards/scales/board1_4.xml +++ b/boards/scales/board1_4.xml @@ -6,8 +6,8 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="9" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="2" pixmapfile="scales/masse2.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board1_5.xml b/boards/scales/board1_5.xml index acb5e9a..6a9df65 100644 --- a/boards/scales/board1_5.xml +++ b/boards/scales/board1_5.xml @@ -6,8 +6,8 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="6" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="4" pixmapfile="scales/masse4.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board2_0.xml b/boards/scales/board2_0.xml index b7a51a9..f32291a 100644 --- a/boards/scales/board2_0.xml +++ b/boards/scales/board2_0.xml @@ -6,8 +6,8 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="10" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="4" pixmapfile="scales/masse4.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/board2_1.xml b/boards/scales/board2_1.xml index f4050d1..ec9d9d8 100644 --- a/boards/scales/board2_1.xml +++ b/boards/scales/board2_1.xml @@ -7,8 +7,8 @@ <Title name="12" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Shape name="1" pixmapfile="scales/masse1.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="2" pixmapfile="scales/masse2.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="4" pixmapfile="scales/masse4.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board2_2.xml b/boards/scales/board2_2.xml index e6c9708..77eca14 100644 --- a/boards/scales/board2_2.xml +++ b/boards/scales/board2_2.xml @@ -6,9 +6,9 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="13" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="400" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="2" pixmapfile="scales/masse2.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="4" pixmapfile="scales/masse4.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board2_3.xml b/boards/scales/board2_3.xml index 091a6fb..0d38f12 100644 --- a/boards/scales/board2_3.xml +++ b/boards/scales/board2_3.xml @@ -6,9 +6,9 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="14" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="2" pixmapfile="scales/masse2.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="4" pixmapfile="scales/masse4.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/board2_4.xml b/boards/scales/board2_4.xml index cf8805d..700e652 100644 --- a/boards/scales/board2_4.xml +++ b/boards/scales/board2_4.xml @@ -6,9 +6,9 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="15" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="5" pixmapfile="scales/masse5.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="4" pixmapfile="scales/masse4.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/board2_5.xml b/boards/scales/board2_5.xml index a3dcaa8..fb851a5 100644 --- a/boards/scales/board2_5.xml +++ b/boards/scales/board2_5.xml @@ -7,9 +7,9 @@ <Title name="17" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Shape name="1" pixmapfile="scales/masse1.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="3" pixmapfile="scales/masse3.png" x="000" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="4" pixmapfile="scales/masse4.png" x="000" y="000" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/board3_0.xml b/boards/scales/board3_0.xml index 4dfbf82..01163c1 100644 --- a/boards/scales/board3_0.xml +++ b/boards/scales/board3_0.xml @@ -6,10 +6,10 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="17" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="4" pixmapfile="scales/masse4.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="3" pixmapfile="scales/masse3.png" x="000" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="400" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board3_1.xml b/boards/scales/board3_1.xml index 3e90703..08719cf 100644 --- a/boards/scales/board3_1.xml +++ b/boards/scales/board3_1.xml @@ -6,10 +6,10 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="19" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="5" pixmapfile="scales/masse5.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="5" pixmapfile="scales/masse5.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="6" pixmapfile="scales/masse6.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="1" pixmapfile="scales/masse1.png" x="400" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="1" pixmapfile="scales/masse1.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board3_2.xml b/boards/scales/board3_2.xml index cf96445..504da26 100644 --- a/boards/scales/board3_2.xml +++ b/boards/scales/board3_2.xml @@ -6,10 +6,10 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="21" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="6" pixmapfile="scales/masse6.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="6" pixmapfile="scales/masse6.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="5" pixmapfile="scales/masse5.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="400" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board3_3.xml b/boards/scales/board3_3.xml index 2558537..1dec9fa 100644 --- a/boards/scales/board3_3.xml +++ b/boards/scales/board3_3.xml @@ -6,10 +6,10 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="22" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="7" pixmapfile="scales/masse7.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="7" pixmapfile="scales/masse7.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="6" pixmapfile="scales/masse6.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="2" pixmapfile="scales/masse2.png" x="400" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="3" pixmapfile="scales/masse3.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="2" pixmapfile="scales/masse2.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> </ShapeGame> diff --git a/boards/scales/board3_4.xml b/boards/scales/board3_4.xml index 5b08e85..7bf82e0 100644 --- a/boards/scales/board3_4.xml +++ b/boards/scales/board3_4.xml @@ -6,9 +6,9 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="25" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="8" pixmapfile="scales/masse8.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="7" pixmapfile="scales/masse7.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="8" pixmapfile="scales/masse8.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="7" pixmapfile="scales/masse7.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="6" pixmapfile="scales/masse6.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> <Shape name="4" pixmapfile="scales/masse4.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> diff --git a/boards/scales/board3_5.xml b/boards/scales/board3_5.xml index f1eb021..23ad9be 100644 --- a/boards/scales/board3_5.xml +++ b/boards/scales/board3_5.xml @@ -6,10 +6,10 @@ <Shape name="M" pixmapfile="scales/masse.png" x="585" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> <Title name="26" x="585" y="230" justification="GTK_JUSTIFY_CENTER"/> <Shape name="B" pixmapfile="scales/scales.png" x="400" y="300" zoomx="1" zoomy="1" position="0" type="SHAPE_BACKGROUND"/> - <Shape name="10" pixmapfile="scales/masse10.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> - <Shape name="9" pixmapfile="scales/masse9.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="10" pixmapfile="scales/masse10.png" x="200" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="9" pixmapfile="scales/masse9.png" x="250" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="8" pixmapfile="scales/masse8.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> - <Shape name="7" pixmapfile="scales/masse7.png" x="350" y="222" zoomx="1" zoomy="1" position="0"/> + <Shape name="7" pixmapfile="scales/masse7.png" x="300" y="222" zoomx="1" zoomy="1" position="0"/> <Shape name="6" pixmapfile="scales/masse6.png" x="300" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> <Shape name="3" pixmapfile="scales/masse3.png" x="350" y="222" zoomx="1" zoomy="1" position="0" type="SHAPE_DUMMY_TARGET"/> </ShapeGame> diff --git a/boards/scales/masse.png b/boards/scales/masse.png Binary files differindex f2ca640..e094298 100644 --- a/boards/scales/masse.png +++ b/boards/scales/masse.png diff --git a/boards/scales/masse1.png b/boards/scales/masse1.png Binary files differindex c67d1d2..1e96f07 100644 --- a/boards/scales/masse1.png +++ b/boards/scales/masse1.png diff --git a/boards/scales/masse10.png b/boards/scales/masse10.png Binary files differindex 5edc794..8298c77 100644 --- a/boards/scales/masse10.png +++ b/boards/scales/masse10.png diff --git a/boards/scales/masse2.png b/boards/scales/masse2.png Binary files differindex ae1cb3e..642ec4d 100644 --- a/boards/scales/masse2.png +++ b/boards/scales/masse2.png diff --git a/boards/scales/masse3.png b/boards/scales/masse3.png Binary files differindex 051c6ad..5c32205 100644 --- a/boards/scales/masse3.png +++ b/boards/scales/masse3.png diff --git a/boards/scales/masse4.png b/boards/scales/masse4.png Binary files differindex 26400e3..6955ba1 100644 --- a/boards/scales/masse4.png +++ b/boards/scales/masse4.png diff --git a/boards/scales/masse5.png b/boards/scales/masse5.png Binary files differindex dcaa0c9..0f831bc 100644 --- a/boards/scales/masse5.png +++ b/boards/scales/masse5.png diff --git a/boards/scales/masse6.png b/boards/scales/masse6.png Binary files differindex 96c89ce..2ebf0ee 100644 --- a/boards/scales/masse6.png +++ b/boards/scales/masse6.png diff --git a/boards/scales/masse7.png b/boards/scales/masse7.png Binary files differindex f441f3d..9f040c5 100644 --- a/boards/scales/masse7.png +++ b/boards/scales/masse7.png diff --git a/boards/scales/masse8.png b/boards/scales/masse8.png Binary files differindex 24be809..98196d5 100644 --- a/boards/scales/masse8.png +++ b/boards/scales/masse8.png diff --git a/boards/scales/masse9.png b/boards/scales/masse9.png Binary files differindex 5fe6721..4f84cc6 100644 --- a/boards/scales/masse9.png +++ b/boards/scales/masse9.png diff --git a/boards/scales/scales.png b/boards/scales/scales.png Binary files differindex fa24091..05785d6 100644 --- a/boards/scales/scales.png +++ b/boards/scales/scales.png |