Changeset View
Changeset View
Standalone View
Standalone View
src/activities/numbers-odd-even/NumbersOddEven.qml
Show All 12 Lines | |||||
13 | GNU General Public License for more details. | 13 | GNU General Public License for more details. | ||
14 | 14 | | |||
15 | You should have received a copy of the GNU General Public License | 15 | You should have received a copy of the GNU General Public License | ||
16 | along with this program; if not, see <https://www.gnu.org/licenses/>. | 16 | along with this program; if not, see <https://www.gnu.org/licenses/>. | ||
17 | */ | 17 | */ | ||
18 | 18 | | |||
19 | import QtQuick 2.6 | 19 | import QtQuick 2.6 | ||
20 | import "../planegame" | 20 | import "../planegame" | ||
21 | 21 | | |||
jjazeix: both shouldn't be needed. | |||||
22 | | ||||
amankumargupta: Extra empty line. | |||||
22 | Planegame { | 23 | Planegame { | ||
23 | 24 | | |||
24 | dataset: [ | 25 | dataset: [ | ||
25 | { | 26 | { | ||
26 | data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), | 27 | data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), | ||
27 | showNext: true | 28 | showNext: true | ||
28 | }, | 29 | }, | ||
29 | { | 30 | { | ||
30 | data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), | 31 | data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), | ||
31 | showNext: true | 32 | showNext: true | ||
32 | }, | 33 | }, | ||
33 | { | 34 | { | ||
34 | data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), | 35 | data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), | ||
35 | showNext: false | 36 | showNext: false | ||
36 | }, | 37 | }, | ||
37 | { | 38 | { | ||
38 | data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), | 39 | data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), | ||
39 | showNext: false | 40 | showNext: false | ||
40 | } | 41 | } | ||
41 | ] | 42 | ] | ||
43 | | ||||
44 | tutorialInstructions: [ | ||||
45 | { | ||||
46 | "instruction": qsTr("This activity teaches about even and odd numbers."), | ||||
47 | "instructionQml": "" | ||||
48 | }, | ||||
49 | { | ||||
50 | "instruction": qsTr("Even numbers are numbers which leave remainder 0 when divisible by 2."), | ||||
51 | "instructionQml" : "qrc:/gcompris/src/activities/numbers-odd-even/resource/tutorial1.qml" | ||||
52 | }, | ||||
53 | { | ||||
54 | "instruction": qsTr("Odd numbers are numbers which do not leave remainder 0 when divisible by 2."), | ||||
55 | "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/tutorial2.qml" | ||||
56 | }, | ||||
57 | { | ||||
58 | "instruction": qsTr("Exercise: \n To test your understanding."), | ||||
59 | "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/tutorial3.qml" | ||||
60 | }, | ||||
61 | { | ||||
62 | "instruction": qsTr("Exercise: \n To test your understanding."), | ||||
63 | "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/tutorial4.qml" | ||||
64 | }, | ||||
65 | { | ||||
66 | "instruction": qsTr("Exercise \n To test your understanding."), | ||||
jjazeix: missing : | |||||
67 | "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/tutorial5.qml" | ||||
68 | } | ||||
69 | | ||||
70 | ] | ||||
42 | } | 71 | } | ||
this should be in Planegame.qml (in the pageComponent). You also need to handle the fact that if there is a Tutorial, the activity behind should not start and start only when "Skip" is pressed. jjazeix: this should be in Planegame.qml (in the pageComponent).
You should have a boolean at Planegame… |
both shouldn't be needed.