diff --git a/src/activities/smallnumbers2/ActivityInfo.qml b/src/activities/smallnumbers2/ActivityInfo.qml index 3bb6b1d04..44728d855 100644 --- a/src/activities/smallnumbers2/ActivityInfo.qml +++ b/src/activities/smallnumbers2/ActivityInfo.qml @@ -1,41 +1,41 @@ /* GCompris - ActivityInfo.qml * * Copyright (C) 2015 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 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: "smallnumbers2/Smallnumbers2.qml" difficulty: 2 icon: "smallnumbers2/smallnumbers2.svg" author: "Bruno Coudoin <bruno.coudoin@gcompris.net>" demo: false //: Activity title title: qsTr("Numbers with dominoes") //: Help title description: qsTr("Count the number of dots on the dominoes before they reach the ground") // intro: "Count the number of the points on the dominoes then type the result on your keyboard." //: Help goal goal: qsTr("In a limited time, count the number of dots") //: Help prerequisite prerequisite: qsTr("Counting skills") //: Help manual manual: qsTr("With the keyboard, type the number of dots you see on the falling dominoes.") credit: "" section: "math numeration" createdInVersion: 0 - levels: "1,2,3,4,5,6,7" + levels: "1,2,3,4,5,6,7,8" } diff --git a/src/activities/smallnumbers2/resource/1/Data.qml b/src/activities/smallnumbers2/resource/1/Data.qml index 1bb41cc4c..b33e87aa8 100644 --- a/src/activities/smallnumbers2/resource/1/Data.qml +++ b/src/activities/smallnumbers2/resource/1/Data.qml @@ -1,61 +1,47 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 3") difficulty: 1 data: [ { "objective" : qsTr("Select the numbers 1 and 2"), "sublevels" : "8", "words" : [ "1", "2" ] }, - { - "objective" : qsTr("Select the number 3"), - "sublevels" : "6", - "words" : [ - "3", - "3" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 3"), - "sublevels" : "8", - "words" : [ - "2", - "3" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 3"), "sublevels" : "10", "words" : [ "1", "2", + "3", "3" ] } ] } diff --git a/src/activities/smallnumbers2/resource/2/Data.qml b/src/activities/smallnumbers2/resource/2/Data.qml index 76a6bf5e4..4d203be92 100644 --- a/src/activities/smallnumbers2/resource/2/Data.qml +++ b/src/activities/smallnumbers2/resource/2/Data.qml @@ -1,63 +1,41 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 4") difficulty: 2 data: [ - { - "objective" : qsTr("Select the number 4"), - "sublevels" : "6", - "words" : [ - "4", - "4" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 4"), - "sublevels" : "8", - "words" : [ - "3", - "4" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 4"), - "sublevels" : "10", - "words" : [ - "2", - "3", - "4" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 4"), "sublevels" : "12", "words" : [ "1", "2", "3", + "4", + "4", "4" ] } ] } diff --git a/src/activities/smallnumbers2/resource/3/Data.qml b/src/activities/smallnumbers2/resource/3/Data.qml index 73a564c05..93e9f12d6 100644 --- a/src/activities/smallnumbers2/resource/3/Data.qml +++ b/src/activities/smallnumbers2/resource/3/Data.qml @@ -1,74 +1,43 @@ /* GCompris - Data.qml * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 5") difficulty: 2 data: [ - { - "objective" : qsTr("Select the number 5"), - "sublevels" : "6", - "words" : [ - "5", - "5" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 4 to 5"), - "sublevels" : "8", - "words" : [ - "4", - "5" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 5"), - "sublevels" : "10", - "words" : [ - "3", - "4", - "5" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 5"), - "sublevels" : "12", - "words" : [ - "2", - "3", - "4", - "5" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 5"), "sublevels" : "14", "words" : [ "1", "2", "3", "4", + "5", + "5", + "5", "5" ] } ] } diff --git a/src/activities/smallnumbers2/resource/4/Data.qml b/src/activities/smallnumbers2/resource/4/Data.qml index 582bc1b0b..6cd31a06b 100644 --- a/src/activities/smallnumbers2/resource/4/Data.qml +++ b/src/activities/smallnumbers2/resource/4/Data.qml @@ -1,86 +1,45 @@ /* GCompris - Data.qml * * Copyright (C) 2020 Shubham Mishra * * Authors: * Shubham Mishra + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 6") difficulty: 3 data: [ - { - "objective" : qsTr("Select the number 6"), - "sublevels" : "6", - "words" : [ - "6", - "6" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 5 to 6"), - "sublevels" : "8", - "words" : [ - "5", - "6" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 4 to 6"), - "sublevels" : "10", - "words" : [ - "4", - "5", - "6" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 6"), - "sublevels" : "12", - "words" : [ - "3", - "4", - "5", - "6" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 6"), - "sublevels" : "14", - "words" : [ - "2", - "3", - "4", - "5", - "6" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 6"), "sublevels" : "16", "words" : [ "1", "2", "3", "4", "5", + "6", + "6", + "6", + "6", "6" ] } ] } diff --git a/src/activities/smallnumbers2/resource/5/Data.qml b/src/activities/smallnumbers2/resource/5/Data.qml index ec4a18fb6..0ab54fda4 100644 --- a/src/activities/smallnumbers2/resource/5/Data.qml +++ b/src/activities/smallnumbers2/resource/5/Data.qml @@ -1,99 +1,47 @@ /* GCompris - Data.qml * * Copyright (C) 2020 Shubham Mishra * * Authors: * Shubham Mishra + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 7") difficulty: 3 data: [ - { - "objective" : qsTr("Select the number 7"), - "sublevels" : "6", - "words" : [ - "7", - "7" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 6 to 7"), - "sublevels" : "8", - "words" : [ - "6", - "7" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 5 to 7"), - "sublevels" : "10", - "words" : [ - "5", - "6", - "7" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 4 to 7"), - "sublevels" : "12", - "words" : [ - "4", - "5", - "6", - "7" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 7"), - "sublevels" : "14", - "words" : [ - "3", - "4", - "5", - "6", - "7" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 7"), - "sublevels" : "16", - "words" : [ - "2", - "3", - "4", - "5", - "6", - "7" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 7"), "sublevels" : "18", "words" : [ "1", "2", "3", "4", "5", "6", + "7", + "7", + "7", + "7", + "7", "7" ] } ] } diff --git a/src/activities/smallnumbers2/resource/6/Data.qml b/src/activities/smallnumbers2/resource/6/Data.qml index de10c9f04..189d2ed68 100644 --- a/src/activities/smallnumbers2/resource/6/Data.qml +++ b/src/activities/smallnumbers2/resource/6/Data.qml @@ -1,113 +1,49 @@ /* GCompris - Data.qml * * Copyright (C) 2020 Shubham Mishra * * Authors: * Shubham Mishra + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 8") difficulty: 3 data: [ - { - "objective" : qsTr("Select the number 8"), - "sublevels" : "6", - "words" : [ - "8", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 7 to 8"), - "sublevels" : "8", - "words" : [ - "7", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 6 to 8"), - "sublevels" : "10", - "words" : [ - "6", - "7", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 5 to 8"), - "sublevels" : "12", - "words" : [ - "5", - "6", - "7", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 4 to 8"), - "sublevels" : "14", - "words" : [ - "4", - "5", - "6", - "7", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 8"), - "sublevels" : "16", - "words" : [ - "3", - "4", - "5", - "6", - "7", - "8" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 8"), - "sublevels" : "18", - "words" : [ - "2", - "3", - "4", - "5", - "6", - "7", - "8" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 8"), "sublevels" : "20", "words" : [ "1", "2", "3", "4", "5", "6", "7", + "8", + "8", + "8", + "8", + "8", + "8", "8" ] } ] } diff --git a/src/activities/smallnumbers2/resource/7/Data.qml b/src/activities/smallnumbers2/resource/7/Data.qml index 25ce7ed05..527f177fc 100644 --- a/src/activities/smallnumbers2/resource/7/Data.qml +++ b/src/activities/smallnumbers2/resource/7/Data.qml @@ -1,128 +1,51 @@ /* GCompris - Data.qml * * Copyright (C) 2020 Shubham Mishra * * Authors: * Shubham Mishra + * Timothée Giet * * 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 "../../../../core" Dataset { objective: qsTr("Select a number on dominoes up to 9") difficulty: 3 data: [ - { - "objective" : qsTr("Select the number 9"), - "sublevels" : "6", - "words" : [ - "9", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 8 to 9"), - "sublevels" : "8", - "words" : [ - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 7 to 9"), - "sublevels" : "10", - "words" : [ - "7", - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 6 to 9"), - "sublevels" : "12", - "words" : [ - "6", - "7", - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 5 to 9"), - "sublevels" : "14", - "words" : [ - "5", - "6", - "7", - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 4 to 9"), - "sublevels" : "16", - "words" : [ - "4", - "5", - "6", - "7", - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 3 to 9"), - "sublevels" : "18", - "words" : [ - "3", - "4", - "5", - "6", - "7", - "8", - "9" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 9"), - "sublevels" : "20", - "words" : [ - "2", - "3", - "4", - "5", - "6", - "7", - "8", - "9" - ] - }, { "objective" : qsTr("Select the number on dominoes from 1 to 9"), "sublevels" : "22", "words" : [ "1", "2", "3", "4", "5", "6", "7", "8", + "9", + "9", + "9", + "9", + "9", + "9", + "9", "9" ] } ] } diff --git a/src/activities/smallnumbers2/resource/1/Data.qml b/src/activities/smallnumbers2/resource/8/Data.qml similarity index 56% copy from src/activities/smallnumbers2/resource/1/Data.qml copy to src/activities/smallnumbers2/resource/8/Data.qml index 1bb41cc4c..bc474028c 100644 --- a/src/activities/smallnumbers2/resource/1/Data.qml +++ b/src/activities/smallnumbers2/resource/8/Data.qml @@ -1,61 +1,44 @@ /* GCompris - Data.qml * - * Copyright (C) 2019 Akshay Kumar + * Copyright (C) 2020 Timothée Giet * * Authors: - * Akshay Kumar + * Timothée Giet * * 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 "../../../../core" Dataset { - objective: qsTr("Select a number on dominoes up to 3") - difficulty: 1 + objective: qsTr("Select a number on dominoes from 0 to 9") + difficulty: 3 data: [ { - "objective" : qsTr("Select the numbers 1 and 2"), - "sublevels" : "8", - "words" : [ - "1", - "2" - ] - }, - { - "objective" : qsTr("Select the number 3"), - "sublevels" : "6", - "words" : [ - "3", - "3" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 2 to 3"), - "sublevels" : "8", - "words" : [ - "2", - "3" - ] - }, - { - "objective" : qsTr("Select the number on dominoes from 1 to 3"), - "sublevels" : "10", + "objective" : qsTr("Select the number on dominoes from 0 to 9"), + "sublevels" : "24", "words" : [ + "0", "1", "2", - "3" + "3", + "4", + "5", + "6", + "7", + "8", + "9" ] } ] }