Index: src/activities/memory-math-add-tux/ActivityInfo.qml =================================================================== --- src/activities/memory-math-add-tux/ActivityInfo.qml +++ src/activities/memory-math-add-tux/ActivityInfo.qml @@ -40,4 +40,5 @@ credit: "" section: "math memory arithmetic" createdInVersion: 0 + levels: "1,2,3,4,5,6,7,8,9,10" } Index: src/activities/memory-math-add-tux/MemoryMathAddTux.qml =================================================================== --- src/activities/memory-math-add-tux/MemoryMathAddTux.qml +++ src/activities/memory-math-add-tux/MemoryMathAddTux.qml @@ -22,10 +22,8 @@ import QtQuick 2.6 import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset MemoryCommon { - dataset: Dataset.get() backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" withTux: true } Index: src/activities/memory-math-add-tux/resource/1/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/1/Data.qml +++ src/activities/memory-math-add-tux/resource/1/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 11.") + difficulty: 1 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(1) + } + ] } Index: src/activities/memory-math-add-tux/resource/10/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/10/Data.qml +++ src/activities/memory-math-add-tux/resource/10/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 20.") + difficulty: 5 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(10) + } + ] } Index: src/activities/memory-math-add-tux/resource/2/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/2/Data.qml +++ src/activities/memory-math-add-tux/resource/2/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 12.") + difficulty: 2 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(2) + } + ] } Index: src/activities/memory-math-add-tux/resource/3/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/3/Data.qml +++ src/activities/memory-math-add-tux/resource/3/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 13.") + difficulty: 3 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(3) + } + ] } Index: src/activities/memory-math-add-tux/resource/4/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/4/Data.qml +++ src/activities/memory-math-add-tux/resource/4/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 14.") + difficulty: 3 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(4) + } + ] } Index: src/activities/memory-math-add-tux/resource/5/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/5/Data.qml +++ src/activities/memory-math-add-tux/resource/5/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 15.") + difficulty: 3 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(5) + } + ] } Index: src/activities/memory-math-add-tux/resource/6/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/6/Data.qml +++ src/activities/memory-math-add-tux/resource/6/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 16.") + difficulty: 4 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(6) + } + ] } Index: src/activities/memory-math-add-tux/resource/7/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/7/Data.qml +++ src/activities/memory-math-add-tux/resource/7/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 17.") + difficulty: 4 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(7) + } + ] } Index: src/activities/memory-math-add-tux/resource/8/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/8/Data.qml +++ src/activities/memory-math-add-tux/resource/8/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 18.") + difficulty: 4 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(8) + } + ] } Index: src/activities/memory-math-add-tux/resource/9/Data.qml =================================================================== --- src/activities/memory-math-add-tux/resource/9/Data.qml +++ src/activities/memory-math-add-tux/resource/9/Data.qml @@ -1,10 +1,9 @@ -/* gcompris +/* GCompris - Data.qml * - * Copyright (C) 2014 JB BUTET + * Copyright (C) 2020 Deepak Kumar * * Authors: - * Bruno Coudoin (GTK+ version) - * JB BUTET (Qt Quick port) + * Deepak Kumar * * 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 @@ -17,15 +16,21 @@ * 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 . + * along with this program; if not, see . */ -import QtQuick 2.6 -import "../memory" -import "../memory-math-add/memory-adddataset.js" as Dataset +import GCompris 1.0 +import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory -MemoryCommon { - dataset: Dataset.get() - backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg" - withTux: true +Data { + objective: qsTr("Find cards with equivalent quantities until 19.") + difficulty: 5 + + data: [ + { // Level 1 + columns: 5, + rows: 2, + texts: Memory.getAddTable(9) + } + ] }