Differential D17945 Diff 56679 src/activities/numbers-odd-even/NumbersOddEven.qml

Changeset View

Standalone View

View Options

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​
19import QtQuick 2.6 19​import QtQuick 2.6
20import "../planegame" 20​import "../planegame"
21 21​
jjazeixUnsubmitted
Done

both shouldn't be needed.

jjazeix: both shouldn't be needed.
22Planegame { 22​Planegame {
amankumarguptaUnsubmitted
Done

Extra empty line.

amankumargupta: Extra empty line.
23 23​
24​ showTutorial: true
25​
24 dataset: [ 26​ dataset: [
25 { 27​ {
26 data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), 28​ data: "0 2 4 6 8 10 12 14 16 18 20".split(" "),
27 showNext: true 29​ showNext: true
28 }, 30​ },
29 { 31​ {
30 data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), 32​ data: "1 3 5 7 9 11 13 15 17 19 21".split(" "),
31 showNext: true 33​ showNext: true
32 }, 34​ },
33 { 35​ {
34 data: "0 2 4 6 8 10 12 14 16 18 20".split(" "), 36​ data: "0 2 4 6 8 10 12 14 16 18 20".split(" "),
35 showNext: false 37​ showNext: false
36 }, 38​ },
37 { 39​ {
38 data: "1 3 5 7 9 11 13 15 17 19 21".split(" "), 40​ data: "1 3 5 7 9 11 13 15 17 19 21".split(" "),
39 showNext: false 41​ showNext: false
40 } 42​ }
41 ] 43​ ]
44​
45​ tutorialInstructions: [
46​ {
47​ "instruction": qsTr("This activity teaches about even and odd numbers."),
48​ "instructionQml": ""
49​ },
50​ {
51​ "instruction": qsTr("Even numbers are numbers which leave remainder 0 when divided by 2."),
52​ "instructionQml": ""
53​ },
54​
55​ {
56​ "instruction": qsTr("What is meant by remainder of a number?"),
57​ "instructionQml" : "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial1.qml"
58​ },
59​
60​ {
61​ "instruction": qsTr("Even numbers are numbers which leave remainder 0 when divided by 2."),
62​ "instructionQml" : "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial2.qml"
63​ },
64​ {
65​ "instruction": qsTr("Odd numbers are numbers which do not leave remainder 0 when divided by 2."),
66​ "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial3.qml"
67​ },
jjazeixUnsubmitted
Not Done

missing :

jjazeix: missing :
68​ {
69​ "instruction": qsTr("Exercise to test your understanding."),
70​ "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial4.qml"
71​ },
72​ {
73​ "instruction": qsTr("Exercise to test your understanding."),
jjazeixUnsubmitted
Done

this should be in Planegame.qml (in the pageComponent).
You should have a boolean at Planegame level (so activity), telling if you display or not the tutorial.
The visible property of the tutorial should be binded to this boolean.
In NumberOddEven.qml, you should set this boolean to true.

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…
74​ "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial5.qml"
75​ },
76​ {
77​ "instruction": qsTr("Exercise to test your understanding."),
78​ "instructionQml": "qrc:/gcompris/src/activities/numbers-odd-even/resource/Tutorial6.qml"
79​ }
80​
81​ ]
42} 82​}