Commit 28fd43e2 authored by Bruno Coudoin's avatar Bruno Coudoin

reintroduced the erase double click activity.

This closes the bug:
http://bugzilla.gnome.org/show_bug.cgi?id=607172
parent 420af68d
......@@ -660,6 +660,7 @@ src/erase-activity/Makefile
src/erase-activity/resources/Makefile
src/erase-activity/resources/erase/Makefile
src/erase_clic-activity/Makefile
src/erase_2clic-activity/Makefile
src/fifteen-activity/Makefile
src/fifteen-activity/resources/Makefile
src/fifteen-activity/resources/fifteen/Makefile
......
......@@ -24,6 +24,7 @@ SUBDIRS = goocanvas gcompris boards \
enumerate-activity \
erase-activity \
erase_clic-activity \
erase_2clic-activity \
fifteen-activity \
geography-activity \
geo_country-activity \
......
......@@ -64,6 +64,7 @@ static gint timer_id = 0;
#define NORMAL 0
#define CLIC 1
#define DOUBLECLIC 2
static gint board_mode = NORMAL;
......@@ -195,6 +196,8 @@ static void start_board (GcomprisBoard *agcomprisBoard)
if (strcmp(gcomprisBoard->mode,"clic")==0)
board_mode = CLIC;
else if (strcmp(gcomprisBoard->mode,"doubleclic")==0)
board_mode = DOUBLECLIC;
else {
board_mode = NORMAL;
gcomprisBoard->maxlevel=8;
......@@ -498,6 +501,8 @@ item_event (GooCanvasItem *item,
GdkEventCrossing *event,
gpointer data)
{
static GooCanvasItem *previous_clicked_item = NULL;
static guint32 previous_click_time = 0;
counter *c = (counter *) data;
if(board_paused)
return FALSE;
......@@ -524,6 +529,26 @@ item_event (GooCanvasItem *item,
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
if (board_mode == DOUBLECLIC)
{
if (event->type != GDK_BUTTON_PRESS)
return FALSE;
else
{
guint32 d = event->time - previous_click_time;
/* Click duration handicap depending on the level */
d += gcomprisBoard->level * 100;
if (previous_clicked_item != item
|| d >= 850)
{
previous_clicked_item = item;
previous_click_time = event->time;
return FALSE;
}
}
}
erase_one_item (target);
return FALSE;
......
SUBDIRS =
xmldir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
xml_in_files = \
erase_2clic.xml.in
xml_DATA = $(xml_in_files:.xml.in=.xml)
# Do not use the INTLTOOL_XML_RULE, we don't need to embed the translations
# in the file themselves. GCompris pick the translations from the po file at
# runtime.
#
$(xml_DATA): %.xml: %.xml.in
sed -e "s/\(<\{1\}\/*\)_/\1/g" $< > $@
# Use this directive and instead of the one above to embed the translations
# in the xml files directly, this is needed for the tool gcompris2spip
#@INTLTOOL_XML_RULE@
icondir = $(pkgdatadir)/@PACKAGE_DATA_DIR@
icon_DATA = erase_2clic.svg
EXTRA_DIST = $(icon_DATA) ${xml_in_files} init_path.sh
CLEANFILES = $(xml_DATA)
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://web.resource.org/cc/"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="100"
height="100"
id="svg2"
sodipodi:version="0.32"
inkscape:version="0.44.1"
version="1.0"
sodipodi:docbase="/home/mat/Travaux/Inkscape/Gcompris/boardicons"
sodipodi:docname="erase_double_clic.svg">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="5.4336852"
inkscape:cx="61.021514"
inkscape:cy="41.397676"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="100px"
height="100px"
inkscape:window-width="1005"
inkscape:window-height="844"
inkscape:window-x="182"
inkscape:window-y="25" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.28695655"
d="M 49.618344,85.191357 C 61.521735,90.686388 97.572763,50.03881 68.173661,38.701973 C 41.876969,28.561479 34.042975,79.606158 49.618344,85.191357 z "
id="path3049"
sodipodi:nodetypes="csc" />
<path
style="fill:#83cbc6;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 48.947537,82.193684 C 60.850928,87.688715 96.901948,47.041137 67.502854,35.704301 C 41.206162,25.563807 33.372168,76.608485 48.947537,82.193684 z "
id="path2092"
sodipodi:nodetypes="csc" />
<path
style="fill:#83cbc6;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 46.026801,46.412013 C 46.026801,46.412013 63.13088,61.443363 77.518386,57.073211"
id="path2979"
sodipodi:nodetypes="cc" />
<path
style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 48.51412,80.774465 C 60.417511,86.269496 96.468528,45.621918 67.069437,34.285082 C 40.772745,24.144587 32.938751,75.189266 48.51412,80.774465 z "
id="path3035"
sodipodi:nodetypes="csc" />
<path
style="fill:#83cbc6;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 46.274731,44.580978 C 46.274731,44.580978 63.37881,59.612328 77.766316,55.242176"
id="path3039"
sodipodi:nodetypes="cc" />
<path
style="fill:#83cbc6;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 67.451498,36.744501 L 59.902219,53.937426"
id="path3037" />
<path
style="fill:#83cbc6;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 66.466811,36.515071 L 58.917532,53.707996"
id="path2981" />
<path
style="fill:black;fill-opacity:0.27391304;fill-rule:evenodd;stroke:none;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 57.900016,80.222353 C 65.047953,78.27692 71.630111,70.442914 72.071937,66.377141 C 72.513763,62.311368 68.287555,73.240095 56.57932,73.300959 C 48.491996,71.267326 50.495452,73.303718 43.216984,74.959348 C 48.988296,83.590545 47.167737,81.570589 57.900016,80.222353 z "
id="path3045"
sodipodi:nodetypes="ccccc" />
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 67.812116,33.792355 C 68.52526,31.5379 69.426345,14.935135 91.818451,32.406661 C 110.04286,44.497631 113.40097,38.861493 120.63079,41.33788 C 140.9796,47.394876 132.89605,68.630906 121.91905,74.83264 C 115.60237,79.589842 106.50826,89.017978 115.75526,94.112715 C 128.83675,101.32011 135.90587,91.119931 126.70401,111.82411"
id="path3071"
sodipodi:nodetypes="ccccsc" />
<g
id="g24827">
<path
id="path22162"
d="M 6.0732258,58.959713 L 7.361486,52.518412 L 12.146452,47.917483 L 19.876013,44.972889 L 25.949239,48.469595 L 27.605574,53.438598 L 25.765202,61.72027 L 21.900422,67.425422 L 29.998057,66.321199 L 30.918243,69.633868 L 29.998057,76.811318 L 8.2816718,75.891132 L 8.4657089,67.425422 L 10.306081,65.769088 L 13.250675,64.112753 L 6.0732258,58.959713 z "
style="fill:#ff7bff;fill-opacity:0.94117647;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
transform="scale(1.045617,0.956373)"
style="font-size:37.95035934px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:black;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Indigo Joker"
d="M 31.248558,71.510581 C 31.24853,71.434684 31.23588,71.675036 31.210608,72.231637 C 31.18528,73.066548 31.159979,74.49601 31.134707,76.520028 C 31.084079,77.279033 31.008178,78.316342 30.907005,79.631958 C 30.906977,80.137957 30.805776,80.871664 30.603402,81.833078 C 30.527474,82.010173 29.857018,82.161975 28.592033,82.288483 C 27.579999,82.389677 26.694492,82.440277 25.935508,82.440284 L 13.032386,82.212582 C 12.956475,82.212575 12.754073,82.174625 12.42518,82.098731 C 12.096268,82.048124 11.881216,82.022823 11.780024,82.02283 C 11.046309,81.972223 10.299953,81.921623 9.5409525,81.871029 C 8.5795381,81.769821 7.8458319,81.59272 7.3398316,81.339724 C 6.8338233,81.086716 6.5808212,80.315059 6.5808244,79.024752 C 6.5808212,78.974148 6.6187715,78.506094 6.6946755,77.620588 C 6.795873,76.735079 6.8591236,76.089923 6.8844273,75.68512 C 6.9350242,74.824913 6.9729745,73.964705 6.9982784,73.104496 C 7.0741754,71.915388 7.2892272,70.97928 7.6434345,70.296169 C 7.6434302,70.017872 7.7446311,69.651019 7.9470374,69.195609 C 8.1241343,68.993213 8.440387,68.765511 8.8957964,68.512502 C 9.3511947,68.234207 9.6547972,68.031805 9.806605,67.905296 C 9.4017951,67.551101 8.6048383,67.045097 7.4157323,66.387282 C 6.3278191,65.780086 5.5561625,65.261432 5.1007604,64.831317 C 4.4176529,64.173522 4.0761,63.439816 4.0761007,62.630197 C 4.0761,62.73141 4.1393505,62.415157 4.2658525,61.681438 C 4.4429531,60.720043 4.9236572,59.15143 5.7079662,56.975593 C 6.5175707,54.774493 7.8458319,52.560724 9.6927539,50.33428 C 11.666164,47.905485 13.51308,46.438072 15.233506,45.932038 C 15.537097,45.780267 15.979851,45.603165 16.561769,45.400733 C 17.219561,45.274262 18.029168,45.211012 18.990592,45.210982 C 21.039894,45.211012 22.91211,45.780267 24.607245,46.918748 C 26.302338,48.057286 27.377597,49.423497 27.833026,51.017387 C 28.263105,52.459523 28.478157,53.926936 28.478182,55.419628 C 28.478157,57.393065 28.010103,59.733335 27.074018,62.440445 C 26.239088,64.869278 25.35358,66.703544 24.417493,67.943247 C 24.417472,68.120356 24.556623,68.208906 24.834947,68.208899 C 24.936127,68.208906 25.657183,68.133006 26.998118,67.981197 C 28.364306,67.804103 29.098012,67.715552 29.199239,67.715545 C 29.705217,67.715552 30.05942,67.778803 30.261849,67.905296 C 30.565424,68.082405 30.818426,68.65166 31.020856,69.613063 C 31.172629,70.372075 31.24853,71.00458 31.248558,71.510581 M 28.629983,74.129155 C 28.629958,74.027956 28.592008,73.787604 28.516132,73.408099 C 28.465507,73.003297 28.427556,72.724995 28.402281,72.573191 C 28.351656,72.11779 28.199854,71.801537 27.946877,71.624432 C 27.71915,71.422034 27.301697,71.320833 26.694515,71.320829 L 18.079783,72.649091 C 17.599065,72.446692 17.358712,72.20634 17.358726,71.928035 C 17.358712,71.826837 17.801466,71.333483 18.686989,70.447971 C 19.724283,69.410667 20.432689,68.65166 20.812209,68.170949 C 21.191695,67.664952 21.659749,66.943896 22.216372,66.007778 C 23.152462,64.489775 23.797617,63.098263 24.151841,61.833239 C 24.303621,61.251348 24.468073,60.289939 24.645195,58.949012 C 24.822276,57.759918 24.910826,57.051512 24.910848,56.823792 C 24.910826,55.432298 24.619874,54.104037 24.03799,52.839004 C 23.304263,51.219813 22.266954,50.220454 20.92606,49.840925 C 20.242937,49.638549 19.319479,49.537348 18.155684,49.537323 C 18.003868,49.537348 17.573764,49.613249 16.865372,49.765025 C 16.156952,49.916852 15.777449,49.992752 15.726861,49.992727 C 14.132935,50.144553 12.425171,51.181862 10.603563,53.104656 C 8.8072401,55.027495 7.858482,56.81116 7.7572856,58.455657 C 7.731981,58.658076 7.6307801,59.075529 7.4536827,59.708019 C 7.2765771,60.34054 7.1880263,60.694743 7.1880302,60.770629 C 7.1880263,61.58025 7.2386268,62.060954 7.3398316,62.212743 C 7.8458319,62.921162 8.5542379,63.490417 9.4650517,63.920509 C 10.249352,64.274723 11.033659,64.628926 11.817974,64.983119 C 11.893866,64.907229 11.969767,64.818678 12.045676,64.717466 C 12.32397,62.617559 12.551672,61.339898 12.728783,60.88448 C 13.285378,59.315881 13.791382,58.240622 14.246797,57.658699 C 14.904592,56.87441 15.802749,56.482257 16.941273,56.482238 C 18.079769,56.482257 18.914676,57.203313 19.445996,58.645409 C 19.800183,59.606834 19.977285,60.656793 19.977301,61.795289 C 19.977285,63.313315 19.736933,64.464475 19.256244,65.248771 C 19.053827,65.552384 18.307471,66.159589 17.017173,67.070389 C 16.435255,67.551101 15.562397,68.158306 14.398598,68.892006 C 13.51308,69.170315 12.273369,69.600418 10.679463,70.182318 C 10.451754,70.283524 10.211402,70.890729 9.9584064,72.003935 C 9.7053977,73.117148 9.5788966,74.027956 9.5789028,74.736361 L 9.5789028,78.341645 C 9.857199,78.619945 10.160802,78.759096 10.489711,78.759099 C 10.540305,78.759096 10.983058,78.721145 11.817974,78.645248 C 12.652873,78.594644 13.209477,78.556694 13.48779,78.531397 C 14.120285,78.531394 15.031093,78.544044 16.220216,78.569347 C 17.535814,78.594644 18.117719,78.607295 17.965932,78.607298 C 19.989935,78.607295 23.316913,78.366942 27.946877,77.886241 C 28.149254,77.860938 28.313705,77.329634 28.440231,76.292326 C 28.566707,75.457418 28.629958,74.736362 28.629983,74.129155"
id="text18346" />
</g>
<g
id="g22156"
transform="translate(10.49012,19.13986)">
<path
id="path21267"
d="M 20.980236,5.9570105 L 9.9380067,-2.3246617 L 4.4168919,-5.0852191 L 8.4657094,-10.790371 L 16.19527,-15.023226 L 24.66098,-6.005405 L 29.261909,-1.7725502 L 37.543581,-8.397888 L 39.56799,-6.1894421 L 40.120101,-2.692736 L 37.727618,13.318497 L 19.323902,14.790794 L 15.275084,12.214274 L 16.563345,9.4537166 L 20.980236,5.9570105 z "
style="fill:red;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
sodipodi:nodetypes="ccccccccccscccccccccccccccc"
id="path20377"
d="M 17.486149,-17.96875 L 7.734375,-12.357686 L -0.54510135,-4.90625 L 9.5782095,0.069425677 L 17.125,5.78125 L 11.40625,11.46875 L 16.75,17 L 39.1875,15.34375 L 42.875,-6 L 38.65625,-11.15625 C 38.65625,-11.15625 31.479222,-4.9166387 29.822889,-4.9166385 C 28.166554,-4.9166385 17.48615,-17.96875 17.486149,-17.96875 z M 16.1875,-12.09375 L 25.031166,-1.7742399 L 29.638851,0.62854729 L 36.0625,-5.09375 L 37.90625,-5.8125 L 38.84375,-3.0625 L 38.083361,0.26047297 L 35.902703,11.670186 L 26.5,12.78125 L 19.125,13.125 L 17.65625,12.03125 L 23.9375,7.8125 L 22.09375,2.84375 L 7.53125,-5.8125 L 16.1875,-12.09375 z "
style="fill:black;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<path
style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 67.075966,33.056207 C 67.78911,30.801752 68.690195,14.198988 91.082301,31.670513 C 109.30671,43.761483 112.66482,38.125345 119.89464,40.601732 C 140.24345,46.658729 132.1599,67.894759 121.1829,74.096493 C 114.86622,78.853695 101.17118,87.545682 110.41818,92.640419 C 123.49967,99.847811 135.16972,90.383784 125.96786,111.08796"
id="path22160"
sodipodi:nodetypes="ccccsc" />
<path
style="fill:#d35f5f;fill-opacity:0.75;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
d="M 47.348649,44.282392 L 51.949578,38.737152 L 56.859442,35.867781 L 63.022552,35.750925 L 65.65017,36.277487 L 58.690348,51.618331 L 52.285485,48.172722 L 47.348649,44.282392 z "
id="path24915"
sodipodi:nodetypes="cccccccc" />
<path
style="fill:white;fill-opacity:0.27391304;fill-rule:evenodd;stroke:none;stroke-width:2.12582922;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 65.205137,36.181089 C 63.335253,40.15093 64.396297,37.862893 62.813714,41.744628 C 63.25554,45.810401 57.064425,37.210535 47.761548,43.65254 C 53.900934,35.389417 56.129193,34.464778 65.205137,36.181089 z "
id="path3047"
sodipodi:nodetypes="cccc" />
</g>
</svg>
<?xml version="1.0" encoding="UTF-8"?>
<GCompris>
<Board
name="erase_2clic"
type="erase"
section="/computer/mouse"
icon="erase_2clic.svg"
difficulty="2"
mode="doubleclic"
author="Bruno Coudoin (bruno.coudoin@free.fr)"
boarddir="">
<_title>Double click the mouse</_title>
<_description>Double click the mouse to erase the area and discover the background</_description>
<_prerequisite>Mouse-manipulation</_prerequisite>
<_goal>Motor-coordination</_goal>
<_manual>Double click the mouse on rectangles until all the blocks disappear.</_manual>
<_credit>Animal pictures come from the Animal Photography Page of Ralf Schmode (http://schmode.net/). Ralf has kindly permitted Gcompris to include his pictures. Thanks a lot, Ralf.</_credit>
</Board>
</GCompris>
# Set the different path for this activity
# This is sourced by runit.sh
path=$1
activity=erase_2clic
plugindir=$path/../erase-activity/.libs
pythonplugindir=$path
resourcedir=$path/../erase-activity/resources
section="/computer/mouse"
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