diff --git a/src/activities/letter-in-word/Card.qml b/src/activities/letter-in-word/Card.qml index 339126dc6..7e662ed17 100644 --- a/src/activities/letter-in-word/Card.qml +++ b/src/activities/letter-in-word/Card.qml @@ -1,188 +1,185 @@ /* GCompris - Card.qml * * Copyright (C) 2016 Akshat Tandon * * Authors: * Akshat Tandon * * 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.1 import GCompris 1.0 import QtGraphicalEffects 1.0 import "../../core" import "letter-in-word.js" as Activity Item { id: cardItem //width: cardImage.width height: wordPic.height + cardImage.height - 30 * ApplicationInfo.ratio property bool mouseActive: true Image{ id: wordPic sourceSize.width: cardItem.width -6 sourceSize.height: cardItem.width -5 fillMode: Image.PreserveAspectFit source: imgurl z:-5 //visible: index % 2 != 0 ? false : true } - Image { id: cardImage anchors.top:wordPic.bottom anchors.topMargin: -30 * ApplicationInfo.ratio sourceSize.width: cardItem.width - 10 fillMode: Image.PreserveAspectFit source: Activity.resUrl2 + "cloud.svg" z: (state == 'scaled') ? 1 : -1 //visible: index % 2 != 0 ? false : true Row { anchors.verticalCenter: cardImage.verticalCenter anchors.horizontalCenter: cardImage.horizontalCenter Repeater { model: components GCText { id: textbox z: 11 text: textdata font.pointSize: NaN // need to clear font.pointSize explicitly font.pixelSize: spelling.length > 5 ? (spelling.length > 7 ? cardImage.width * 0.19 : cardImage.width * 0.25): cardImage.width * 0.30 font.bold: true style: Text.Outline styleColor: "#2a2a2a" color: selected && textdata.length == 1 && textdata == Activity.currentLetter ? "green" : "white" } - } - } ParticleSystemStarLoader { id: particle clip: false } states: State { name: "scaled"; when: mouseArea.containsMouse && mouseActive PropertyChanges { target: cardItem scale: /*carriageImage.scale * */ 1.2 z: 2 } } transitions: Transition { NumberAnimation { properties: "scale"; easing.type: Easing.OutCubic } } SequentialAnimation { id: successAnimation running: selected loops: Animation.Infinite NumberAnimation { target: cardImage easing.type: Easing.InOutQuad property: "rotation" to: 20; duration: 500 } NumberAnimation { target: cardImage easing.type: Easing.InOutQuad property: "rotation"; to: -20 duration: 500 } } SequentialAnimation { id: failureAnimation NumberAnimation { target: colorCardImage property: "opacity" to: 1; duration: 400 } NumberAnimation { target: colorCardImage property: "opacity" to: 0; duration: 200 } } NumberAnimation { id: rotationStop running: !selected target: cardImage property: "rotation" to: 0 duration: 500 easing.type: Easing.InOutQuad } } Colorize { id: colorCardImage z: 5 anchors.fill: cardImage source: cardImage hue: 0.0 saturation: 1 opacity: 0 } MouseArea { id: mouseArea anchors.fill: parent hoverEnabled: ApplicationInfo.isMobile ? false : true onClicked: { - if(mouseActive){ - if (Activity.checkWord(index)) { - successAnimation.restart(); - particle.burst(30) - components.clear(); - var tempword; - var j = 0; - for(var i = 0; i < spelling.length; i++) { - if(spelling.charAt(i) == Activity.currentLetter) { - tempword = spelling.substring(j, i); - if(i != j) { - components.append({"textdata": tempword}) - } - components.append({"textdata": Activity.currentLetter}); - - j = i + 1; + select(); + } + } + + function select() { + if(mouseActive && !successAnimation.running) { + if (Activity.checkWord(index)) { + successAnimation.restart(); + particle.burst(30) + components.clear(); + var tempword; + var j = 0; + for(var i = 0; i < spelling.length; i++) { + if(spelling.charAt(i) == Activity.currentLetter) { + tempword = spelling.substring(j, i); + if(i != j) { + components.append({"textdata": tempword}) } - } - if(j < spelling.length) { - tempword = spelling.substring(j, spelling.length); - components.append({"textdata": tempword}) + components.append({"textdata": Activity.currentLetter}); + j = i + 1; } - - } else { - failureAnimation.restart() } + if(j < spelling.length) { + tempword = spelling.substring(j, spelling.length); + components.append({"textdata": tempword}) + } + } + else { + failureAnimation.restart() } } } - - - } diff --git a/src/activities/letter-in-word/LetterInWord.qml b/src/activities/letter-in-word/LetterInWord.qml index 075cdd974..370b62a9b 100644 --- a/src/activities/letter-in-word/LetterInWord.qml +++ b/src/activities/letter-in-word/LetterInWord.qml @@ -1,300 +1,325 @@ /* GCompris - LetterInWord.qml * * Copyright (C) 2014 Holger Kaelberer * 2016 Akshat Tandon * * Authors: * Holger Kaelberer (Click on Letter - Qt Quick port) * Akshat Tandon (Modifications to Click on Letter code * to make Letter in which word activity) * * 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.1 import QtGraphicalEffects 1.0 import GCompris 1.0 import "../../core" import "letter-in-word.js" as Activity import "qrc:/gcompris/src/core/core.js" as Core ActivityBase { id: activity focus: true onStart: focus = true pageComponent: Image { id: background source: Activity.resUrl + "hillside.svg" sourceSize.width: parent.width fillMode: Image.PreserveAspectCrop focus: true // system locale by default property string locale: "system" + property bool keyboardMode: false + signal start signal stop signal voiceError Component.onCompleted: { dialogActivityConfig.getInitialConfiguration() activity.start.connect(start) activity.stop.connect(stop) } QtObject { id: items property Item main: activity.main property alias bar: bar property alias wordsModel: wordsModel property GCAudio audioVoices: activity.audioVoices property alias parser: parser property alias animateX: animateX property alias repeatItem: repeatItem property alias score: score property alias bonus: bonus property alias locale: background.locale property string question } - - onStart: { activity.audioVoices.error.connect(voiceError) Activity.start(items); } onStop: Activity.stop() DialogActivityConfig { id: dialogActivityConfig currentActivity: activity content: Component { Item { property alias localeBox: localeBox height: column.height property alias availableLangs: langs.languages LanguageList { id: langs } Column { id: column spacing: 10 width: parent.width Flow { spacing: 5 width: dialogActivityConfig.width GCComboBox { id: localeBox model: langs.languages background: dialogActivityConfig label: qsTr("Select your locale") } } } } } onClose: home() onLoadData: { if(dataToSave && dataToSave["locale"]) { background.locale = dataToSave["locale"]; } } onSaveData: { var oldLocale = background.locale; var newLocale = dialogActivityConfig.configItem.availableLangs[dialogActivityConfig.loader.item.localeBox.currentIndex].locale; // Remove .UTF-8 if(newLocale.indexOf('.') != -1) { newLocale = newLocale.substring(0, newLocale.indexOf('.')) } dataToSave = {"locale": newLocale } background.locale = newLocale; // Restart the activity with new information if(oldLocale !== newLocale) { background.stop(); background.start(); } } function setDefaultValues() { var localeUtf8 = background.locale; if(background.locale != "system") { localeUtf8 += ".UTF-8"; } for(var i = 0 ; i < dialogActivityConfig.configItem.availableLangs.length ; i ++) { if(dialogActivityConfig.configItem.availableLangs[i].locale === localeUtf8) { dialogActivityConfig.loader.item.localeBox.currentIndex = i; break; } } } } DialogHelp { id: dialogHelpLeftRight onClose: home() } Bar { id: bar content: BarEnumContent { value: help | home | level | config } onHelpClicked: { displayDialog(dialogHelpLeftRight) } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHomeClicked: home() onConfigClicked: { dialogActivityConfig.active = true dialogActivityConfig.setDefaultValues() displayDialog(dialogActivityConfig) } } Score { id: score anchors.top: parent.top anchors.topMargin: 10 * ApplicationInfo.ratio anchors.left: parent.left anchors.leftMargin: 10 * ApplicationInfo.ratio anchors.bottom: undefined anchors.right: undefined } Bonus { id: bonus interval: 100 Component.onCompleted: { win.connect(Activity.nextSubLevel); loose.connect(Activity.incorrectSelection); } } Item { id: planeText width: plane.width height: plane.height - x: - width + x: -width anchors.top: parent.top anchors.topMargin: 5 * ApplicationInfo.ratio Image { id: plane width: itemWidth*3.5 height: itemHeight anchors.centerIn: planeText anchors.top: parent.top source: Activity.resUrl + "plane.svg" sourceSize.height: 90 * ApplicationInfo.ratio } GCText { id: questionItem anchors.right: planeText.right anchors.rightMargin: 2 * plane.width / 3 anchors.verticalCenter: planeText.verticalCenter anchors.bottomMargin: 10 * ApplicationInfo.ratio fontSize: hugeSize font.weight: Font.DemiBold color: "#2a2a2a" text: items.question } PropertyAnimation { id: animateX target: planeText properties: "x" from: - planeText.width //to:background.width/2 - planeText.width/2 to: bar.level <= 2 ? background.width/3.7 : background.width duration: bar.level <= 2 ? 5500: 11000 //easing.type: Easing.OutQuad easing.type: bar.level <= 2 ? Easing.OutQuad: Easing.OutInCirc } } BarButton { id: repeatItem - source: "qrc:/gcompris/src/core/resource/bar_repeat.svg"; + source: "qrc:/gcompris/src/core/resource/bar_repeat.svg" sourceSize.width: 80 * ApplicationInfo.ratio anchors { top: parent.top right: parent.right margins: 10 } onClicked:{ Activity.playLetter(Activity.currentLetter); animateX.restart(); } } + Keys.onPressed: { + if(event.key === Qt.Key_Space) { + wordsView.currentItem.select() + } + } + Keys.onReleased: { + keyboardMode = true + event.accepted = false + } + Keys.onEnterPressed: wordsView.currentItem.select(); + Keys.onReturnPressed: wordsView.currentItem.select(); + Keys.onRightPressed: wordsView.moveCurrentIndexRight(); + Keys.onLeftPressed: wordsView.moveCurrentIndexLeft(); + Keys.onDownPressed: wordsView.moveCurrentIndexDown(); + Keys.onUpPressed: wordsView.moveCurrentIndexUp(); + ListModel { id: wordsModel } property int itemWidth: Math.min(parent.width / 7.5, parent.height / 5) property int itemHeight: itemWidth * 1.11 GridView { id: wordsView anchors.bottom: bar.top anchors.left: parent.left anchors.right: parent.right anchors.top: planeText.bottom anchors.topMargin: 10 * ApplicationInfo.ratio anchors.leftMargin: 15 * ApplicationInfo.ratio anchors.rightMargin: 15 * ApplicationInfo.ratio anchors.bottomMargin: 10 * ApplicationInfo.ratio cellWidth: itemWidth + 43*ApplicationInfo.ratio cellHeight: itemHeight + 15*ApplicationInfo.ratio clip: false interactive: false //verticalLayoutDirection: GridView.BottomToTop layoutDirection: Qt.LeftToRight - + keyNavigationWraps: true model: wordsModel delegate: Card { width: background.itemWidth Connections { target: bonus onStart: { mouseActive = false; } onStop: { mouseActive = true; } } + } - + highlight: Rectangle { + width: wordsView.cellWidth - wordsView.spacing + height: wordsView.cellHeight - wordsView.spacing + color: "#AAFFFFFF" + border.width: 3 + border.color: "black" + visible: background.keyboardMode + Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } } + Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } } } } JsonParser { id: parser onError: console.error("Click_on_letter: Error parsing JSON: " + msg); } } }