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

List:       kde-commits
Subject:    [gcompris/gsoc_pulkit_digital_electricity] src/activities/digital_electricity: digital_electricity,
From:       Johnny Jazeix <null () kde ! org>
Date:       2017-11-05 20:26:29
Message-ID: E1eBRUz-0003TU-Fm () code ! kde ! org
[Download RAW message or body]

Git commit b93e9fb2c88098caa909cca132ade9074873ddd8 by Johnny Jazeix.
Committed on 05/11/2017 at 20:01.
Pushed by jjazeix into branch 'gsoc_pulkit_digital_electricity'.

digital_electricity, hide toolbar when changing level, fix warning on IntroMessage \
sometimes display when starting the activity

M  +1    -0    src/activities/digital_electricity/DigitalElectricity.qml
M  +0    -1    src/activities/digital_electricity/DragListItem.qml
M  +4    -0    src/activities/digital_electricity/ListWidget.qml
M  +4    -26   src/activities/digital_electricity/digital_electricity.js

https://commits.kde.org/gcompris/b93e9fb2c88098caa909cca132ade9074873ddd8

diff --git a/src/activities/digital_electricity/DigitalElectricity.qml \
b/src/activities/digital_electricity/DigitalElectricity.qml index 1d8541da..670b8527 \
                100644
