diff --git a/src/activities/memory-enumerate/resource/1/Data.qml b/src/activities/memory-enumerate/resource/1/Data.qml --- a/src/activities/memory-enumerate/resource/1/Data.qml +++ b/src/activities/memory-enumerate/resource/1/Data.qml @@ -29,33 +29,37 @@ property string url: "qrc:/gcompris/src/activities/memory-enumerate/resource/" property var texts: [ - ["", 0], ["", 1], ["", 2], + ["", 1], + ["", 2] ] property var images: [ - [url + 'math_0.svg', ''], [url + 'math_1.svg', ''], [url + 'math_2.svg', ''], + [url + 'math_1.svg', ''], + [url + 'math_2.svg', ''] ] property var sounds: [ ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0030.$CA")], + GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], + ["", + GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")] ] data: [ { // Level 1 - "columns": 1, + "columns": 2, "rows": 2, - "texts": texts.slice(0, 3), - "images": images.slice(0, 3), - "sounds": sounds.slice(0, 3) + "texts": texts.slice(0, 4), + "images": images.slice(0, 4), + "sounds": sounds.slice(0, 4) } ] } diff --git a/src/activities/memory-enumerate/resource/2/Data.qml b/src/activities/memory-enumerate/resource/2/Data.qml --- a/src/activities/memory-enumerate/resource/2/Data.qml +++ b/src/activities/memory-enumerate/resource/2/Data.qml @@ -29,26 +29,27 @@ property string url: "qrc:/gcompris/src/activities/memory-enumerate/resource/" property var texts: [ - ["", 0], ["", 1], ["", 2], + ["", 2], ["", 3] + ] property var images: [ - [url + 'math_0.svg', ''], [url + 'math_1.svg', ''], [url + 'math_2.svg', ''], + [url + 'math_2.svg', ''], [url + 'math_3.svg', ''] ] property var sounds: [ - ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0030.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], + ["", + GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0032.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0033.$CA")] ] diff --git a/src/activities/memory-enumerate/resource/3/Data.qml b/src/activities/memory-enumerate/resource/3/Data.qml --- a/src/activities/memory-enumerate/resource/3/Data.qml +++ b/src/activities/memory-enumerate/resource/3/Data.qml @@ -29,24 +29,20 @@ property string url: "qrc:/gcompris/src/activities/memory-enumerate/resource/" property var texts: [ - ["", 0], ["", 1], ["", 2], ["", 3], ["", 4] ] property var images: [ - [url + 'math_0.svg', ''], [url + 'math_1.svg', ''], [url + 'math_2.svg', ''], [url + 'math_3.svg', ''], [url + 'math_4.svg', ''] ] property var sounds: [ - ["", - GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0030.$CA")], ["", GCompris.ApplicationInfo.getAudioFilePath("voices-$CA/$LOCALE/alphabet/U0031.$CA")], ["", @@ -61,9 +57,9 @@ { // Level 1 "columns": 2, "rows": 2, - "texts": texts.slice(0, 5), - "images": images.slice(0, 5), - "sounds": sounds.slice(0, 5) + "texts": texts.slice(0, 4), + "images": images.slice(0, 4), + "sounds": sounds.slice(0, 4) } ] }