Commit ce388369 authored by Akshat Tandon's avatar Akshat Tandon Committed by Johnny Jazeix
Browse files

letter-in-word, rectified copyrights, made a few other rectifications

parent 9cb98470
/* GCompris - ActivityInfo.qml /* GCompris - ActivityInfo.qml
* *
* Copyright (C) 2015 Your Name <yy@zz.org> * Copyright (C) 2016 Akshat Tandon <akshat.tandon@research.iiit.ac.in>
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -23,11 +23,11 @@ ActivityInfo { ...@@ -23,11 +23,11 @@ ActivityInfo {
icon: "letter-in-word/letter-in-word.svg" icon: "letter-in-word/letter-in-word.svg"
author: "Akshat Tandon &lt;akshat.tandon@research.iiit.ac.ins&gt;" author: "Akshat Tandon &lt;akshat.tandon@research.iiit.ac.ins&gt;"
demo: true demo: true
title: qsTr("Letter in which Word ") title: qsTr("Letter in which word")
description: qsTr("A letter is written and/or spoken. Some words are displayed, the children must find the word or the words in which this letter appears.") description: qsTr("A letter is written and/or spoken. Some words are displayed, the children must find the word or the words in which this letter appears.")
//intro: "put here in comment the text for the intro voice" //intro: "put here in comment the text for the intro voice"
goal: qsTr("Select all the words which contain the spoken letter.") goal: qsTr("Select all the words which contain the spoken letter.")
prerequisite: qsTr("spellings,letter recognition") prerequisite: qsTr("spellings, letter recognition")
manual: "" manual: ""
credit: "" credit: ""
section: "reading" section: "reading"
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* 2016 Akshat Tandon * 2016 Akshat Tandon
* *
* Authors: * Authors:
* Holger Kaelberer <holger.k@elberer.de> (Qt Quick port) * Holger Kaelberer <holger.k@elberer.de> (Qt Quick port of click-on-letter)
* Akshat Tandon <akshat.tandon@research.iiit.ac.in> * Akshat Tandon <akshat.tandon@research.iiit.ac.in>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
...@@ -81,11 +81,11 @@ function loadLevels() ...@@ -81,11 +81,11 @@ function loadLevels()
var filename = GCompris.ApplicationInfo.getLocaleFilePath(url + "levels/levels-$LOCALE.json"); var filename = GCompris.ApplicationInfo.getLocaleFilePath(url + "levels/levels-$LOCALE.json");
levels = items.parser.parseFromUrl(filename); levels = items.parser.parseFromUrl(filename);
if (levels == null) { if (levels == null) {
console.warn("Click_on_letter: Invalid levels file " + filename); console.warn("Letter-in-word: Invalid levels file " + filename);
// fallback to default Latin (levels-en.json) file: // fallback to default Latin (levels-en.json) file:
levels = items.parser.parseFromUrl(defaultLevelsFile); levels = items.parser.parseFromUrl(defaultLevelsFile);
if (levels == null) { if (levels == null) {
console.error("Click_on_letter: Invalid default levels file " console.error("Letter-in-word: Invalid default levels file "
+ defaultLevelsFile + ". Can't continue!"); + defaultLevelsFile + ". Can't continue!");
// any way to error-exit here? // any way to error-exit here?
return; return;
...@@ -118,7 +118,7 @@ function initLevel() { ...@@ -118,7 +118,7 @@ function initLevel() {
level = levels[currentLevel]; level = levels[currentLevel];
maxSubLevel = level.questions.length; maxSubLevel = level.questions.length;
items.score.numberOfSubLevels = maxSubLevel; items.score.numberOfSubLevels = maxSubLevel;
items.score.currentSubLevel = "1"; items.score.currentSubLevel = 1;
questions = shuffleString(level.questions); questions = shuffleString(level.questions);
items.wordsModel.clear(); items.wordsModel.clear();
words = level.words.split(",") words = level.words.split(",")
...@@ -145,7 +145,6 @@ function initLevel() { ...@@ -145,7 +145,6 @@ function initLevel() {
if (GCompris.ApplicationSettings.isAudioVoicesEnabled && if (GCompris.ApplicationSettings.isAudioVoicesEnabled &&
GCompris.DownloadManager.haveLocalResource( GCompris.DownloadManager.haveLocalResource(
GCompris.DownloadManager.getVoicesResourceForLocale(locale))) { GCompris.DownloadManager.getVoicesResourceForLocale(locale))) {
items.audioVoices.append(GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/"+locale+"/misc/click_on_letter.$CA"));
items.audioVoices.silence(100) items.audioVoices.silence(100)
playLetter(currentLetter) playLetter(currentLetter)
items.repeatItem.visible = true items.repeatItem.visible = true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment