diff --git a/src/activities/activities.txt b/src/activities/activities.txt index 2950d8129..14d4f20d9 100644 --- a/src/activities/activities.txt +++ b/src/activities/activities.txt @@ -1,132 +1,133 @@ # The list of activities that will be loaded at GCompris start. # Keep it sorted advanced_colors algebra_by algebra_div algebra_minus algebra_plus algorithm align4 align4-2players alphabet-sequence babymatch babyshapes baby_wordprocessor balancebox ballcatch braille_alphabets braille_fun canal_lock chess chess_2players chess_partyend chronos clickanddraw clickgame click_on_letter click_on_letter_up clockgame color_mix color_mix_light colors crane details drawletters +drawnumbers enumerate erase erase_2clic erase_clic explore_farm_animals explore_monuments explore_world_animals explore_world_music fifteen followline football geo-country geography gletters gnumch-equality gnumch-factors gnumch-inequality gnumch-multiples gnumch-primes graph-coloring guessnumber hangman hanoi hanoi_real hexagon imagename instruments intro_gravity land_safe lang leftright letter-in-word lightsoff louis-braille magic-hat-minus magic-hat-plus maze mazeinvisible mazerelative melody memory memory-enumerate memory-math-add memory-math-add-minus memory-math-add-minus-mult-div memory-math-add-minus-mult-div-tux memory-math-add-minus-tux memory-math-add-tux memory-math-div memory-math-div-tux memory-math-minus memory-math-minus-tux memory-math-mult memory-math-mult-div memory-math-mult-div-tux memory-math-mult-tux memory-sound memory-sound-tux memory-tux memory-wordnumber mining missing-letter money money_back money_back_cents money_cents mosaic nine_men_morris nine_men_morris_2players number_sequence numbers-odd-even paintings penalty photo_hunter planegame readingh readingv redraw redraw_symmetrical renewable_energy reversecount roman_numerals scalesboard scalesboard_weight scalesboard_weight_avoirdupois share simplepaint smallnumbers smallnumbers2 sudoku superbrain tangram target tic_tac_toe tic_tac_toe_2players traffic watercycle wordsgame diff --git a/src/activities/drawnumbers/ActivityInfo.qml b/src/activities/drawnumbers/ActivityInfo.qml new file mode 100644 index 000000000..e8d6cc372 --- /dev/null +++ b/src/activities/drawnumbers/ActivityInfo.qml @@ -0,0 +1,34 @@ +/* GCompris - ActivityInfo.qml + * + * Copyright (C) 2016 Nitish Chauhan + * + * 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 3 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, see . + */ +import GCompris 1.0 + +ActivityInfo { + name: "drawnumbers/Drawnumbers.qml" + difficulty: 1 + icon: "drawnumbers/drawnumbers.svg" + author: "Nitish Chauhan <nitish.nc18@gmail.com>" + demo: true + title: qsTr("Draw Numbers") + description: qsTr("Connect the dots to draw numbers from 0 to 9") + goal: qsTr("Children will learn how to draw different numbers in a fun way.") + prerequisite: "" + manual: qsTr("Draw the numbers by connecting the dots in the correct order") + credit: "" + section: "math numeration" + createdInVersion: 7000 +} diff --git a/src/activities/drawnumbers/CMakeLists.txt b/src/activities/drawnumbers/CMakeLists.txt new file mode 100644 index 000000000..b0b01ca06 --- /dev/null +++ b/src/activities/drawnumbers/CMakeLists.txt @@ -0,0 +1 @@ +GCOMPRIS_ADD_RCC(activities/drawnumbers *.qml *.svg *.js resource/*) diff --git a/src/activities/drawnumbers/Drawnumbers.qml b/src/activities/drawnumbers/Drawnumbers.qml new file mode 100644 index 000000000..f34eaa52f --- /dev/null +++ b/src/activities/drawnumbers/Drawnumbers.qml @@ -0,0 +1,32 @@ +/* GCompris - drawnumbers.qml + * + * Copyright (C) 2016 NITISH CHAUHAN + * + * Authors: + * + * Nitish Chauhan (Qt Quick port) + * 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 3 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, see . + */ +import QtQuick 2.1 +import "../number_sequence" +import "../../core" as Core +import "drawnumbers_dataset.js" as Dataset + +NumberSequence { + mode: "drawnumbers" + dataset: Dataset + pointImageOpacity: 0 + url: "qrc:/gcompris/src/activities/drawnumbers/resource/" +} + diff --git a/src/activities/drawnumbers/drawnumbers.svg b/src/activities/drawnumbers/drawnumbers.svg new file mode 100644 index 000000000..a6469c11c --- /dev/null +++ b/src/activities/drawnumbers/drawnumbers.svg @@ -0,0 +1,108 @@ + + + + +Created by potrace 1.13, written by Peter Selinger 2001-2015 + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/drawnumbers_dataset.js b/src/activities/drawnumbers/drawnumbers_dataset.js new file mode 100644 index 000000000..3d2fd9393 --- /dev/null +++ b/src/activities/drawnumbers/drawnumbers_dataset.js @@ -0,0 +1,89 @@ +/* GCompris - drawnumbers_dataset.js +* Copyright (C) 2016 Nitish Chauhan + +* 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 3 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, see . +*/ + +.import GCompris 1.0 as GCompris //for ApplicationInfo +.import "qrc:/gcompris/src/core/core.js" as Core + +function get() { + return [ + { + "imageName1": "background.svg", + "imageName2": "zero1.svg", + "coordinates": [[400,56],[441,62],[485,80],[514,111],[535,160],[544,205],[550,246],[546,289],[532,331],[502,375],[457,402],[416,408],[366,406],[322,388],[286,355],[268,307],[257,259],[259,209],[264,169],[281,121],[307,88],[351,59],[379,52]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("0")) + }, + + { + "imageName1": "background.svg", + "imageName2": "one1.svg", + "coordinates": [[256,175],[289,157],[324,144],[361,124],[393,103],[420,80],[420,115],[420,151],[420,200],[420,246],[420,295],[420,337],[420,376],[420,412],[420,446]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("1")) + }, + + { + "imageName1": "background.svg", + "imageName2": "two1.svg", + "coordinates": [[277,132],[289,96],[314,70],[354,49],[404,44],[452,49],[495,70],[525,108],[533,153],[503,198],[459,231],[420,264],[375,295],[337,315],[304,340],[268,372],[310,372],[339,372],[372,372],[401,372],[438,372],[473,372],[508,372],[546,372]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("2")) + }, + { + "imageName1": "background.svg", + "imageName2": "three1.svg", + "coordinates": [[266,128],[285,96],[317,70],[354,59],[395,53],[442,57],[480,75],[510,111],[507,157],[480,183],[444,194],[412,197],[369,212],[413,216],[448,220],[484,231],[514,256],[537,291],[533,329],[514,355],[482,373],[448,384],[405,383],[353,377],[308,357],[277,329],[255,295]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("3")) + }, + { + "imageName1": "background.svg", + "imageName2": "four1.svg", + "coordinates":[[412,66],[387,97],[355,132],[331,166],[300,201],[268,240],[222,288],[273,288],[325,288],[362,288],[406,288],[445,288],[486,288],[517,288], + [440,31],[440,86],[440,151],[440,212],[440,262],[440,310],[440,364],[440,401]], + "coordinates2":[1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("4")) + }, + { + "imageName1": "background.svg", + "imageName2": "five1.svg", + "coordinates": [[528,55],[480,55],[428,55],[383,55],[351,55],[315,55],[308,93],[302,122],[293,160],[285,188],[278,223],[302,226],[325,202],[358,184],[394,179],[435,190],[477,208],[511,234],[528,268],[525,313],[510,347],[481,377],[441,394],[401,402],[354,394],[311,372],[284,347],[267,308]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("5")) + }, + { + "imageName1": "background.svg", + "imageName2": "six1.svg", + "coordinates": [[522,125],[506,86],[480,66],[431,52],[388,51],[353,63],[318,88],[291,129],[277,172],[273,208],[275,251],[281,292],[295,333],[317,368],[351,387],[398,401],[446,395],[493,369],[518,315],[511,255],[482,215],[442,197],[400,193],[366,201],[337,219],[308,246]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("6")) + }, + { + "imageName1": "background.svg", + "imageName2": "seven1.svg", + "coordinates": [[264,57],[307,57],[358,57],[406,57],[444,57],[491,57],[526,57],[561,57],[526,93],[497,125],[470,160],[448,188],[424,222],[397,273],[382,304],[366,346],[354,390]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("7")) + }, + { + "imageName1": "background.svg", + "imageName2": "eight1.svg", + "coordinates": [[379,200],[331,172],[306,135],[310,91],[342,59],[377,42],[419,41],[463,52],[495,78],[513,121],[499,168],[471,198],[417,216],[371,223],[325,246],[297,281],[295,336],[303,364],[324,386],[353,400],[395,411],[445,408],[488,390],[521,354],[532,310],[526,267],[502,240],[474,226],[411,219]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("8")) + }, + { + "imageName1": "background.svg", + "imageName2": "nine1.svg", + "coordinates": [[488,205],[471,237],[431,259],[379,266],[326,252],[293,222],[275,172],[293,120],[318,89],[354,67],[405,62],[451,74],[489,106],[513,157],[521,198],[520,262],[511,304],[495,342],[462,375],[413,388],[362,386],[322,369],[302,348],[291,321]], + "sound": GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/"+ Core.getSoundFilenamForChar("9")) + } + + ] +} diff --git a/src/activities/drawnumbers/resource/README b/src/activities/drawnumbers/resource/README new file mode 100644 index 000000000..d570febe1 --- /dev/null +++ b/src/activities/drawnumbers/resource/README @@ -0,0 +1,5 @@ + +for drawnumber images & sound:- + +Activity icon :- http://gcompris.net/incoming/lang/lang/words/numbers.png + diff --git a/src/activities/drawnumbers/resource/background.svg b/src/activities/drawnumbers/resource/background.svg new file mode 100644 index 000000000..d67c3bb0c --- /dev/null +++ b/src/activities/drawnumbers/resource/background.svg @@ -0,0 +1,98 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/bear1.svg b/src/activities/drawnumbers/resource/bear1.svg new file mode 100644 index 000000000..8cd4dfdef --- /dev/null +++ b/src/activities/drawnumbers/resource/bear1.svg @@ -0,0 +1,387 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/bear2.svg b/src/activities/drawnumbers/resource/bear2.svg new file mode 100644 index 000000000..be782232d --- /dev/null +++ b/src/activities/drawnumbers/resource/bear2.svg @@ -0,0 +1,491 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/bluepoint.svg b/src/activities/drawnumbers/resource/bluepoint.svg new file mode 100644 index 000000000..73fcaf0b7 --- /dev/null +++ b/src/activities/drawnumbers/resource/bluepoint.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2012-03-23T13:52:34 + Map, Marker, Pin, Pushpin, clip art, clipart, green, + http://openclipart.org/detail/169048/green-map-marker-by-mightyman + + + mightyman + + + + + Map + Marker + Pin + Pushpin + clip art + clipart + green + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/bluepointHighlight.svg b/src/activities/drawnumbers/resource/bluepointHighlight.svg new file mode 100644 index 000000000..fa0d04f62 --- /dev/null +++ b/src/activities/drawnumbers/resource/bluepointHighlight.svg @@ -0,0 +1,160 @@ + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2012-03-23T13:52:34 + Map, Marker, Pin, Pushpin, clip art, clipart, green, + http://openclipart.org/detail/169048/green-map-marker-by-mightyman + + + mightyman + + + + + Map + Marker + Pin + Pushpin + clip art + clipart + green + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/carnaval1.svg b/src/activities/drawnumbers/resource/carnaval1.svg new file mode 100644 index 000000000..4e8e9c709 --- /dev/null +++ b/src/activities/drawnumbers/resource/carnaval1.svg @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/carnaval2.svg b/src/activities/drawnumbers/resource/carnaval2.svg new file mode 100644 index 000000000..1e9223686 --- /dev/null +++ b/src/activities/drawnumbers/resource/carnaval2.svg @@ -0,0 +1,536 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/de1.svg b/src/activities/drawnumbers/resource/de1.svg new file mode 100644 index 000000000..8631acac1 --- /dev/null +++ b/src/activities/drawnumbers/resource/de1.svg @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/de2.svg b/src/activities/drawnumbers/resource/de2.svg new file mode 100644 index 000000000..f91b1d36a --- /dev/null +++ b/src/activities/drawnumbers/resource/de2.svg @@ -0,0 +1,447 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/dn_fond1.svg b/src/activities/drawnumbers/resource/dn_fond1.svg new file mode 100644 index 000000000..fc6ca9466 --- /dev/null +++ b/src/activities/drawnumbers/resource/dn_fond1.svg @@ -0,0 +1,797 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/dn_fond2.svg b/src/activities/drawnumbers/resource/dn_fond2.svg new file mode 100644 index 000000000..5f35ef0c7 --- /dev/null +++ b/src/activities/drawnumbers/resource/dn_fond2.svg @@ -0,0 +1,843 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/eight1.svg b/src/activities/drawnumbers/resource/eight1.svg new file mode 100644 index 000000000..dcde9bd32 --- /dev/null +++ b/src/activities/drawnumbers/resource/eight1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/epouvantail1.svg b/src/activities/drawnumbers/resource/epouvantail1.svg new file mode 100644 index 000000000..db9224f04 --- /dev/null +++ b/src/activities/drawnumbers/resource/epouvantail1.svg @@ -0,0 +1,370 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/epouvantail2.svg b/src/activities/drawnumbers/resource/epouvantail2.svg new file mode 100644 index 000000000..488058ff8 --- /dev/null +++ b/src/activities/drawnumbers/resource/epouvantail2.svg @@ -0,0 +1,779 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/fish1.svg b/src/activities/drawnumbers/resource/fish1.svg new file mode 100644 index 000000000..5a0cc109d --- /dev/null +++ b/src/activities/drawnumbers/resource/fish1.svg @@ -0,0 +1,293 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/fish2.svg b/src/activities/drawnumbers/resource/fish2.svg new file mode 100644 index 000000000..6913759c4 --- /dev/null +++ b/src/activities/drawnumbers/resource/fish2.svg @@ -0,0 +1,504 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/five1.svg b/src/activities/drawnumbers/resource/five1.svg new file mode 100644 index 000000000..0320ba68a --- /dev/null +++ b/src/activities/drawnumbers/resource/five1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/four1.svg b/src/activities/drawnumbers/resource/four1.svg new file mode 100644 index 000000000..e1bd004ad --- /dev/null +++ b/src/activities/drawnumbers/resource/four1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/greenpoint.svg b/src/activities/drawnumbers/resource/greenpoint.svg new file mode 100644 index 000000000..d8be0d97f --- /dev/null +++ b/src/activities/drawnumbers/resource/greenpoint.svg @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + Openclipart + + + + 2012-03-23T13:52:34 + Map, Marker, Pin, Pushpin, clip art, clipart, green, + http://openclipart.org/detail/169048/green-map-marker-by-mightyman + + + mightyman + + + + + Map + Marker + Pin + Pushpin + clip art + clipart + green + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/hibou1.svg b/src/activities/drawnumbers/resource/hibou1.svg new file mode 100644 index 000000000..2cd43c0f1 --- /dev/null +++ b/src/activities/drawnumbers/resource/hibou1.svg @@ -0,0 +1,95 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/hibou2.svg b/src/activities/drawnumbers/resource/hibou2.svg new file mode 100644 index 000000000..bfd0bfd09 --- /dev/null +++ b/src/activities/drawnumbers/resource/hibou2.svg @@ -0,0 +1,182 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/house1.svg b/src/activities/drawnumbers/resource/house1.svg new file mode 100644 index 000000000..55f7efcf7 --- /dev/null +++ b/src/activities/drawnumbers/resource/house1.svg @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/house2.svg b/src/activities/drawnumbers/resource/house2.svg new file mode 100644 index 000000000..45b554ff5 --- /dev/null +++ b/src/activities/drawnumbers/resource/house2.svg @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/nine1.svg b/src/activities/drawnumbers/resource/nine1.svg new file mode 100644 index 000000000..863ad53a6 --- /dev/null +++ b/src/activities/drawnumbers/resource/nine1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/one1.svg b/src/activities/drawnumbers/resource/one1.svg new file mode 100644 index 000000000..4668cc927 --- /dev/null +++ b/src/activities/drawnumbers/resource/one1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/plane1.svg b/src/activities/drawnumbers/resource/plane1.svg new file mode 100644 index 000000000..458caacd8 --- /dev/null +++ b/src/activities/drawnumbers/resource/plane1.svg @@ -0,0 +1,435 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/plane2.svg b/src/activities/drawnumbers/resource/plane2.svg new file mode 100644 index 000000000..a374bec0f --- /dev/null +++ b/src/activities/drawnumbers/resource/plane2.svg @@ -0,0 +1,667 @@ + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/sapin1.svg b/src/activities/drawnumbers/resource/sapin1.svg new file mode 100644 index 000000000..ea59fd4d8 --- /dev/null +++ b/src/activities/drawnumbers/resource/sapin1.svg @@ -0,0 +1,236 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/sapin2.svg b/src/activities/drawnumbers/resource/sapin2.svg new file mode 100644 index 000000000..f2b00ef6c --- /dev/null +++ b/src/activities/drawnumbers/resource/sapin2.svg @@ -0,0 +1,611 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/seven1.svg b/src/activities/drawnumbers/resource/seven1.svg new file mode 100644 index 000000000..e25785d2d --- /dev/null +++ b/src/activities/drawnumbers/resource/seven1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/six1.svg b/src/activities/drawnumbers/resource/six1.svg new file mode 100644 index 000000000..7c6fd7dd3 --- /dev/null +++ b/src/activities/drawnumbers/resource/six1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/three1.svg b/src/activities/drawnumbers/resource/three1.svg new file mode 100644 index 000000000..052f0c0fb --- /dev/null +++ b/src/activities/drawnumbers/resource/three1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/two1.svg b/src/activities/drawnumbers/resource/two1.svg new file mode 100644 index 000000000..19331a8d0 --- /dev/null +++ b/src/activities/drawnumbers/resource/two1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/drawnumbers/resource/zero1.svg b/src/activities/drawnumbers/resource/zero1.svg new file mode 100644 index 000000000..aae81f6fc --- /dev/null +++ b/src/activities/drawnumbers/resource/zero1.svg @@ -0,0 +1,61 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/src/activities/number_sequence/number_sequence.js b/src/activities/number_sequence/number_sequence.js index 4083fb27d..9c5dd715e 100644 --- a/src/activities/number_sequence/number_sequence.js +++ b/src/activities/number_sequence/number_sequence.js @@ -1,140 +1,140 @@ /* GCompris - number_sequence.js * * Copyright (C) 2014 Emmanuel Charruau * * Authors: * Olivier Ponchaut (GTK+ version) * Emmanuel Charruau (Qt Quick port) * * 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 3 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, see . */ .pragma library .import QtQuick 2.2 as Quick .import GCompris 1.0 as GCompris //for ApplicationInfo .import "qrc:/gcompris/src/core/core.js" as Core var currentLevel = 0 var items var mode var dataset var numberOfLevel var pointPositions = [] var pointPositions2 = [] var linePropertiesArray = [] var url function start(_items, _mode,_dataset,_url) { items = _items mode = _mode dataset = _dataset.get() url = _url numberOfLevel = dataset.length currentLevel = 0 initLevel() } function stop() { } function initLevel() { items.bar.level = currentLevel + 1 items.pointIndexToClick = 0 loadCoordinates() loadBackgroundImage() - if(mode == "drawletters") { + if(mode == "drawletters" || mode == "drawnumbers") { //function to play letter sound at start playLetterSound(dataset[currentLevel].sound) } } function nextLevel() { if(numberOfLevel <= ++currentLevel) { currentLevel = 0 } initLevel(); } function previousLevel() { if(--currentLevel < 0) { currentLevel = numberOfLevel - 1 } initLevel(); } //function to play the sound of chararcter at start & end function playLetterSound(sound) { items.audioVoices.play(sound) } function drawSegment(pointIndex) { if (pointIndex == items.pointIndexToClick) { items.pointImageRepeater.itemAt(pointIndex).opacity = 0 - if (mode == "clickanddraw" || mode == "drawletters") { + if (mode == "clickanddraw" || mode == "drawletters" || mode == "drawnumbers") { if (pointIndex < items.pointImageRepeater.count-1) { items.pointImageRepeater.itemAt(pointIndex+1).highlight = true } } // Draw the line from pointIndex - 1 to pointIndex if(pointPositions2 && pointPositions2[pointIndex] != pointPositions2[pointIndex-1]) { //do nothing } else { if (pointIndex > 0) { items.segmentsRepeater.itemAt(pointIndex-1).opacity = 1 } } if (pointIndex == items.pointImageRepeater.count-1) { for (var i = 1; i < dataset[currentLevel].coordinates.length; i++) { items.segmentsRepeater.itemAt(i-1).opacity = 0 } items.imageBack2.source = url + dataset[currentLevel].imageName2 won() } items.pointIndexToClick++ } } function loadCoordinates() { // prepare points data pointPositions = dataset[currentLevel].coordinates pointPositions2 = dataset[currentLevel].coordinates2 items.pointImageRepeater.model = pointPositions - if (mode == "clickanddraw" || mode == "drawletters") + if (mode == "clickanddraw" || mode == "drawletters" || mode == "drawnumbers") items.pointImageRepeater.itemAt(0).highlight = true // prepare segments data linePropertiesArray = [] for (var i = 0; i < (pointPositions.length)-1; i++) { var lineProperties = [] // properties are x1,y1,x2,y,angle rotation lineProperties[0] = pointPositions[i][0] // x lineProperties[1] = pointPositions[i][1] // y lineProperties[2] = pointPositions[i+1][0] // x2 lineProperties[3] = pointPositions[i+1][1] // y2 linePropertiesArray[i] = lineProperties } items.segmentsRepeater.model = linePropertiesArray } function loadBackgroundImage() { items.imageBack.source = url + dataset[currentLevel].imageName1 items.imageBack2.source = url + dataset[currentLevel].imageName1 } function won() { - if(mode == "drawletters") { + if(mode == "drawletters" || mode == "drawnumbers") { playLetterSound(dataset[currentLevel].sound) } items.bonus.good("flower") }