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

List:       kde-commits
Subject:    [gcompris/devel2] src/activities/imageid: imageid, no more bonus on each sublevel, just the level ch
From:       Bruno Coudoin <bruno.coudoin () gcompris ! net>
Date:       2014-12-31 18:34:16
Message-ID: E1Y6O64-0001M6-5b () scm ! kde ! org
[Download RAW message or body]

Git commit e83aa8cdf2a84ac6dcbc5c5f82f3766019d3ec87 by Bruno Coudoin.
Committed on 19/12/2014 at 19:22.
Pushed by bcoudoin into branch 'devel2'.

imageid, no more bonus on each sublevel, just the level change

M  +2    -2    src/activities/imageid/Imageid.qml
M  +1    -2    src/activities/imageid/imageid.js

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

diff --git a/src/activities/imageid/Imageid.qml b/src/activities/imageid/Imageid.qml
index c4c4bdd..67b7785 100644
--- a/src/activities/imageid/Imageid.qml
+++ b/src/activities/imageid/Imageid.qml
@@ -178,7 +178,7 @@ ActivityBase {
 
                     textLabel: word
                     isCorrectAnswer: word === items.goodWord.translatedTxt
-                    onCorrectlyPressed: bonus.good("smiley");
+                    onCorrectlyPressed: Activity.nextSubLevel();
                 }
             }
         }
@@ -219,7 +219,7 @@ ActivityBase {
 
         Bonus {
             id: bonus
-            Component.onCompleted: win.connect(Activity.nextSubLevel)
+            onWin: Activity.nextLevel()
         }
         
         Score {
diff --git a/src/activities/imageid/imageid.js b/src/activities/imageid/imageid.js
index 2aaf409..e5d9138 100755
--- a/src/activities/imageid/imageid.js
+++ b/src/activities/imageid/imageid.js
@@ -113,8 +113,7 @@ function previousLevel() {
 
 function nextSubLevel() {
     if( ++currentSubLevel >= maxSubLevel) {
-        currentSubLevel = 0;
-        nextLevel();
+        items.bonus.good("smiley")
     } else {
         initSubLevel();
     }

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