Differential D7231 Diff 18610 src/activities/penalty/Penalty.qml

Changeset View

Standalone View

src/activities/penalty/Penalty.qml

Context not available.
45	activity.stop.connect(stop)	45		activity.stop.connect(stop)
46	}	46		}
47		47
		48		//To enable tapping/clicking on left side of goal
		49		Rectangle{
			jjazeixUnsubmitted Not Done coding convention, space between () and { (needs to be updated not only there) put comment above the function, the name should be more explicit on what the function does jjazeix: coding convention, space between () and { (needs to be updated not only there) put comment…
		50		id: maleft
		51		//anchors.fill: parent.left
		52		width: 475
		53		height: 300
		54		x: 100
		55		y: 50
		56		color: "transparent"
		57
		58		MouseArea {
		59		anchors.fill: parent
		60		acceptedButtons: Qt.LeftButton \| Qt.RightButton \| Qt.MidButton
		61		onClicked: {
		62		instruction.text = ""
			jjazeixUnsubmitted Not Done coding rule. You already initialize it to TOP, just check for "RIGHT" and don't have a default else jjazeix: coding rule. You already initialize it to TOP, just check for "RIGHT" and don't have a default…
		63
		64		if(ball.state === "FAIL") {
		65		Activity.resetLevel()
		66		return
		67		}
		68
		69		/* This is a shoot */
		70		var progress = progressTop
		71		if (mouse.button == Qt.LeftButton \| mouse.button == Qt.RightButton \| mouse.button == Qt.MidButton) {
			jjazeixUnsubmitted Not Done the code should be factorised, it's the same as above and below. Copy/paste are bad. jjazeix: the code should be factorised, it's the same as above and below. Copy/paste are bad.
		72		progress = progressLeft
		73		}
		74
		75		if(progress.ratio > 0) {
		76		/* Second click, stop animation */
		77		progress.anim.running = false;
		78
		79		/* Play sound */
		80		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav")
		81
		82		/* Success or not */
		83		if(progress.ratio < 100) {
		84		/* Success */
		85		ball.state = "LEFT"
		86		} else {
		87		/* failure */
		88		ball.state = "FAIL"
		89		}
		90		timerBonus.start()
		91		} else {
		92		/* First click, start animation*/
		93		progress.anim.running = true;
		94
		95		/* Play sound */
		96		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/flip.wav")
		97		}
			jjazeixUnsubmitted Not Done harcoded values? jjazeix: harcoded values?
		98		}
		99		}
		100		}
		101
		102		//To enable tapping/clicking on top of goal
			jjazeixUnsubmitted Not Done where does this value comes from? Is it the same on every screen resolutions or should it be relative to it? jjazeix: where does this value comes from? Is it the same on every screen resolutions or should it be…
		103		Rectangle{
		104		id: matop
		105		width: 600
		106		height: 175
		107		x: 575
		108		y: 50
		109		color: "transparent"
		110
		111		MouseArea {
			jjazeixUnsubmitted Not Done is it necessary to check this and the button list below? The only accepted buttons are these 3 so I don't think it's necessary and the mouse.button should always exist. jjazeix: is it necessary to check this and the button list below? The only accepted buttons are these 3…
		112		anchors.fill: parent
		113		acceptedButtons: Qt.LeftButton \| Qt.RightButton \| Qt.MidButton
			jjazeixUnsubmitted Not Done do you need to store it in local or can't you directly pass it to the function and store it in ball.state? jjazeix: do you need to store it in local or can't you directly pass it to the function and store it in…
		114		onClicked: {
		115		instruction.text = ""
		116
		117		if(ball.state === "FAIL") {
		118		Activity.resetLevel()
		119		return
		120		}
		121
		122		/* This is a shoot */
		123		var progress = progressTop
		124		if (mouse.button == Qt.LeftButton \| mouse.button == Qt.RightButton \| mouse.button == Qt.MidButton) {
		125
		126		}
		127
		128		if(progress.ratio > 0) {
		129		/* Second click, stop animation */
		130		progress.anim.running = false;
		131
		132		/* Play sound */
		133		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav")
		134
		135		/* Success or not */
		136		if(progress.ratio < 100) {
		137		/* Success */
		138		ball.state = "CENTER"
		139		} else {
		140		/* failure */
		141		ball.state = "FAIL"
		142		}
		143		timerBonus.start()
		144		} else {
		145		/* First click, start animation*/
		146		progress.anim.running = true;
		147
		148		/* Play sound */
		149		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/flip.wav")
		150		}
		151		}
		152		}
		153		}
		154
		155		//To enable tapping/clicking on right side of goal
		156		Rectangle{
		157		id: maright
		158		//anchors.fill: parent.right
		159		width: 475
		160		height: 300
		161		x: 800
		162		y: 50
		163		color: "transparent"
		164
		165		MouseArea {
		166		anchors.fill: parent
		167		acceptedButtons: Qt.LeftButton \| Qt.RightButton \| Qt.MidButton
		168		onClicked: {
		169		instruction.text = ""
		170
		171		if(ball.state === "FAIL") {
		172		Activity.resetLevel()
		173		return
		174		}
		175
		176		/* This is a shoot */
		177		var progress = progressTop
		178		if (mouse.button == Qt.LeftButton \| mouse.button == Qt.RightButton \| mouse.button == Qt.MidButton) {
		179		progress = progressRight
		180		}
		181
		182		if(progress.ratio > 0) {
		183		/* Second click, stop animation */
		184		progress.anim.running = false;
		185
		186		/* Play sound */
		187		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav")
		188
		189		/* Success or not */
		190		if(progress.ratio < 100) {
		191		/* Success */
		192		ball.state = "RIGHT"
		193		} else {
		194		/* failure */
			jjazeixUnsubmitted Not Done is it still useful (I haven't read the full code but it seems to be the previous MouseArea for the whole screen)? jjazeix: is it still useful (I haven't read the full code but it seems to be the previous MouseArea for…
		195		ball.state = "FAIL"
		196		}
		197		timerBonus.start()
		198		} else {
		199		/* First click, start animation*/
		200		progress.anim.running = true;
		201
		202		/* Play sound */
		203		activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/flip.wav")
		204		}
		205		}
		206		}
		207		}
		208
48	// Add here the QML items you need to access in javascript	209		// Add here the QML items you need to access in javascript
49	QtObject {	210		QtObject {
50	id: items	211		id: items
Context not available.
275	}	436		}
276	PropertyChanges {	437		PropertyChanges {
277	target: instruction	438		target: instruction
278	text: qsTr("Double click or double tap on the ball to kick it.")	439		text: qsTr("Double click or double tap on the side of the goal you want to put the ball in.")
279	}	440		}
280	},	441		},
281	State {	442		State {
Context not available.
283	PropertyChanges {	444		PropertyChanges {
284	target: ball;	445		target: ball;
285	sourceSize.width: 75 * ApplicationInfo.ratio	446		sourceSize.width: 75 * ApplicationInfo.ratio
286	x: background.width * 0.8;	447		x: background.width * (Math.random() * (0.8 - 0.6) + 0.6);
			jjazeixUnsubmitted Done I guess we can keep the previous final positions, no need to add random jjazeix: I guess we can keep the previous final positions, no need to add random
287	y: background.height * 0.3	448		y: background.height * (Math.random() * (0.4 - 0.1) + 0.1)
288	}	449		}
289	},	450		},
290	State {	451		State {
Context not available.
292	PropertyChanges {	453		PropertyChanges {
293	target: ball;	454		target: ball;
294	sourceSize.width: 75 * ApplicationInfo.ratio	455		sourceSize.width: 75 * ApplicationInfo.ratio
295	x: background.width * 0.2;	456		x: background.width * (Math.random() * (0.4 - 0.1) + 0.1);
296	y: background.height * 0.3	457		y: background.height * (Math.random() * (0.4 - 0.1) + 0.1)
297	}	458		}
298	},	459		},
299	State {	460		State {
Context not available.
320	}	481		}
321	]	482		]
322		483
323	MouseArea {	484		MouseArea{
324	anchors.fill: parent	485		anchors.fill: parent
325	acceptedButtons: Qt.LeftButton \| Qt.RightButton \| Qt.MidButton	486		acceptedButtons: Qt.LeftButton \| Qt.RightButton \| Qt.MidButton
326	onClicked: {	487		onClicked:{
327	instruction.text = ""	488		ball.state = "INITIAL"
328		489		progressRight.ratio = 0
329	if(ball.state === "FAIL") {	490		progressLeft.ratio = 0
330	Activity.resetLevel()	491		progressTop.ratio = 0
331	return
332	}
333
334	/* This is a shoot */
335	var progress = progressTop
336	if (mouse.button == Qt.LeftButton) {
337	progress = progressLeft
338	} else if (mouse.button == Qt.RightButton) {
339	progress = progressRight
340	} else if (mouse.button == Qt.MidButton) {
341	progress = progressTop
342	}
343
344	if(progress.ratio > 0) {
345	/* Second click, stop animation */
346	progress.anim.running = false;
347
348	/* Play sound */
349	activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/brick.wav")
350
351	/* Success or not */
352	if(progress.ratio < 100) {
353	/* Success */
354	if(progress === progressLeft) {
355	ball.state = "LEFT"
356	} else if(progress === progressRight) {
357	ball.state = "RIGHT"
358	} else {
359	ball.state = "CENTER"
360	}
361	} else {
362	/* failure */
363	ball.state = "FAIL"
364	}
365	timerBonus.start()
366	} else {
367	/* First click, start animation*/
368	progress.anim.running = true;
369
370	/* Play sound */
371	activity.audioEffects.play("qrc:/gcompris/src/core/resource/sounds/flip.wav")
372	}
373	}	492		}
374	}	493		}
375	}	494		}
Context not available.