memory-math-mult-div, memory-math-mult-div-tux, add multiple dataset

src/activities/memory-math-mult-div-tux/ActivityInfo.qml

@@ -38,4 +38,5 @@ In this game, these cards are hiding the two parts of an operation. You need to
   credit: ""
   section: "math memory arithmetic"
   createdInVersion: 0
+  levels: "1,2,3,4,5,6,7,8,9"
 }

src/activities/memory-math-mult-div-tux/MemoryMathMultDivTux.qml

@@ -22,10 +22,8 @@
 import QtQuick 2.6
 
 import "../memory"
-import "../memory-math-mult-div/memory-multdivdataset.js" as Dataset
 
 MemoryCommon {
-    dataset: Dataset.get()
     backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg"
     withTux: true
 }

src/activities/memory-math-mult-div-tux/resource/1/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 2.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(2)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/2/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 3.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(3)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/3/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 4.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(4)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/4/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 5.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(5)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/5/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 6.")
+    difficulty: 5
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(6)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/6/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 7.")
+    difficulty: 5
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(7)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/7/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 8.")
+    difficulty: 5
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(8)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/8/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 9.")
+    difficulty: 5
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(9)
+        }
+    ]
+}

src/activities/memory-math-mult-div-tux/resource/9/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 10.")
+    difficulty: 5
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(10)
+        }
+    ]
+}

src/activities/memory-math-mult-div/ActivityInfo.qml

@@ -38,4 +38,5 @@ In this game, these cards are hiding the two parts of an operation. You need to
   credit: ""
   section: "math memory arithmetic"
   createdInVersion: 0
+  levels: "1,2,3,4,5,6,7,8,9"
 }

src/activities/memory-math-mult-div/MemoryMathMultDiv.qml

@@ -22,9 +22,7 @@
 import QtQuick 2.6
 
 import "../memory"
-import "memory-multdivdataset.js" as Dataset
 
 MemoryCommon {
-    dataset: Dataset.get()
     backgroundImg: "qrc:/gcompris/src/activities/memory/resource/background.svg"
 }

src/activities/memory-math-mult-div/memory-multdivdataset.js

-/* GCompris
- *
- * Copyright (C) 2014 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 <https://www.gnu.org/licenses/>.
- */
-
-.import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
-
-var memory_cards = [
-            { // Level 1
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(1)
-            },
-            { // Level 2
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(2)
-            },
-            { // Level 3
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(3)
-            },
-            { // Level 4
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(4)
-            },
-            { // Level 5
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(5)
-            },
-            { // Level 6
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(6)
-            },
-            { // Level 7
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(7)
-            },
-            { // Level 8
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(8)
-            },
-            { // Level 9
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(9)
-            },
-            { // Level 10
-                columns: 5,
-                rows: 2,
-                texts: Memory.getMultDivTable(10)
-            }
-        ]
-
-
-function get() {
-    return memory_cards
-}

src/activities/memory-math-mult-div/resource/1/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 2.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(2)
+        }
+    ]
+}

src/activities/memory-math-mult-div/resource/2/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 3.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(3)
+        }
+    ]
+}

src/activities/memory-math-mult-div/resource/3/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 4.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(4)
+        }
+    ]
+}

src/activities/memory-math-mult-div/resource/4/Data.qml

+/* GCompris - Data.qml
+ *
+ * Copyright (C) 2020 Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ * Authors:
+ *   Deepak Kumar <deepakdk2431@gmail.com>
+ *
+ *   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 <http://www.gnu.org/licenses/>.
+ */
+
+import GCompris 1.0
+import "qrc:/gcompris/src/activities/memory/math_util.js" as Memory
+
+Data {
+    objective: qsTr("Table of 5.")
+    difficulty: 4
+
+    data: [
+        { // Level 1
+            columns: 5,
+            rows: 2,
+            texts: Memory.getMultDivTable(5)
+        }
+    ]
+}