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

letter-in-word, added spacing between clouds.

parent fcf7fe77
...@@ -27,7 +27,7 @@ import "letter-in-word.js" as Activity ...@@ -27,7 +27,7 @@ import "letter-in-word.js" as Activity
Item { Item {
id: cardItem id: cardItem
width: cardImage.width //width: cardImage.width
height: wordPic.height + cardImage.height - 30 * ApplicationInfo.ratio height: wordPic.height + cardImage.height - 30 * ApplicationInfo.ratio
Image{ Image{
...@@ -37,6 +37,7 @@ Item { ...@@ -37,6 +37,7 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: imgurl source: imgurl
z:5 z:5
//visible: index % 2 != 0 ? false : true
} }
...@@ -48,6 +49,7 @@ Item { ...@@ -48,6 +49,7 @@ Item {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: Activity.url + "images/cloud.svg" source: Activity.url + "images/cloud.svg"
z: (state == 'scaled') ? 1 : -1 z: (state == 'scaled') ? 1 : -1
//visible: index % 2 != 0 ? false : true
Row{ Row{
anchors.verticalCenter: cardImage.verticalCenter anchors.verticalCenter: cardImage.verticalCenter
......
...@@ -264,9 +264,9 @@ ActivityBase { ...@@ -264,9 +264,9 @@ ActivityBase {
anchors.topMargin: 10 * ApplicationInfo.ratio anchors.topMargin: 10 * ApplicationInfo.ratio
anchors.leftMargin: 5 * ApplicationInfo.ratio anchors.leftMargin: 5 * ApplicationInfo.ratio
anchors.rightMargin: 5 * ApplicationInfo.ratio anchors.rightMargin: 5 * ApplicationInfo.ratio
anchors.bottomMargin: 5 * ApplicationInfo.ratio anchors.bottomMargin: 10 * ApplicationInfo.ratio
cellWidth: itemWidth cellWidth: itemWidth + 43*ApplicationInfo.ratio
cellHeight: itemHeight cellHeight: itemHeight + 15*ApplicationInfo.ratio
clip: false clip: false
interactive: false interactive: false
//verticalLayoutDirection: GridView.BottomToTop //verticalLayoutDirection: GridView.BottomToTop
......
...@@ -69,7 +69,7 @@ function loadDataset() ...@@ -69,7 +69,7 @@ function loadDataset()
dataset = Lang.load(items.parser, resourceUrl, dataset = Lang.load(items.parser, resourceUrl,
GCompris.ApplicationSettings.wordset ? "words.json" : "words_sample.json", GCompris.ApplicationSettings.wordset ? "words.json" : "words_sample.json",
"content-"+ locale +".json") "content-fr.json")//+ locale +".json")
// If dataset is empty, we try to load from short locale // If dataset is empty, we try to load from short locale
// and if not present again, we switch to default one // and if not present again, we switch to default one
var localeUnderscoreIndex = locale.indexOf('_') var localeUnderscoreIndex = locale.indexOf('_')
...@@ -122,7 +122,7 @@ function initLevel() { ...@@ -122,7 +122,7 @@ function initLevel() {
level = levels[currentLevel]; level = levels[currentLevel];
words = Lang.getLessonWords(dataset, level); words = Lang.getLessonWords(dataset, level);
Core.shuffle(words); Core.shuffle(words);
var limit = Math.min(13, words.length) var limit = Math.min(11, words.length)
words = words.slice(0,limit) words = words.slice(0,limit)
frequency = calculateFrequency(); frequency = calculateFrequency();
var tempQuestions = generateQuestions(); var tempQuestions = generateQuestions();
......
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