Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
GCompris
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
27
Issues
27
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Education
GCompris
Commits
61e394d4
Commit
61e394d4
authored
Jul 06, 2020
by
Deepak Kumar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
memory addition and subtraction memory game, multiple datasets added
parent
9db9d9d3
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
361 additions
and
79 deletions
+361
-79
src/activities/memory-math-add-minus/ActivityInfo.qml
src/activities/memory-math-add-minus/ActivityInfo.qml
+1
-0
src/activities/memory-math-add-minus/MemoryMathAddMinus.qml
src/activities/memory-math-add-minus/MemoryMathAddMinus.qml
+0
-2
src/activities/memory-math-add-minus/memory-addminusdataset.js
...ctivities/memory-math-add-minus/memory-addminusdataset.js
+0
-77
src/activities/memory-math-add-minus/resource/1/Data.qml
src/activities/memory-math-add-minus/resource/1/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/10/Data.qml
src/activities/memory-math-add-minus/resource/10/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/2/Data.qml
src/activities/memory-math-add-minus/resource/2/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/3/Data.qml
src/activities/memory-math-add-minus/resource/3/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/4/Data.qml
src/activities/memory-math-add-minus/resource/4/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/5/Data.qml
src/activities/memory-math-add-minus/resource/5/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/6/Data.qml
src/activities/memory-math-add-minus/resource/6/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/7/Data.qml
src/activities/memory-math-add-minus/resource/7/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/8/Data.qml
src/activities/memory-math-add-minus/resource/8/Data.qml
+36
-0
src/activities/memory-math-add-minus/resource/9/Data.qml
src/activities/memory-math-add-minus/resource/9/Data.qml
+36
-0
No files found.
src/activities/memory-math-add-minus/ActivityInfo.qml
View file @
61e394d4
...
...
@@ -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,10
"
}
src/activities/memory-math-add-minus/MemoryMathAddMinus.qml
View file @
61e394d4
...
...
@@ -22,9 +22,7 @@
import
QtQuick
2.6
import
"
../memory
"
import
"
memory-addminusdataset.js
"
as
Dataset
MemoryCommon
{
dataset
:
Dataset
.
get
()
backgroundImg
:
"
qrc:/gcompris/src/activities/memory/resource/background.svg
"
}
src/activities/memory-math-add-minus/memory-addminusdataset.js
deleted
100644 → 0
View file @
9db9d9d3
/* 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
.
getAddMinusTable
(
1
)
},
{
// Level 2
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
2
)
},
{
// Level 3
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
3
)
},
{
// Level 4
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
4
)
},
{
// Level 5
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
5
)
},
{
// Level 6
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
6
)
},
{
// Level 7
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
7
)
},
{
// Level 8
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
8
)
},
{
// Level 9
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
9
)
},
{
// Level 10
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
10
)
}
]
function
get
()
{
return
memory_cards
}
src/activities/memory-math-add-minus/resource/1/Data.qml
0 → 100644
View file @
61e394d4
/* 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 1.
"
)
difficulty
:
4
data
:
[
{
// Level 1
columns
:
5
,
rows
:
2
,
texts
:
Memory
.
getAddMinusTable
(
1
)
}
]
}
src/activities/memory-math-add-minus/resource/10/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
10
)
}
]
}
src/activities/memory-math-add-minus/resource/2/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
2
)
}
]
}
src/activities/memory-math-add-minus/resource/3/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
3
)
}
]
}
src/activities/memory-math-add-minus/resource/4/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
4
)
}
]
}
src/activities/memory-math-add-minus/resource/5/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
5
)
}
]
}
src/activities/memory-math-add-minus/resource/6/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
6
)
}
]
}
src/activities/memory-math-add-minus/resource/7/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
7
)
}
]
}
src/activities/memory-math-add-minus/resource/8/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
8
)
}
]
}
src/activities/memory-math-add-minus/resource/9/Data.qml
0 → 100644
View file @
61e394d4
/* 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
.
getAddMinusTable
(
5
)
}
]
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment