[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [gcompris/devel2] src/activities/imageid: imageid, add an api entry for created a chpater selector
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2014-12-31 18:34:14
Message-ID: E1Y6O62-0001M6-Rn () scm ! kde ! org
[Download RAW message or body]

Git commit b1a9ec208fff3005b80ceed9c047a03829d78d5f by Bruno Coudoin.
Committed on 15/12/2014 at 20:37.
Pushed by bcoudoin into branch 'devel2'.

imageid, add an api entry for created a chpater selector

M  +1    -0    src/activities/imageid/Imageid.qml
M  +1    -0    src/activities/imageid/imageid.js
M  +14   -0    src/activities/imageid/lang_api.js
M  +2    -2    src/activities/imageid/resource/words.json

http://commits.kde.org/gcompris/b1a9ec208fff3005b80ceed9c047a03829d78d5f

diff --git a/src/activities/imageid/Imageid.qml b/src/activities/imageid/Imageid.qml
index 64fd8a8..0cb59e1 100644
--- a/src/activities/imageid/Imageid.qml
+++ b/src/activities/imageid/Imageid.qml
@@ -201,6 +201,7 @@ ActivityBase {
             id: repeatItem
             source: "qrc:/gcompris/src/core/resource/bar_repeat.svgz";
             sourceSize.width: 80 * ApplicationInfo.ratio
+            z: 12
             anchors {
                 top: parent.top
                 right: parent.right
diff --git a/src/activities/imageid/imageid.js b/src/activities/imageid/imageid.js
index ff6f126..0d577de 100755
--- a/src/activities/imageid/imageid.js
+++ b/src/activities/imageid/imageid.js
@@ -50,6 +50,7 @@ function start() {
     currentSubLevel = 0;
 
     dataset = Lang.load(items.parser, baseUrl + "words.json")
+    Lang.getChapterModel(dataset)
     lessons = Lang.getAllLessons(dataset)
     maxLevel = lessons.length
 
diff --git a/src/activities/imageid/lang_api.js b/src/activities/imageid/lang_api.js
index a562d0e..54c2d1d 100644
--- a/src/activities/imageid/lang_api.js
+++ b/src/activities/imageid/lang_api.js
@@ -60,6 +60,20 @@ function getChapter(dataset, chapter) {
     return dataset[chapter]
 }
 
+// Return a datamodel for the chapter suitable for creating a chapter selector
+function getChapterModel(dataset) {
+    var chapters = []
+    for (var c = 0; c < dataset.length; c++) {
+        console.log(dataset[c].content[0].content[0].image)
+        chapters.push(
+                    {'name': dataset[c].name,
+                     'image': dataset[c].content[0].content[0].image,
+                     'index': c
+                    })
+    }
+    return chapters
+}
+
 function getLesson(dataset, chapter, lesson) {
     return chapter.content[lesson]
 }
diff --git a/src/activities/imageid/resource/words.json b/src/activities/imageid/resource/words.json
index a4b4a16..4309387 100644
--- a/src/activities/imageid/resource/words.json
+++ b/src/activities/imageid/resource/words.json
@@ -4125,9 +4125,9 @@
         ]
     },
     {
-	"type": "chapter",
+        "type": "chapter",
         "name": "object",
-	"content": [
+        "content": [
             {
                 "type": "lesson",
                 "name": "construction",

[prev in list] [next in list] [prev in thread] [next in thread]