diff --git a/src/activities/babymatch/DragListItem.qml b/src/activities/babymatch/DragListItem.qml index 7f0edeba4..14a6526e6 100644 --- a/src/activities/babymatch/DragListItem.qml +++ b/src/activities/babymatch/DragListItem.qml @@ -1,286 +1,286 @@ /* gcompris - DragListItem.qml * * Copyright (C) 2015 Pulkit Gupta * * Authors: * Pulkit Gupta * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import QtGraphicalEffects 1.0 import GCompris 1.0 import "babymatch.js" as Activity Item { id: item width: tile.width height: tile.height property string source: imgName property double heightInColumn property double widthInColumn property double tileWidth property double tileHeight property QtObject answer: tileImage.parent property bool selected: false property alias dropStatus: tileImage.dropStatus signal pressed ParallelAnimation { id: tileImageAnimation NumberAnimation { target: tileImage easing.type: Easing.OutQuad property: "x" to: tileImage.moveImageX duration: 430 } NumberAnimation { target: tileImage easing.type: Easing.OutQuad property: "y" to: tileImage.moveImageY duration: 430 } onStarted: { tileImage.anchors.centerIn = undefined view.showGlow = false } onStopped: { tileImage.parent = tileImage.tileImageParent tileImage.anchors.centerIn = tileImage.currentTargetSpot == null ? tileImage.parent : tileImage.currentTargetSpot updateOkButton() } } Rectangle { id: tile width: tileWidth height: tileHeight color: (parent.selected && tileImage.parent == tile) ? "#33FF294D" : "transparent" border.color: (parent.selected && tileImage.parent == tile) ? "white" : "transparent" border.width: 3 radius: 2 property double xCenter: tile.x + tile.width / 2 property double yCenter: tile.y + tile.height / 2 Image { id: tileImage anchors.centerIn: parent width: smallWidth height: smallHeight fillMode: Image.PreserveAspectFit source: Activity.imagesUrl + imgName property double smallWidth: Activity.glowEnabled ? widthInColumn * 1.1 : widthInColumn property double smallHeight: Activity.glowEnabled ? heightInColumn * 1.1 : heightInColumn property double fullWidth: imgWidth ? imgWidth * backgroundImage.width : (backgroundImage.source == "" ? tileImage.sourceSize.width : backgroundImage.width * tileImage.sourceSize.width/backgroundImage.sourceSize.width) property double fullHeight: imgHeight ? imgHeight * backgroundImage.height : (backgroundImage.source == "" ? tileImage.sourceSize.height : backgroundImage.height * tileImage.sourceSize.height/backgroundImage.sourceSize.height) property QtObject tileImageParent property double moveImageX property double moveImageY property int dropStatus: -1 // -1: Nothing / 0: Bad pos / 1: Good pos property bool small: true property Item currentTargetSpot property bool pressedOnce property bool parentIsTile : parent == tile ? true : false onFullWidthChanged: correctDroppedImageSize() onFullHeightChanged: correctDroppedImageSize() function correctDroppedImageSize() { if(tileImage.dropStatus == 0 || tileImage.dropStatus == 1) { tileImage.width = tileImage.fullWidth tileImage.height = tileImage.fullHeight } } function imageRemove() { dropStatus = -1 if(backgroundImage.source == "") leftWidget.z = 1 var coord = tileImage.parent.mapFromItem(tile, tile.xCenter - tileImage.width/2, tile.yCenter - tileImage.height/2) tileImage.moveImageX = coord.x tileImage.moveImageY = coord.y tileImage.currentTargetSpot = null tileImage.tileImageParent = tile toSmall() tileImageAnimation.start() } function toSmall() { width = smallWidth height = smallHeight small = true } function toFull() { width = fullWidth height = fullHeight small = false } MultiPointTouchArea { id: mouseArea touchPoints: [ TouchPoint { id: point1 } ] property real startX property real startY anchors.fill: parent onPressed: { Activity.hideInstructions() item.pressed() tileImage.toSmall() tileImage.anchors.centerIn = undefined tileImage.dropStatus = -1 item.hideOkButton() startX = point1.x startY = point1.y toolTip.show(toolTipText) if(tileImage.parent == tile) leftWidget.z = 3 else leftWidget.z = 1 if(tileImage.currentTargetSpot) { tileImage.currentTargetSpot.currentTileImageItem = null tileImage.currentTargetSpot = null } if(imgSound) - activity.audioEffects.play(ApplicationInfo.getAudioFilePath(imgSound)) + activity.audioVoices.play(ApplicationInfo.getAudioFilePath(imgSound)) tileImage.pressedOnce = true } onUpdated: { var moveX = point1.x - startX var moveY = point1.y - startY parent.x = parent.x + moveX parent.y = parent.y + moveY tileImage.opacity = 1 Activity.highLightSpot(getClosestSpot(), tileImage) } onReleased: { if (tileImage.pressedOnce) { tileImage.opacity = 1 tileImage.pressedOnce = false Activity.highLightSpot(null, tileImage) var closestSpot = getClosestSpot() updateFoundStatus(closestSpot) if(closestSpot === null) { if(tileImage.currentTargetSpot) tileImage.currentTargetSpot.imageRemove() else tileImage.imageRemove() } else { if(tileImage.currentTargetSpot !== closestSpot) { closestSpot.imageRemove() closestSpot.imageAdd(tileImage) } tileImage.currentTargetSpot = closestSpot tileImage.tileImageParent = backgroundImage tileImage.toFull() var coord = tileImage.parent.mapFromItem(backgroundImage, closestSpot.xCenter - tileImage.fullWidth/2, closestSpot.yCenter - tileImage.fullHeight/2) tileImage.moveImageX = coord.x tileImage.moveImageY = coord.y tileImage.z = 100 tileImageAnimation.start() } } } function getClosestSpot() { var coordImg = tileImage.parent.mapToItem(backgroundImage, tileImage.x + tileImage.width/2, tileImage.y + tileImage.height/2) return Activity.getClosestSpot(coordImg.x, coordImg.y) } function updateFoundStatus(closestSpot) { if(!closestSpot) { tileImage.dropStatus = -1 return } if(closestSpot.imgName === imgName) tileImage.dropStatus = 1 else tileImage.dropStatus = 0 } } Image { id: wrongAnswer anchors.centerIn: parent height: heightInColumn * 0.3 width: widthInColumn * 0.3 fillMode: Image.PreserveAspectFit z: 10 source:"qrc:/gcompris/src/activities/babymatch/resource/error.svg" visible: view.showGlow && tileImage.dropStatus === 0 } } Glow { id: tileImageGlow parent: tileImage.parent anchors.fill: tileImage radius: tileImage.dropStatus === 0 ? 9 : 0.7 samples: tileImage.dropStatus === 0 ? 18 : 2 color: view.showGlow && Activity.glowEnabled ? (tileImage.dropStatus === 0 ? "red" : "black") : 'transparent' source: tileImage spread: tileImage.dropStatus === 0 ? 0.95 : 1 opacity: tileImage.opacity } } function hideOkButton() { if(view.okShowed) { hideOk.start() view.okShowed = false view.showGlow = false } } function updateOkButton() { if(view.areAllPlaced()) { showOk.start() } if(!view.okShowed && tileImage.dropStatus >= 0) view.checkDisplayedGroup() if(!view.okShowed && tileImage.dropStatus == -1) { view.displayedGroup[parseInt(index/view.nbItemsByGroup)] = true view.setPreviousNavigation() view.setNextNavigation() view.checkDisplayedGroup() } } }