--- a/src/activities/digital_electricity/DigitalElectricity.qml
+++ b/src/activities/digital_electricity/DigitalElectricity.qml
@@ -100,6 +100,7 @@ ActivityBase {
 
         IntroMessage {
             id: tutorialInstruction
+            intro: []
             anchors {
                 top: background.vert ? parent.top : inputComponentsContainer.bottom
                 topMargin: 10
diff --git a/src/activities/digital_electricity/DragListItem.qml \
b/src/activities/digital_electricity/DragListItem.qml index b4cd696b..d6bc7213 100644
--- a/src/activities/digital_electricity/DragListItem.qml
+++ b/src/activities/digital_electricity/DragListItem.qml
@@ -120,7 +120,6 @@ Item {
 
                 onReleased: {
                     if (pressedOnce) {
-
                         pressedOnce = false
                         item.selected = false
                         var coord = playArea.mapFromItem(tileImage.parent, parent.x, \
                parent.y)
diff --git a/src/activities/digital_electricity/ListWidget.qml \
b/src/activities/digital_electricity/ListWidget.qml index 4da7d9b9..3b5e53a5 100644
--- a/src/activities/digital_electricity/ListWidget.qml
+++ b/src/activities/digital_electricity/ListWidget.qml
@@ -42,6 +42,10 @@ Item {
     property alias zoomInBtn: zoomInBtn
     property alias zoomOutBtn: zoomOutBtn
 
+    signal hideToolbar
+
+    onHideToolbar: toolButton.showToolBar = false
+
     ListModel {
         id: mymodel
     }
diff --git a/src/activities/digital_electricity/digital_electricity.js \
b/src/activities/digital_electricity/digital_electricity.js index 0f9a02dc..cb746d86 \
                100644
--- a/src/activities/digital_electricity/digital_electricity.js
+++ b/src/activities/digital_electricity/digital_electricity.js
@@ -60,7 +60,6 @@ var viewPort = {
 }
 
 function start(items_) {
-
     items = items_
     currentLevel = 1
     numberOfLevel = items.tutorialDataset.tutorialLevels.length
@@ -68,7 +67,6 @@ function start(items_) {
 }
 
 function stop() {
-
     for(var i = 0 ; i < components.length ; ++i) {
         var j
         for(j = 0 ; j < deletedIndex.length ; ++j) {
@@ -81,7 +79,6 @@ function stop() {
 }
 
 function initLevel() {
-
     items.bar.level = currentLevel
     var sizeMultiplier = 1 + (1 / (1.5 * currentLevel))
 
@@ -97,6 +94,7 @@ function initLevel() {
     toolDeleteSticky = false
     deselect()
     updateToolTip("")
+    items.availablePieces.hideToolbar()
 
     currentZoom = defaultZoom
     items.availablePieces.zoomInBtn.state = "cannotZoomIn"
@@ -178,10 +176,6 @@ function loadFreeMode(sizeMultiplier) {
     }
 }
 
-function isTutorialMode() {
-    return items.isTutorialMode
-}
-
 function checkAnswer() {
     if (processingAnswer)
         return
@@ -383,9 +377,7 @@ function updateComponentDimension(zoomRatio) {
 }
 
 function move(_direction) {
-    var x, y
-    x = 0
-    y = 0
+    var x = 0, y = 0
     if (_direction == direction.RIGHT) {
         x = 0.1
     } else if (_direction == direction.LEFT) {
@@ -398,7 +390,7 @@ function move(_direction) {
 
     if (x == 0.1) {
         var viewPortRightEdge = Math.round(((viewPort.leftEdge + 0.1) + (1 / \
                currentZoom)) * 100) / 100
-        if ( viewPortRightEdge > viewPort.rightExtreme) {
+        if (viewPortRightEdge > viewPort.rightExtreme) {
             return
         } else {
             viewPort.leftEdge = Math.round((viewPort.leftEdge + 0.1) * 100) / 100
@@ -433,15 +425,13 @@ function move(_direction) {
 }
 
 function nextLevel() {
-
-    if(numberOfLevel < ++currentLevel ) {
+    if(numberOfLevel < ++currentLevel) {
         currentLevel = 1
     }
     reset();
 }
 
 function previousLevel() {
-
     if(--currentLevel < 1) {
         currentLevel = numberOfLevel
     }
@@ -449,8 +439,6 @@ function previousLevel() {
 }
 
 function reset() {
-
-    deselect()
     stop()
     items.availablePieces.model.clear()
     initLevel()
@@ -458,7 +446,6 @@ function reset() {
 
 // Creates component from ListWidget to the drawing board area
 function createComponent(x, y, componentIndex) {
-
     x = x / items.playArea.width
     y = y / items.playArea.height
 
@@ -499,7 +486,6 @@ function createComponent(x, y, componentIndex) {
  * to make sure that an input is connected by only 1 wire.
 */
 function terminalPointSelected(terminal) {
-
     if(selectedTerminal == -1 || selectedTerminal == terminal)
         selectedTerminal = terminal
     else if((selectedTerminal.type != terminal.type) && (selectedTerminal.parent != \
terminal.parent)) { @@ -546,7 +532,6 @@ function updateComponent(index) {
  * an object is rotated.
 */
 function updateWires(index) {
-
     var component = components[index]
     if(component == undefined || component.noOfInputs == undefined || \
component.noOfOutputs == undefined)  return
@@ -604,7 +589,6 @@ function updateWires(index) {
 }
 
 function deselect() {
-
     if(toolDeleteSticky == false) {
         toolDelete = false
         items.availablePieces.toolDelete.state = "notSelected"
@@ -625,7 +609,6 @@ function deselect() {
 }
 
 function removeComponent(index) {
-
     var component = components[index]
     for(var i = 0 ; i < component.noOfInputs ; ++i) {
         var terminal = component.inputTerminals.itemAt(i)
@@ -644,7 +627,6 @@ function removeComponent(index) {
 }
 
 function removeWire(wire) {
-
     var inTerminal = wire.to
     var outTerminal = wire.from
 
@@ -661,7 +643,6 @@ function removeWire(wire) {
 }
 
 function componentSelected(index) {
-
     selectedIndex = index
     items.availablePieces.rotateLeft.state = "canBeSelected"
     items.availablePieces.rotateRight.state = "canBeSelected"
@@ -669,19 +650,16 @@ function componentSelected(index) {
 }
 
 function rotateLeft() {
-
     components[selectedIndex].rotationAngle = -2
     components[selectedIndex].rotateComponent.start()
 }
 
 function rotateRight() {
-
     components[selectedIndex].rotationAngle = 2
     components[selectedIndex].rotateComponent.start()
 }
 
 function displayInfo() {
-
     var component = components[selectedIndex]
     var componentTruthTable = component.truthTable
     deselect()


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