diff --git a/src/activities/lang/Lang.qml b/src/activities/lang/Lang.qml index 599d22f4f..1367297fa 100644 --- a/src/activities/lang/Lang.qml +++ b/src/activities/lang/Lang.qml @@ -1,617 +1,632 @@ /* GCompris - lang.qml * * Copyright (C) Siddhesh suthar (Qt Quick port) * * Authors: * Pascal Georges (pascal.georges1@free.fr) (GTK+ version) * Holger Kaelberer (Qt Quick port of imageid) * Siddhesh suthar (Qt Quick port) * Bruno Coudoin (Integration Lang dataset) * * 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 "lang.js" as Activity import "quiz.js" as QuizActivity import "spell_it.js" as SpellActivity import "qrc:/gcompris/src/core/core.js" as Core ActivityBase { id: activity onStart: focus = true onStop: {} pageComponent: Image { id: background source: "qrc:/gcompris/src/activities/lang/resource/imageid-bg.svg" fillMode: Image.PreserveAspectCrop sourceSize.width: parent.width property bool horizontalLayout: background.width > background.height property bool keyNavigation: false readonly property string wordsResource: "data2/words/words.rcc" property bool englishFallback: false property bool downloadWordsNeeded: false //system locale by defauls property string locale: "system" signal start signal stop signal voiceError signal voiceDone Component.onCompleted: { dialogActivityConfig.getInitialConfiguration() activity.start.connect(start) activity.stop.connect(stop) } // Add here the QML items you need to access in javascript QtObject { id: items property Item main: activity.main property alias background: background property alias bar: bar property alias bonus: bonus property alias score: score property alias wordImage: wordImage property alias imageFrame: imageFrame property alias wordTextbg: wordTextbg property alias wordText: wordText property alias categoryTextbg: categoryTextbg property alias categoryText: categoryText property alias previousWordButton: previousWordButton property alias parser: parser property alias repeatItem: repeatItem property alias keyboard: keyboard property alias menuModel: menu_screen.menuModel property alias menu_screen: menu_screen property variant goodWord property int goodWordIndex property alias englishFallbackDialog: englishFallbackDialog property alias miniGameLoader: miniGameLoader property alias locale: background.locale + property alias progress: background.progress + property alias dialogActivityConfig: dialogActivityConfig function checkWordExistence(wordForCheck) { return activity.audioVoices.fileExists(ApplicationInfo.getAudioFilePath(wordForCheck.voice)) } function playWord() { if(!activity.audioVoices.fileExists(ApplicationInfo.getAudioFilePath(goodWord.voice))) { voiceError(); } else { activity.audioVoices.clearQueue() if (!activity.audioVoices.append(ApplicationInfo.getAudioFilePath(goodWord.voice))) voiceError(); } } onGoodWordChanged: playWord() } function handleResourceRegistered(resource) { if (resource == wordsResource) Activity.start(items); } onStart: { Activity.init(items) items.menu_screen.visible = true repeatItem.visible = false - keyNavigation = false activity.audioVoices.error.connect(voiceError) activity.audioVoices.done.connect(voiceDone) // check for words.rcc: if (DownloadManager.isDataRegistered("words")) { // words.rcc is already registered -> start right away Activity.start(items); } else if(DownloadManager.haveLocalResource(wordsResource)) { // words.rcc is there, but not yet registered -> updateResource DownloadManager.resourceRegistered.connect(handleResourceRegistered); DownloadManager.updateResource(wordsResource); } else { // words.rcc has not been downloaded yet -> ask for download downloadWordsNeeded = true } } onStop: { DownloadManager.resourceRegistered.disconnect(handleResourceRegistered); + dialogActivityConfig.saveDatainConfiguration() +// var progressToSave = {'progress': Activity.savedProgress} +// ApplicationSettings.saveActivityConfiguration(activity,progressToSave) Activity.stop() } Keys.onEscapePressed: { if (Activity.currentMiniGame != -1) { Activity.launchMenuScreen() } } Keys.onLeftPressed: { if( Activity.currentMiniGame == 0 && score.currentSubLevel > 1 ) { console.log("left key pressed lang and current sub level "+ score.currentSubLevel ) keyNavigation = true Activity.prevSubLevel() } } Keys.onRightPressed: { if( Activity.currentMiniGame == 0) { console.log("right key pressed lang") keyNavigation = true Activity.nextSubLevel() } } Keys.onSpacePressed: { if( Activity.currentMiniGame == 0) { console.log("space key pressed lang") keyNavigation = true Activity.nextSubLevel() } } Keys.onEnterPressed: { if( Activity.currentMiniGame == 0) { console.log("enter key pressed lang") keyNavigation = true Activity.nextSubLevel() } } Keys.onReturnPressed: { if(!menu_screen.visible && Activity.currentMiniGame == 0) { console.log("return key pressed lang") keyNavigation = true Activity.nextSubLevel() } } JsonParser { id: parser onError: console.error("lang: Error parsing json: " + msg); } Rectangle { id: categoryTextbg x: categoryText.x -4 y: categoryText.y -4 width: imageFrame.width height: categoryText.height +4 color: "#5090ff" border.color: "#000000" border.width: 2 radius: 16 anchors.bottom: imageFrame.top anchors.left: imageFrame.left anchors.bottomMargin: 20 GCText { id: categoryText text: "" fontSize: largeSize font.weight: Font.DemiBold width: parent.width horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter color: "white" wrapMode: Text.WordWrap property string nextCategory function changeCategory(nextCategory_) { nextCategory = nextCategory_ animCategory.start() } SequentialAnimation { id: animCategory PropertyAnimation { target: categoryText property: "opacity" to: 0 duration: 100 } PropertyAction { target: categoryText property: "text" value: qsTr("Category: ")+ categoryText.nextCategory } PropertyAnimation { target: categoryText property: "opacity" to: 1 duration: 100 } } } } Image { id: imageFrame width: background.width * 0.55 height: background.horizontalLayout ? (background.height - bar.height)* 0.7 : (background.height - bar.height) * 0.4 anchors { horizontalCenter: background.horizontalCenter top: background.top topMargin: (background.height - bar.height) * 0.15 } source: "qrc:/gcompris/src/activities/lang/resource/imageid_frame.svg" sourceSize.width: background.horizontalLayout ? parent.width * 0.9 : parent.height * 1.2 z: 11 Image { id: wordImage sourceSize.width: parent.width * 0.6 anchors { centerIn: parent margins: 0.05 + parent.width } property string nextSource function changeSource(nextSource_) { nextSource = nextSource_ animImage.start() } SequentialAnimation { id: animImage PropertyAnimation { target: wordImage property: "opacity" to: 0 duration: 100 } PropertyAction { target: wordImage property: "source" value: wordImage.nextSource } PropertyAnimation { target: wordImage property: "opacity" to: 1 duration: 100 } } MouseArea { anchors.fill: parent onClicked: { if(Activity.currentMiniGame == 0) items.playWord() } } } Image { id: previousWordButton source: "qrc:/gcompris/src/core/resource/bar_previous.svg"; sourceSize.width: 30 * 1.2 * ApplicationInfo.ratio anchors { right: parent.left rightMargin: 30 top: parent.top topMargin: parent.height/2 - previousWordButton.height/2 } MouseArea { id: previousWordButtonArea anchors.fill: parent onClicked: Activity.prevSubLevel() } } Image { id: nextWordButton source: "qrc:/gcompris/src/core/resource/bar_next.svg"; sourceSize.width: 30 * 1.2 * ApplicationInfo.ratio anchors { left: parent.right leftMargin: 30 top: parent.top topMargin: parent.height/2 - previousWordButton.height/2 } MouseArea { id: nextWordButtonArea anchors.fill: parent onClicked: Activity.nextSubLevel(); } } } Rectangle { id: wordTextbg x: wordText.x -4 y: wordText.y -4 width: imageFrame.width height: wordText.height +4 color: "#5090ff" border.color: "#000000" border.width: 2 radius: 16 anchors.top: imageFrame.bottom anchors.left: imageFrame.left anchors.topMargin: 20 GCText { id: wordText text: "" fontSize: largeSize font.weight: Font.DemiBold width: parent.width horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter color: "white" wrapMode: Text.WordWrap property string nextWord function changeText(nextWord_) { nextWord = nextWord_ animWord.start() } SequentialAnimation { id: animWord PropertyAnimation { target: wordText property: "opacity" to: 0 duration: 100 } PropertyAction { target: wordText property: "text" value: wordText.nextWord } PropertyAnimation { target: wordText property: "opacity" to: 1 duration: 100 } } } } MenuScreen{ id: menu_screen } onVoiceDone: repeatItem.visible = true onVoiceError: repeatItem.visible = false BarButton { id: repeatItem source: "qrc:/gcompris/src/core/resource/bar_repeat.svg"; sourceSize.width: 80 * ApplicationInfo.ratio z: menu_screen.visible ? -12 : 12 anchors { top: parent.top left: parent.left margins: 10 * ApplicationInfo.ratio } onClicked: { //items.playWord() if(Activity.currentMiniGame ==0) items.playWord() else Activity.loadedItems.playWord(); } } DialogHelp { id: dialogHelp onClose: home() } Bar { id: bar anchors.bottom: keyboard.top content: BarEnumContent { value: menu_screen.visible ? help | home |config : help | home } onHelpClicked: { displayDialog(dialogHelp) } // onPreviousLevelClicked: Activity.previousLevel() // onNextLevelClicked: Activity.nextLevel() // onHomeClicked: activity.home() onHomeClicked: { Activity.currentSubLesson = 0 Activity.currentMiniGame = -1 if(Activity.savedProgress[Activity.currentLevel] < Activity.currentProgress[Activity.currentLevel]) Activity.savedProgress[Activity.currentLevel] = Activity.currentProgress[Activity.currentLevel] console.log("clicked on home and saved "+ Activity.savedProgress[Activity.currentLevel]) menu_screen.menuModel.clear() menu_screen.menuModel.append(Activity.menus) if(menu_screen.visible == false) { menu_screen.visible = true items.imageFrame.visible = false items.score.visible = false level = 0 if (Activity.loadedItems) Activity.loadedItems.visible = false } else { activity.home() } } onConfigClicked: { dialogActivityConfig.active = true dialogActivityConfig.setDefaultValues() displayDialog(dialogActivityConfig) } } Bonus { id: bonus Component.onCompleted: win.connect(Activity.nextLevel) } Loader { id: englishFallbackDialog sourceComponent: GCDialog { parent: activity.main message: qsTr("We are sorry, we don't have yet a translation for your language.") + " " + qsTr("GCompris is developed by the KDE community, you can translate GCompris by joining a translation team on %2").arg("http://l10n.kde.org/") + "

" + qsTr("We switched to English for this activity but you can select another language in the configuration dialog.") onClose: background.englishFallback = false } anchors.fill: parent focus: true active: background.englishFallback onStatusChanged: if (status == Loader.Ready) item.start() } Loader { id: downloadWordsDialog sourceComponent: GCDialog { parent: activity.main message: qsTr("The images for this activity are not yet installed.") button1Text: qsTr("Download the images") onClose: background.downloadWordsNeeded = false onButton1Hit: { DownloadManager.resourceRegistered.connect(handleResourceRegistered); DownloadManager.downloadResource(wordsResource) var downloadDialog = Core.showDownloadDialog(activity, {}); } } anchors.fill: parent focus: true active: background.downloadWordsNeeded onStatusChanged: if (status == Loader.Ready) item.start() } Score { id: score anchors.bottom: keyboard.top anchors.bottomMargin: 10 * ApplicationInfo.ratio anchors.right: parent.right anchors.rightMargin: 10 * ApplicationInfo.ratio anchors.top: undefined } Loader { id: miniGameLoader width: parent.width height: parent.height anchors.fill: parent asynchronous: false } VirtualKeyboard { id: keyboard anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter width: parent.width property bool visibleFlag: false visible: ApplicationSettings.isVirtualKeyboard && items.keyboard.visibleFlag && !menu_screen.visible onKeypress: SpellActivity.processKeyPress(text) onError: console.log("VirtualKeyboard error: " + msg); } 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 width: 250 * ApplicationInfo.ratio label: qsTr("Select your locale") } } } } } onClose: home() onLoadData: { - if(dataToSave && dataToSave["locale"]) { +// if(dataToSave && dataToSave["locale"] && dataToSave["progress"] && dataToSave["favorites"]) { + if(dataToSave && dataToSave["locale"] && dataToSave["progress"]) { background.locale = dataToSave["locale"]; + Activity.savedProgress = dataToSave["progress"]; +// Activity.favorites = dataToSave["favorites"]; } } onSaveData: { var oldLocale = background.locale; - var newLocale = dialogActivityConfig.configItem.availableLangs[dialogActivityConfig.loader.item.localeBox.currentIndex].locale; + var newLocale = oldLocale; + if(dialogActivityConfig.loader.item) + 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} + var newProgress = Activity.savedProgress +// var newFavorites = Activity.favorites + console.log("new progress "+newProgress ) +// console.log("new favorites "+newFavorites ) + dataToSave = {"locale": newLocale, "progress": newProgress} +// dataToSave = {"locale": newLocale, "progress": newProgress, "favorites": newFavorites} background.locale = newLocale; - + Activity.savedProgress = newProgress; + Activity.favorites = newFavorites; // 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; } } } } } } diff --git a/src/activities/lang/MenuScreen.qml b/src/activities/lang/MenuScreen.qml index d77ab5df1..0485342d4 100644 --- a/src/activities/lang/MenuScreen.qml +++ b/src/activities/lang/MenuScreen.qml @@ -1,239 +1,241 @@ /* GCompris - lang.qml * * Copyright (C) Siddhesh suthar (Qt Quick port) * * Authors: * Pascal Georges (pascal.georges1@free.fr) (GTK+ version) * Holger Kaelberer (Qt Quick port of imageid) * Siddhesh suthar (Qt Quick port) * Bruno Coudoin (Integration Lang dataset) * * 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 QtQuick.Controls 1.2 import "../../core" import "lang.js" as Activity import "quiz.js" as QuizActivity import "spell_it.js" as SpellActivity import "qrc:/gcompris/src/core/core.js" as Core Image { id: menu_screen anchors.fill: parent fillMode: Image.PreserveAspectCrop source: Activity.baseUrl + "imageid-bg.svg" sourceSize.width: parent.width property alias menuModel: menuModel // Filters property bool horizontal: parent.width > parent.height property var currentActiveGrid: menuGrid property bool keyboardMode: false property string favtUrl: "qrc:/gcompris/src/activities/menu/resource/" Keys.onEscapePressed: { if(Activity.currentMiniGame == -1) { home() } else { Activity.launchMenuScreen() } } Keys.onPressed: { if( Activity.currentMiniGame === -1) { console.log("key pressed in menu screen") items.background.keyNavigation = false event.accepted = true if(event.key === Qt.Key_Space) { currentActiveGrid.currentItem.selectCurrentItem() } if(event.key === Qt.Key_Enter) { currentActiveGrid.currentItem.selectCurrentItem() } if(event.key === Qt.Key_Return) { currentActiveGrid.currentItem.selectCurrentItem() } if(event.key === Qt.Key_Left) { currentActiveGrid.moveCurrentIndexLeft() } if(event.key === Qt.Key_Right) { currentActiveGrid.moveCurrentIndexRight() } if(event.key === Qt.Key_Up) { currentActiveGrid.moveCurrentIndexUp() } if(event.key === Qt.Key_Down) { currentActiveGrid.moveCurrentIndexDown() } } } Keys.onReleased: { keyboardMode = true event.accepted = false } // Activities property int iconWidth: 190 * ApplicationInfo.ratio property int iconHeight: 190 * ApplicationInfo.ratio property int levelCellWidth: horizontal ? background.width / Math.floor(background.width / iconWidth ): background.width / Math.floor(background.width / iconWidth) property int levelCellHeight: iconHeight * 1.5 ListModel { id: menuModel } GridView { id: menuGrid layer.enabled: true anchors { top: parent.top fill: parent // margins: 4 } width: background.width cellWidth: levelCellWidth cellHeight: levelCellHeight clip: true model: menuModel keyNavigationWraps: true property int spacing: 10 - delegate: Item { id: delegateItem width: levelCellWidth - menuGrid.spacing height: levelCellHeight - menuGrid.spacing Rectangle { id: activityBackground width: levelCellWidth - menuGrid.spacing height: levelCellHeight - menuGrid.spacing anchors.horizontalCenter: parent.horizontalCenter color: "white" opacity: 0.5 } Image { id: containerImage source: "qrc:/gcompris/data/"+ image; anchors.top: activityBackground.top anchors.horizontalCenter: parent.horizontalCenter sourceSize.height: iconHeight anchors.margins: 5 GCText { id: title anchors.top: parent.bottom anchors.horizontalCenter: parent.horizontalCenter horizontalAlignment: Text.AlignHCenter width: activityBackground.width fontSizeMode: Text.Fit minimumPointSize: 7 fontSize: regularSize elide: Text.ElideRight maximumLineCount: 2 wrapMode: Text.WordWrap text: name } // TODO : progress bar ProgressBar { id: progressLang anchors.top: title.bottom anchors.topMargin: ApplicationInfo.ratio * 4 anchors.horizontalCenter: parent.horizontalCenter width: activityBackground.width maximumValue: wordCount minimumValue: 0 value: Activity.savedProgress[index] - // value: savedProgress orientation: Qt.Horizontal } } ParticleSystemStarLoader { id: particles anchors.fill: activityBackground } MouseArea { anchors.fill: activityBackground onClicked: selectCurrentItem() } function selectCurrentItem() { particles.burst(50) Activity.initLevel(index) } - property bool favorite: false Image { - source: menu_screen.favtUrl + (favorite ? "all.svg" : "all_disabled.svg"); + source: menu_screen.favtUrl + ( Activity.favorites[index] ? "all.svg" : "all_disabled.svg"); anchors { top: parent.top right: parent.right rightMargin: 4 * ApplicationInfo.ratio } sourceSize.width: iconWidth * 0.25 visible: ApplicationSettings.sectionVisible MouseArea { anchors.fill: parent - onClicked: favorite = !favorite + onClicked: { + console.log("before Activity.favorites[index] is "+Activity.favorites) + Activity.favorites[index] = !(Activity.favorites[index]) + parent.source = menu_screen.favtUrl + ( Activity.favorites[index] ? "all.svg" : "all_disabled.svg"); + console.log("now Activity.favorites[index] is "+Activity.favorites) + } } } } //delegate close highlight: Rectangle { width: levelCellWidth - menuGrid.spacing height: levelCellHeight - menuGrid.spacing color: "#AA41AAC4" border.width: 3 border.color: "black" visible: menu_screen.keyboardMode Behavior on x { SpringAnimation { spring: 2; damping: 0.2 } } Behavior on y { SpringAnimation { spring: 2; damping: 0.2 } } } } // grid view close Rectangle{ id: menusMask visible: false anchors.fill: menuGrid gradient: Gradient { GradientStop { position: 0.0; color: "#FFFFFFFF" } GradientStop { position: 0.92; color: "#FFFFFFFF" } GradientStop { position: 0.96; color: "#00FFFFFF"} } } layer.effect: OpacityMask { id: activitiesOpacity source: menuGrid maskSource: menusMask anchors.fill: menuGrid } } diff --git a/src/activities/lang/SpellIt.qml b/src/activities/lang/SpellIt.qml index 52360aed8..eea20b439 100644 --- a/src/activities/lang/SpellIt.qml +++ b/src/activities/lang/SpellIt.qml @@ -1,298 +1,303 @@ /* GCompris - lang.qml * * Copyright (C) Siddhesh suthar (Qt Quick port) * * Authors: * Pascal Georges (pascal.georges1@free.fr) (GTK+ version) * Holger Kaelberer (Qt Quick port of imageid) * Siddhesh suthar (Qt Quick port) * Bruno Coudoin (Integration Lang dataset) * * 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 "lang.js" as Activity import "quiz.js" as QuizActivity import "spell_it.js" as SpellActivity import "qrc:/gcompris/src/core/core.js" as Core Item { id: spellIt opacity: displayed ? 1 : 0 property bool displayed: index == 0 ? false : true // The opacity of spell it, set to 0 to disable property int index: 1 property alias background: background property alias wordImage: wordImage property alias imageFrame: imageFrame property alias hintTextbg: hintTextbg property alias hintText: hintText property alias parser: parser property alias answerbg: answerbg property alias answer: answer property alias ok: ok property alias okMouseArea: okMouseArea property alias bonus: bonus property variant goodWord property int goodWordIndex property int maximumLengthAnswer function init(items_, loadedItems_, wordList_, mode_) { SpellActivity.init(items_, loadedItems_, wordList_, mode_); } function playWord() { if(!activity.audioVoices.fileExists(ApplicationInfo.getAudioFilePath(goodWord.voice))) { console.log("file does not exist so don't display the repeatItem") voiceError(); } else { activity.audioVoices.clearQueue() if (!activity.audioVoices.append(ApplicationInfo.getAudioFilePath(goodWord.voice))) voiceError(); } } onGoodWordChanged: playWord() Keys.onEscapePressed: { if(Activity.currentMiniGame == -1) { home() } else { Activity.launchMenuScreen() } } Image { id: background source: "qrc:/gcompris/src/activities/lang/resource/imageid-bg.svg" fillMode: Image.PreserveAspectCrop sourceSize.width: parent.width height: parent.height property bool horizontalLayout: background.width > background.height JsonParser { id: parser onError: console.error("Lang: Error parsing json: " + msg); } Rectangle { id: hintTextbg x: hintText.x -4 y: hintText.y -4 width: imageFrame.width height: hintText.height +4 color: "#5090ff" border.color: "#000000" border.width: 2 radius: 16 + anchors.top: parent.top anchors.bottom: imageFrame.top anchors.left: imageFrame.left anchors.bottomMargin: 5 GCText { id: hintText text: "" fontSize: largeSize font.weight: Font.DemiBold width: parent.width horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter color: "white" wrapMode: Text.WordWrap property string nextHint function changeHint(nextHint_) { nextHint = nextHint_ animHint.start() } SequentialAnimation { id: animHint PropertyAnimation { target: hintText property: "opacity" to: 0 duration: 100 } PropertyAction { target: hintText property: "text" value: ""+ hintText.nextHint } PropertyAnimation { target: hintText property: "opacity" to: 1 duration: 100 } } } } Image { id: imageFrame width: background.width * 0.55 height: background.horizontalLayout ? (background.height - Activity.items.bar.height - Activity.items.keyboard.height)* 0.7 : (background.height - Activity.items.bar.height) * 0.4 anchors { horizontalCenter: background.horizontalCenter top: background.top topMargin: (background.height - Activity.items.bar.height - Activity.items.keyboard.height) * 0.15 } source: "qrc:/gcompris/src/activities/lang/resource/imageid_frame.svg" sourceSize.width: background.horizontalLayout ? parent.width * 0.9 : parent.height * 1.2 z: 11 Image { id: wordImage sourceSize.width: parent.width * 0.6 + width: parent.width * 0.6 + height: parent.height * 0.6 anchors { centerIn: parent margins: 0.05 + parent.width } property string nextSource function changeSource(nextSource_) { nextSource = nextSource_ animImage.start() } SequentialAnimation { id: animImage PropertyAnimation { target: wordImage property: "opacity" to: 0 duration: 100 } PropertyAction { target: wordImage property: "source" value: wordImage.nextSource } PropertyAnimation { target: wordImage property: "opacity" to: 1 duration: 100 } } MouseArea { anchors.fill: parent onClicked: { if(Activity.currentMiniGame != 0) Activity.loadedItems.playWord() } } } } Rectangle { id: answerbg x: answer.x -4 y: answer.y -4 width: imageFrame.width height: answer.height +4 color: "#5090ff" border.color: "#000000" border.width: 2 radius: 16 anchors { top: imageFrame.bottom left: imageFrame.left topMargin: 20* ApplicationInfo.ratio } TextInput { id: answer width: hintTextbg.width height: hintTextbg.height color: "white" cursorVisible: true focus: true visible: true horizontalAlignment: TextInput.AlignHCenter verticalAlignment: TextInput.AlignVCenter font.pointSize: hintText.fontSize maximumLength: maximumLengthAnswer onAccepted: { answer.forceActiveFocus() okMouseArea.clicked(okMouseArea) } } } Image { id: ok source:"qrc:/gcompris/src/core/resource/bar_ok.svg" width: answerbg.width * 1.2 height: answerbg.height fillMode: Image.PreserveAspectFit anchors { top: imageFrame.bottom topMargin: 10* ApplicationInfo.ratio left: imageFrame.right leftMargin: 10* ApplicationInfo.ratio right: parent.right } MouseArea { id: okMouseArea anchors.fill: parent hoverEnabled: true onEntered: ok.scale = 1.1 onClicked: { var check = SpellActivity.checkAnswer(answer.text) console.log(check) if (check) ++Activity.currentProgress[Activity.currentLevel] } onExited: ok.scale = 1 } } // VirtualKeyboard { // id: keyboard // x: 0 // anchors.bottom: parent.bottom // anchors.horizontalCenter: parent.horizontalCenter // width: parent.width // onKeypress: answer.insert(answer.length,text) // onError: console.log("VirtualKeyboard error: " + msg); // } Bonus { id: bonus onWin: Activity.nextSubLesson() } } } diff --git a/src/activities/lang/lang.js b/src/activities/lang/lang.js index 4e73bb2a2..afa3fbd4c 100644 --- a/src/activities/lang/lang.js +++ b/src/activities/lang/lang.js @@ -1,320 +1,324 @@ /* GCompris - lang.qml * * Copyright (C) Siddhesh suthar (Qt Quick port) * * Authors: * Pascal Georges (pascal.georges1@free.fr) (GTK+ version) * Holger Kaelberer (Qt Quick port of imageid) * Siddhesh suthar (Qt Quick port) * Bruno Coudoin (Integration Lang dataset) * * 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 . */.pragma library .import QtQuick 2.0 as Quick .import GCompris 1.0 as GCompris .import "qrc:/gcompris/src/core/core.js" as Core .import "qrc:/gcompris/src/activities/lang/lang_api.js" as Lang .import "qrc:/gcompris/src/activities/lang/quiz.js" as QuizActivity .import "qrc:/gcompris/src/activities/lang/spell_it.js" as SpellActivity var currentLevel = 0; var currentSubLevel = 0; var level = null; var maxLevel; var maxSubLevel; var items; var baseUrl = "qrc:/gcompris/src/activities/lang/resource/"; var dataset = null; var lessons var maxWordInLesson = 12 var wordList var subLevelsLeft var menus = [] var currentProgress = [] var savedProgress = [] +var favorites= [] var subWordList var currentSubLesson var maxSubLesson // miniGames is list of miniGames // first element is Activity name, // second element is mode of miniGame // third element is the qml to load var miniGames = [["QuizActivity", 1,"Quiz.qml"], ["QuizActivity", 2,"Quiz.qml"], ["QuizActivity", 3,"Quiz.qml"], ["SpellActivity", 1,"SpellIt.qml"]]; var currentMiniGame var loadedItems function init(items_) { items = items_ maxLevel = 0 maxSubLevel = 0 currentLevel = 0 currentSubLevel = 0 currentSubLesson = 0 currentMiniGame = -1 } function start() { currentLevel = 0; currentSubLevel = 0; var locale = items.locale == "system" ? "$LOCALE" : items.locale dataset = Lang.load(items.parser, baseUrl, "words.json", "content-"+ locale +".json") // If dataset is empty, we try to load from short locale and if not present again, we switch to default one var localeUnderscoreIndex = locale.indexOf('_') if(!dataset) { var localeShort; // We will first look again for locale xx (without _XX if exist) if(localeUnderscoreIndex > 0) { localeShort = locale.substring(0, localeUnderscoreIndex) } else { localeShort = locale; } dataset = Lang.load(items.parser, baseUrl, "words.json", "content-"+localeShort+ ".json") } //If still dataset is empty then fallback to english if(!dataset) { // English fallback items.background.englishFallback = true dataset = Lang.load(items.parser, baseUrl, "words.json", "content-en.json") } else { items.background.englishFallback = false } lessons = Lang.getAllLessons(dataset) maxLevel = lessons.length menus = Lang.getMenuModel(dataset, items) items.menuModel.clear() for (var j =0; j 0)) currentProgress[j] = 0 } for (var k =0; k 0)) + if(!(savedProgress[k] >0)) { savedProgress[k] = 0 + } + if(!favorites[k]) + favorites[k] = false // menus.push({'savedProgress': savedProgress[k] }) } items.menuModel.clear() items.menuModel.append(menus) +// console.log("model length "+ items.menuModel.count) + items.imageFrame.visible = false items.score.visible = false items.menu_screen.visible = true items.menu_screen.focus = true items.menu_screen.forceActiveFocus() // initLevel(); } function stop() { -// for (var k =0; k. */ .pragma library .import GCompris 1.0 as GCompris .import "qrc:/gcompris/src/core/core.js" as Core var contentText function validateDataset(levels) { return true; } function load(parser, baseUrl, datasetFilename, translationFilename) { var datasetUrl = baseUrl + "/" + datasetFilename; var dataset = parser.parseFromUrl(datasetUrl, validateDataset); if (dataset === null) { console.error("Lang: Invalid dataset, can't continue: " + datasetUrl); return; } dataset['contentText'] = loadContent(parser, GCompris.ApplicationInfo.getLocaleFilePath(baseUrl + "/" + translationFilename)) if(!dataset['contentText']) { return null } return dataset } function loadContent(parser, datasetUrl) { var dataset = parser.parseFromUrl(datasetUrl, validateDataset); if (dataset === null) { console.error("Lang: Invalid dataset, can't continue: " + datasetUrl); return; } return dataset } 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++) { 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] } function getAllLessons(dataset) { var lessons = [] for (var c in dataset) { for (var l in dataset[c].content) { var lesson = getLesson(dataset, dataset[c], l) lessons.push(lesson) } } return lessons } function getLessonWords(dataset, lesson) { var wordList = lesson.content // Fill up the lesson with the translated text var allWords = [] for (var k in wordList) { var word = wordList[k] word['translatedTxt'] = getTextByAudio(dataset.contentText, word.description) if(word['translatedTxt']) allWords.push(word) } return allWords } function getTextByAudio(contentText, audio) { audio += ".ogg" return contentText[audio] } // Return a datamodel for the lessons for creating menu function getMenuModel(dataset, items) { var menus = [] var levelCount = 0 //used for creating a straight indexing of levels var prevLevelcount = 0 for (var c in dataset) { for (var l in dataset[c].content) { levelCount = parseInt(l) + prevLevelcount var currentLesson = getLesson(dataset, dataset[c], l) var tempWordList = getLessonWords(dataset, currentLesson); var modifiedWordCount = tempWordList.length for (var m in tempWordList) { // if voice is disabled then it doesn't affect maximum if(!items.checkWordExistence (tempWordList[m]) ) { --modifiedWordCount } } menus.push( { 'name' : currentLesson.name, 'image': currentLesson.content[0].image, 'index': levelCount, 'wordCount': tempWordList.length * 4 + modifiedWordCount, - 'savedProgress': 0 + 'savedProgress': 0, }) } prevLevelcount = levelCount+ 1 } return menus } diff --git a/src/activities/lang/spell_it.js b/src/activities/lang/spell_it.js index 61c3addcf..b3c28f176 100644 --- a/src/activities/lang/spell_it.js +++ b/src/activities/lang/spell_it.js @@ -1,196 +1,195 @@ /* GCompris - lang.qml * * Copyright (C) Siddhesh suthar (Qt Quick port) * * Authors: * Pascal Georges (pascal.georges1@free.fr) (GTK+ version) * Holger Kaelberer (Qt Quick port of imageid) * Siddhesh suthar (Qt Quick port) * Bruno Coudoin (Integration Lang dataset) * * 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 . */.pragma library .import QtQuick 2.0 as Quick .import GCompris 1.0 as GCompris .import "qrc:/gcompris/src/core/core.js" as Core .import "qrc:/gcompris/src/activities/lang/lang_api.js" as Lang var items; var spellItems; var spellWordList; var subLevelsLeft var currentSubLevel function init(items_, loadedItems_, spellWordList_, mode_) { items = items_ spellItems = loadedItems_ spellWordList = spellWordList_ console.log("new " + spellItems + " loaded") spellItems.answer.forceActiveFocus() initLevel() } function initLevel() { subLevelsLeft = []; for(var i in spellWordList) { subLevelsLeft.push(i) // This is available in all editors. } Core.shuffle(subLevelsLeft) items.score.currentSubLevel = 0 items.imageFrame.visible = false items.wordTextbg.visible = false items.categoryTextbg.visible = false currentSubLevel =0 /* populate VirtualKeyboard for mobile: * 1. for < 10 letters print them all in the same row * 2. for > 10 letters create 3 rows with equal amount of keys per row * if possible, otherwise more keys in the upper rows */ // first generate a map of needed letters var letters = []; for (var i = 0; i < spellWordList.length; i++) { var currentWord = spellWordList[i].translatedTxt; for (var j = 0; j < currentWord.length; j++) { var letter = currentWord.charAt(j); if(letters.indexOf(letter) === -1) letters.push(currentWord.charAt(j)); } } letters.sort(); // generate layout from letter map var layout = []; var row = 0; var offset = 0; while (offset < letters.length-1) { var cols = letters.length <= 10 ? letters.length : (Math.ceil((letters.length-offset) / (3 - row))); layout[row] = new Array(); for (var j = 0; j < cols; j++) layout[row][j] = { label: letters[j+offset] }; offset += j; row++; } layout[row-1].push({ label: items.keyboard.backspace }); - items.keyboard.layout = []; items.keyboard.layout = layout; items.keyboard.visibleFlag = true; initSubLevel() } function initSubLevel() { if(items.score.currentSubLevel < items.score.numberOfSubLevels) items.score.currentSubLevel = items.score.currentSubLevel + 1; else items.score.visible = false spellItems.goodWord = spellWordList[items.score.currentSubLevel-1] spellItems.wordImage.changeSource("qrc:/gcompris/data/" + spellItems.goodWord.image) spellItems.hintText.changeHint(spellItems.goodWord.translatedTxt[0]) spellItems.hintText.visible = true spellItems.answer.text = "" spellItems.maximumLengthAnswer = spellItems.goodWord.translatedTxt.length + 1 } function nextSubLevel() { if(items.score.currentSubLevel == items.score.numberOfSubLevels ) { spellItems.displayed = false spellItems.bonus.good("smiley") } else { initSubLevel(); } } function checkAnswer(answer_) { if(spellItems.goodWord.translatedTxt == answer_) { nextSubLevel() return true } else { badWordSelected(currentSubLevel-1,answer_) } } // Append to the front of queue of words for the sublevel the error function badWordSelected(wordIndex,answer) { if (subLevelsLeft[0] != wordIndex) subLevelsLeft.unshift(wordIndex); provideHint(answer) } //function to construct hint based on the answer entered by user function provideHint(answer_) { var answer = answer_ var hint = "" var firstIncorrectIndex = 0 for (var i=0 ; i< spellItems.goodWord.translatedTxt.length; i++) { var goodChar = spellItems.goodWord.translatedTxt[i] //skipping hint if the suggestion is a space if( goodChar == " ") { hint = hint + " " continue } if( answer[i] == goodChar) { hint = hint + goodChar } else { if(firstIncorrectIndex == 0) { hint = hint + goodChar firstIncorrectIndex = i } else { hint = hint + "." } } } spellItems.hintText.changeHint(hint) spellItems.hintText.visible = true } // to handle virtual key board key press events function processKeyPress(text_){ var answer = spellItems.answer var text = text_ if ( text == items.keyboard.backspace) { backspace(answer) return } answer.insert(answer.length,text) } function backspace(answer) { answer.text = answer.text.slice(0, -1) if(answer.text.length === 0) { answer.text = "" } else { checkAnswer(answer.text) } } diff --git a/src/core/DialogActivityConfig.qml b/src/core/DialogActivityConfig.qml index 5b546a019..c59e6c8a2 100644 --- a/src/core/DialogActivityConfig.qml +++ b/src/core/DialogActivityConfig.qml @@ -1,218 +1,223 @@ /* GCompris - DialogActivityConfig.qml * * Copyright (C) 2014 Johnny Jazeix * * Authors: * Johnny Jazeix * * 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.2 import GCompris 1.0 /** * A QML component for a full screen configuration dialog. * @ingroup components * * All user editable settings are presented to the user in a * DialogActivityConfig dialog. The global configuration can be accessed * through the Bar in the main menu, activity specific configuration from the * respective activity. * * All config items that are shown in this dialog are persisted * using ApplicationSettings. * * For an example have a look at Menu.qml. * * For more details on how to add configuration to an activity cf. * [the wiki](http://gcompris.net/wiki/Qt_Quick_development_process#Adding_a_configuration_for_a_specific_activity) * * @sa ApplicationSettings * @inherit QtQuick.Item */ Rectangle { id: dialogActivityContent /* Public interface: */ /** * type:object * The content object as loaded dynamically. */ property alias configItem: loader.item /** * type:Component * Content component which holds the visual presentation of the * config settings in the QML scene. */ property Component content /** * type:string * The name of the activity in case of per-activity config. * * Will be autogenerated unless set by the caller. */ property string activityName: "" /** * type:object * Map containing all settings as key/value-pairs. * * Will be populated from ApplicationSettings.loadActivityConfiguration * and can be passed to ApplicationSettings.saveActivityConfiguration. */ property var dataToSave /// @cond INTERNAL_DOCS property bool isDialog: true /** * type:string * Title of the configuration dialog. * Global configuration name is "Configuration". * For activities, it is "activity name configuration". */ readonly property string title: { if(activityName != "") qsTr("%1 configuration").arg(activityInfo.title) else qsTr("Configuration") } property alias active: loader.active property alias loader: loader property QtObject activityInfo: ActivityInfoTree.currentActivity property ActivityBase currentActivity /// @endcond /** * Emitted when the config dialog has been closed. */ signal close /** * Emitted when the config dialog has been started. */ signal start /** * Emitted when the settings are to be saved. * * The actual persisting of the settings in the settings file is done by * DialogActivityConfig. The activity has to take care to update its * internal state. */ signal saveData /** * Emitted when the config settings have been loaded. */ signal loadData signal stop color: "#696da3" border.color: "black" border.width: 1 z: 1000 function getInitialConfiguration() { if(activityName == "") { activityName = ActivityInfoTree.currentActivity.name.split('/')[0]; } dataToSave = ApplicationSettings.loadActivityConfiguration(activityName) loadData() } + function saveDatainConfiguration() { + saveData() + ApplicationSettings.saveActivityConfiguration(activityName, dataToSave) + } + Row { visible: dialogActivityContent.active spacing: 2 Item { width: 10; height: 1 } Column { spacing: 10 anchors.top: parent.top Item { width: 1; height: 10 } Rectangle { color: "#e6e6e6" radius: 6.0 width: dialogActivityContent.width - 30 height: title.height * 1.2 border.color: "black" border.width: 2 Image { id: titleIcon anchors { left: parent.left top: parent.top margins: 4 * ApplicationInfo.ratio } } GCText { id: title text: dialogActivityContent.title width: dialogActivityContent.width - 30 horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter color: "black" fontSize: 20 font.weight: Font.DemiBold wrapMode: Text.WordWrap } } Rectangle { color: "#e6e6e6" radius: 6.0 width: dialogActivityContent.width - 30 height: dialogActivityContent.height - 100 border.color: "black" border.width: 2 anchors.margins: 100 Flickable { id: flick anchors.margins: 8 anchors.fill: parent flickableDirection: Flickable.VerticalFlick clip: true contentHeight: contentItem.childrenRect.height + 40 * ApplicationInfo.ratio Loader { id: loader active: false sourceComponent: dialogActivityContent.content property alias rootItem: dialogActivityContent } } } Item { width: 1; height: 10 } } } // The cancel button GCButtonCancel { onClose: { saveData() ApplicationSettings.saveActivityConfiguration(activityName, dataToSave) parent.close() } } }