diff --git a/src/activities/categorization/Categorization.qml b/src/activities/categorization/Categorization.qml index a441be1df..2c674fa34 100644 --- a/src/activities/categorization/Categorization.qml +++ b/src/activities/categorization/Categorization.qml @@ -1,309 +1,308 @@ /* GCompris - categorization.qml * * Copyright (C) 2016 Divyam Madaan * * Authors: * Divyam Madaan * * 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 QtQuick.Controls 1.1 import GCompris 1.0 import "../../core" import "categorization.js" as Activity import "qrc:/gcompris/src/core/core.js" as Core import "." ActivityBase { id: activity onStart: focus = true onStop: {} property string boardsUrl: "qrc:/gcompris/src/activities/categorization/resource/" property bool vert: background.width < background.height property string type: "images" property var categoriesCount pageComponent: Image { id: background source: "qrc:/gcompris/src/activities/lang/resource/imageid-bg.svg" anchors.fill: parent sourceSize.width: parent.width signal start signal stop property string locale: "system" property bool englishFallback: false property bool categoriesFallback: (items.categoriesCount == 6) ? true : false Component.onCompleted: { 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 categoryReview: categoryReview property alias menuScreen: menuScreen property alias menuModel: menuScreen.menuModel property alias dialogActivityConfig: dialogActivityConfig property string mode: "easy" property bool instructionsVisible: true property bool categoryImageChecked: (mode === "easy" || mode === "medium") property bool scoreChecked: (mode === "easy") property bool iAmReadyChecked: (mode === "expert") property bool displayUpdateDialogAtStart: true property var details property alias file: file property alias locale: background.locale property alias hintDialog: hintDialog property var categoryTitle property var categoryLesson property bool hintDisplay } onStart: { Activity.init(items, boardsUrl,type,categoriesCount) dialogActivityConfig.getInitialConfiguration() Activity.start() } onStop: { dialogActivityConfig.saveDatainConfiguration() } MenuScreen { id: menuScreen File { id: file onError: console.error("File error: " + msg); } } CategoryReview { id: categoryReview } ExclusiveGroup { id: configOptions } DialogActivityConfig { id: dialogActivityConfig content: Component { Column { id: column spacing: 5 width: dialogActivityConfig.width height: dialogActivityConfig.height property alias easyModeBox: easyModeBox property alias mediumModeBox: mediumModeBox property alias expertModeBox: expertModeBox property alias localeBox: localeBox property alias availableLangs: langs.languages LanguageList { id: langs } GCDialogCheckBox { id: easyModeBox width: column.width - 50 text: qsTr("Instructions and score visible") checked: (items.mode == "easy") ? true : false exclusiveGroup: configOptions onCheckedChanged: { if(easyModeBox.checked) { items.mode = "easy" menuScreen.iAmReady.visible = false } } } GCDialogCheckBox { id: mediumModeBox width: easyModeBox.width text: qsTr("Instructions visible and score invisible") checked: (items.mode == "medium") ? true : false exclusiveGroup: configOptions onCheckedChanged: { if(mediumModeBox.checked) { items.mode = "medium" menuScreen.iAmReady.visible = false } } } GCDialogCheckBox { id: expertModeBox width: easyModeBox.width text: qsTr("Instructions and score invisible") checked: (items.mode == "expert") ? true : false exclusiveGroup: configOptions onCheckedChanged: { if(expertModeBox.checked) { items.mode = "expert" menuScreen.iAmReady.visible = true } } } GCComboBox { id: localeBox model: langs.languages background: dialogActivityConfig width: dialogActivityConfig.width label: qsTr("Select your locale") visible: type == "words" ? true : false } } } onLoadData: { if(dataToSave && dataToSave["mode"]) items.mode = dataToSave["mode"] if(dataToSave && dataToSave["displayUpdateDialogAtStart"]) items.displayUpdateDialogAtStart = (dataToSave["displayUpdateDialogAtStart"] == "true") ? true : false - if(dataToSave['locale']) { + 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, - "easyMode": "" + items.easyMode } + 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; } } } onClose: home() } DialogHelp { id: dialogHelp onClose: home() } DialogBackground { id: hintDialog visible: false title: items.categoryTitle ? items.categoryTitle : '' textBody: items.categoryLesson ? items.categoryLesson : '' onClose: home() } Bar { id: bar content: menuScreen.started ? withConfig : (items.hintDisplay == true ? withoutConfigWithHint : withoutConfigWithoutHint) property BarEnumContent withConfig: BarEnumContent { value: help | home | config } property BarEnumContent withoutConfigWithHint: BarEnumContent { value: home | level | hint } property BarEnumContent withoutConfigWithoutHint: BarEnumContent { value: home | level } onPreviousLevelClicked: Activity.previousLevel() onNextLevelClicked: Activity.nextLevel() onHelpClicked: { displayDialog(dialogHelp) } onHomeClicked: { if(items.menuScreen.started) activity.home() else if(items.categoryReview.started) Activity.launchMenuScreen() } onConfigClicked: { dialogActivityConfig.active = true displayDialog(dialogActivityConfig) } onHintClicked: { displayDialog(hintDialog) } } Bonus { id: bonus Component.onCompleted: win.connect(Activity.nextLevel) } Loader { id: categoriesFallbackDialog sourceComponent: GCDialog { parent: activity.main message: qsTr("You don't have all the images for this activity. " + "Press Update to get the complete dataset. " + "Press the Cross to play with demo version or 'Never show this dialog later' if you want to never see again this dialog.") button1Text: qsTr("Update the image set") button2Text: qsTr("Never show this dialog later") onClose: background.categoriesFallback = false onButton1Hit: DownloadManager.downloadResource('data2/words/words.rcc') onButton2Hit: { items.displayUpdateDialogAtStart = false; dialogActivityConfig.saveDatainConfiguration() } } anchors.fill: parent focus: true active: background.categoriesFallback && items.displayUpdateDialogAtStart onStatusChanged: if (status == Loader.Ready) item.start() } 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() } } } diff --git a/src/activities/categorization/Zone.qml b/src/activities/categorization/Zone.qml index 04ba2ab4a..2ddb2fed1 100644 --- a/src/activities/categorization/Zone.qml +++ b/src/activities/categorization/Zone.qml @@ -1,127 +1,132 @@ /* GCompris - Zone.qml * * Copyright (C) 2016 Divyam Madaan * * Authors: * Divyam Madaan * * 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 QtQuick.Controls 1.1 import QtQuick.Controls.Styles 1.1 import "../../core" import "categorization.js" as Activity ScrollView { id: scroll width: zoneFlow.width height: zoneFlow.height // visibleChildren: [image] property alias repeater: repeater property alias model: zoneModel property alias spacing: zoneFlow.spacing + horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff style: ScrollViewStyle { handle: Rectangle { implicitWidth: middleScreen.width * 0.03 implicitHeight: middleScreen.height - items.bar.height color: "#696969" + visible: type == "words" ? true : false } scrollBarBackground: Rectangle { implicitWidth: middleScreen.width * 0.03 implicitHeight: middleScreen.height - items.bar.height color: "#DCDCDC" + visible: type == "words" ? true : false } decrementControl: Image { source: boardsUrl + "upArrow.svg" width: middleScreen.width * 0.1 height: middleScreen.height * 0.05 + visible: type == "words" ? true : false } incrementControl: Image { source: boardsUrl + "downArrow.svg" width: middleScreen.width * 0.1 height: middleScreen.height * 0.05 } } Flow { id: zoneFlow spacing: 5 width: categoryBackground.width/3 height: categoryBackground.height opacity: 1 // property alias interactive: scroll.interactive ListModel { id: zoneModel } Repeater { id: repeater model: zoneModel Item { id: item width: (type == "words" && (items.hintDisplay == true)) ? middleScreen.width * 0.92 : middleScreen.width * 0.32 height: (type == "words" && (items.hintDisplay == true)) ? categoryBackground.height * 0.1 : categoryBackground.height * 0.2 visible: true opacity: 1 Rectangle { id: wordBox color: "black" visible: type =="words" ? true : false width: parent.width height: parent.height z: 3 + focus: true radius: 10 border.width: 2 gradient: Gradient { GradientStop { position: 0.0; color: "#000" } GradientStop { position: 0.9; color: "#666" } GradientStop { position: 1.0; color: "#AAA" } } GCText { id: wordBoxText text: name anchors.fill: parent anchors.bottom: parent.bottom fontSizeMode: Text.Fit wrapMode: Text.Wrap z: 3 color: "white" verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } DragList { id: wordDrag anchors.fill: parent } } Image { id: image width: middleScreen.width*0.28 height: categoryBackground.height * 0.15 source: (type == "images") ? name : '' visible: type =="words" ? false : true DragList { id: imageDrag anchors.fill: parent } } } } } } diff --git a/src/activities/categorization_words/resource/board/GS-Download-icon.svg b/src/activities/categorization_words/resource/board/GS-Download-icon.svg deleted file mode 100644 index 28d149429..000000000 --- a/src/activities/categorization_words/resource/board/GS-Download-icon.svg +++ /dev/null @@ -1,236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Download icon - 2011-05-01T14:15:01 - Download button - https://openclipart.org/detail/134977/download-icon-by-gsagri04-134977 - - - gsagri04 - - - - - Download - arrow - computer - down - icon - inkscape - software - symbol - web - - - - - - - - - - - diff --git a/src/activities/categorization_words/resource/board/categ-en/category1.qml b/src/activities/categorization_words/resource/board/categ-en/category1.qml index e0756894d..c0edecbce 100644 --- a/src/activities/categorization_words/resource/board/categ-en/category1.qml +++ b/src/activities/categorization_words/resource/board/categ-en/category1.qml @@ -1,133 +1,313 @@ /* GCompris * * Copyright (C) 2016 Divyam Madaan * * Authors: * Divyam Madaan * * 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.0 QtObject { property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/alphabets/" property variant levels: [ { "name": qsTr("Tenses"), "image": imagesPrefix + "alphabets.jpg", - "categoryLesson": qsTr("Hello"), + "categoryLesson": qsTr("A tense is a form taken by a verb to show the time of an action.
+1. Simpe present tense: It is used to describe habits, unchanging situations, general truths, and fixed arrangements.
+The blue word is a simple present tense in these cases:
I drink milk everyday.
+He likes mango. +
The exam starts at 10:00.

+2. Present continuous tense: It is used to express a continued or ongoing action. +
The blue word is a present continuous tense in these cases:
I am sleeping.
+They are playing.
+John is driving a car.

+3. Present perfect tense: It is used to express an action which happened at a short time before now.
+The blue word is a present perfect tense in these cases:
She has learnt the lesson.
+I have eaten my meal.
+They have gone to school.

+4. Simple past tense: He ate
+The blue word is a simple past tense in these cases:
They went to the park.
+I ate an apple.
+Has itrained.

+5. Past continuous tense: It is an ongoing action which occurred in past and completed at some point in past.
+The blue word is a past continuous tense in these cases:
It was raining yesterday.
+They were playing football.
+They were laughing at him.

+6. Past perfect tense: It is used to express an action which has occurred in past a long time ago and action which has occurred in past before another action in past.
+The blue word is a past perfect tense in these cases:
A thief had stolen my watch.
+He had slept.
+He had not finished his work.

+1. Simpe future tense:It is used to express time later than now, facts or certainty..
+blue word is a simple future tense in these cases:
It will rain tomorrow.
+Shall I open the window? +
I will go for the show.

+2. Future continuous tense:It is used to express an unfinished action or event that will be in progress at a time later than now. +
The blue word is a future continuous tense in these cases:
Will he be comingwith us?
+You will be missing the sunshine once you go back.
+Hewill be ironing my clothes in an hour.

+3. Future perfect tense: It is used to express an event that is expected or planned to happen before a time of reference in the future,
+The blue word is a future perfect tense in these cases:
I will have seen him.
+I will have eaten.
+I will have gone.

"), "content": [ { "instructions": qsTr("Place the SIMPLE PRESENT TENSE to the right and others to the left"), "image": "Present Tense", "maxNumberOfGood": 5, "maxNumberOfBad": 7, "prefix": "", - "good": ["I wake up.","We play basketball.","The cinema closes at 7pm.","We take a taxi to work.","He gets up early on Mondays."], - "bad": ["He woke up.","I am going.","George was studying.","They went to the party","I am not playing","We did our homework.","He is learning French."] + "good": ["I wake up.","We play basketball.","The cinema closes at 7pm.","We take a taxi to work.","He gets up early on Mondays."], + "bad": ["He woke up.","I am going.","George was studying.","They went to the party","I am not playing.","We did our homework.","He is learning French."] }, { "instructions": qsTr("Place the SIMPLE PRESENT TENSE to the right and others to the left"), "image": "Present Tense", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", - "good": ["I like pizza.","When do you wake up?","She lives in India.","I don't believe in witches.","We go for swimming everyday."], - "bad": ["She bought a new dress.","We went to the church.","Jim completed my work.","It is raining."] + "good": ["I like pizza.","When do you wake up?","She lives in India.","I don't believe in witches.","We go for swimming everyday."], + "bad": ["She bought a new dress.","We went to the church.","Jim completed my work.","It is raining."] }, { "instructions": qsTr("Place the SIMPLE PRESENT TENSE to the right and others to the left"), "image": "Present Tense", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", - "good": ["I drink milk daily.","Sun rises in the east.","I go for walk every morning."], - "bad": ["We won the match.","I am listening music.","We cooked the meal"] + "good": ["I drink milk daily.","Sun rises in the east.","I go for walk every morning."], + "bad": ["We won the match.","I am listening music.","We cooked the meal"] }, { "instructions": qsTr("Place the PRESENT CONTINUOUS WORDS to the right and others to the left"), "image": "Present Continuous Tense", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", - "good": ["I am going","He is playing","She is riding","I am loving","They are eating","He is sinking"], - "bad": ["I went for a walk.","We play football.","She saw him.","Roger was busy.","Tim was the winner.","We ate the meal."] + "good": ["I am going.","He is playing.","She is riding.","I am loving.","They are eating.","He is sinking."], + "bad": ["I went for a walk.","We play football.","She saw him.","Roger was busy.","Tim was the winner.","We ate the meal."] }, { "instructions": qsTr("Place the PRESENT CONTINUOUS WORDS to the right and others to the left"), "image": "Present Continuous Tense", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", - "good": ["I am going to the market.","It is raining.","They are studying.","We are playing for 2 hours.","I am leaving work"], - "bad": ["I have lost my keys.","She went shopping","I will help you.","This is my cat."] + "good": ["I am going to the market.","It is raining.","They are studying.","We are playing for 2 hours.","I am leaving work"], + "bad": ["I have lost my keys.","She went shopping","I will help you.","This is my cat."] }, { "instructions": qsTr("Place the PRESENT CONTINUOUS WORDS to the right and others to the left"), "image": "Present Continuous Tense", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", - "good": ["They are sleeping","He is always laughing.","What are you doing?"], - "bad": ["He had been playing since morning.","It was a good day.","I love to read."] + "good": ["They are sleeping.","He is always laughing.","What are you doing?"], + "bad": ["He had been playing since morning.","It was a good day.","I love to read."] }, { "instructions": qsTr("Place the PRESENT PERFECT WORDS to the right and others to the left"), "image": "Present Perfect Tense", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", - "good": ["He has gone","She has eaten","He has done","I have eaten","He has shown","He has slept"], - "bad": ["I studying","between","He sits","stand","I am dreaming","above"] + "good": ["He has gone.","She has eaten.","He has done.","I have eaten.","He has shown","He has slept."], + "bad": ["I am sleeping.","He is upset.","They were talking.","Milk is good for health.","It is sunny outside.","Cat is under the table."] }, { "instructions": qsTr("Place the PRESENT PERFECT WORDS to the right and others to the left"), "image": "Present Perfect Tense", - "maxNumberOfGood": 6, - "maxNumberOfBad": 6, + "maxNumberOfGood": 5, + "maxNumberOfBad": 4, "prefix": "", - "good": ["He has gone","She has eaten","He has done","I have eaten","He has shown","He has slept"], - "bad": ["I studying","between","He sits","stand","I am dreaming","above"] + "good": ["Have you slept?","She has eaten.","He has done,","I have eaten.","He has shown."], + "bad": ["I am busy.","He is my best friend.","The dog is hungry.","Today is sunny.","I am dreaming.","I had a mamgo."] }, { "instructions": qsTr("Place the PRESENT PERFECT WORDS to the right and others to the left"), "image": "Present Perfect Tense", + "maxNumberOfGood": 2, + "maxNumberOfBad": 4, + "prefix": "", + "good": ["I have just finished my work.","He has read that book."], + "bad": ["He had not eaten his meal.","I have been playing since morning.","I like apples.","He is running."] + }, + { + "instructions": qsTr("Place the PAST TENSE WORDS to the right and others to the left"), + "image": "Past Tense", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", - "good": ["He has gone","She has eaten","He has done","I have eaten","He has shown","He has slept"], - "bad": ["I studying","between","He sits","stand","I am dreaming","above"] + "good": ["He went to the school.","I played cricket.","I did my work.","He ate a sandwich.","I loved music.","She drank the juice."], + "bad": ["The ball is under the table.","We are friends.","I like his work.","He loves pizza.","I like GCompris.","I am afraid of lizard."] + }, + { + "instructions": qsTr("Place the PAST TENSE WORDS to the right and others to the left"), + "image": "Past Tense", + "maxNumberOfGood": 5, + "maxNumberOfBad": 4, + "prefix": "", + "good": ["We met him.","I did my job.","We saw a good film yesterday.","She finished her work.","He played the piano."], + "bad": ["I am reading this book.","The red kitten is mine.","I am playing soccer.","I like his work."] }, { "instructions": qsTr("Place the PAST TENSE WORDS to the right and others to the left"), "image": "Past Tense", + "maxNumberOfGood": 4, + "maxNumberOfBad": 2, + "prefix": "", + "good": ["He went to the school.","I played cricket.","I did my work.","He ate a sandwich."], + "bad": ["The glass is on the table.","Today is his birthday."] + }, + { + "instructions": qsTr("Place the PAST CONTINUOUS WORDS to the right and others to the left"), + "image": "Past Continuous Tense", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", - "good": ["He went","I played","I did","He runs","I loved","She drank"], - "bad": ["under","I play","go","He loves","on","and"] + "good": ["We were going.","I was playing.","He was doing his work.","He was running.","I was drinking milk.","I was eating cookies."], + "bad": ["I am playing.","I ate my food.","I bought vegetables.","I had been sleeping since morning.","I am cooking.","He sells vegetables."] }, { "instructions": qsTr("Place the PAST CONTINUOUS WORDS to the right and others to the left"), "image": "Past Continuous Tense", + "maxNumberOfGood": 4, + "maxNumberOfBad": 5, + "prefix": "", + "good": ["It was raining.","They were swimming.","Were they laughing?","Was she crying?"], + "bad": ["I am singing at the concert.","They won the match.","We are washing clothes.","I had a fish.","I don't eat spinach."] + }, + { + "instructions": qsTr("Place the PAST CONTINUOUS WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 3, + "maxNumberOfBad": 3, + "prefix": "", + "good": ["We were walking.","They were climbing a hill.","She was not working."], + "bad": ["We climbed the mountain.","I am driving a car.","I love music."] + }, + { + "instructions": qsTr("Place the PAST PERFECT WORDS to the right and others to the left"), + "image": "Past perfect Tense", + "maxNumberOfGood": 6, + "maxNumberOfBad": 6, + "prefix": "", + "good": ["We had swum.","They had played voleyball.","When they arrived, we had already started cooking. ","Had they arrived?","The train had just left when I arrived.","We had had that car for ten years."], + "bad": ["I like his work.","He loves pizza.","I like GCompris.","I am afraid of lizard.","He is busy>/font> today.","I will go there tomorrow."] + }, + { + "instructions": qsTr("Place the PAST PERFECT WORDS to the right and others to the left"), + "image": "Past Perfect Tense", + "maxNumberOfGood": 4, + "maxNumberOfBad": 5, + "prefix": "", + "good": ["She had never seen a bear.","He had not slept well.","My car had been repaird by John.","I had cleaned it off the door."], + "bad": ["She is a good dancer.","We are going for his birthday.","We are tired.","I like the sunrise.","We go for running everyday."] + }, + { + "instructions": qsTr("Place the PAST PERFECT WORDS to the right and others to the left"), + "image": "Past Perfect Tense", + "maxNumberOfGood": 3, + "maxNumberOfBad": 3, + "prefix": "", + "good": ["The show had started before we arrived.","I wish I had not been so late.","I had eaten my dinner before time."], + "bad": ["They lost their way.","We will play handball.","He works hard."] + }, + { + "instructions": qsTr("Place the SIMPLE FUTURE WORDS to the right and others to the left"), + "image": "Simple future Tense", + "maxNumberOfGood": 5, + "maxNumberOfBad": 7, + "prefix": "", + "good": ["I will buy a computer.","Will you go to visit him?","It will rain tonight.","I shall play football.","I will watch the film"], + "bad": ["I am going for a walk.","Can I help you?","It is so cold.","Stop fighting!","He is a doctor.","I am not well","The clothes are dirty."] + }, + { + "instructions": qsTr("Place the SIMPLE FUTURE WORDS to the right and others to the left"), + "image": "Simple future Tense", + "maxNumberOfGood": 5, + "maxNumberOfBad": 4, + "prefix": "", + "good": ["Will you help him?","Will you cook food?","John will finish the work.","I will get it.","I won't go alone."], + "bad": ["Could you open the door?","I don't open the door.","He has a headache.","We are going in the car."] + }, + { + "instructions": qsTr("Place the SIMPLE FUTURE WORDS to the right and others to the left"), + "image": "Simple future Tense", + "maxNumberOfGood": 3, + "maxNumberOfBad": 3, + "prefix": "", + "good": ["I shall wash the clothes.","I will eat fish.","I will get you some tea."], + "bad": ["It is 6:30.","I am good at tennis.","When did you come?"] + },, + { + "instructions": qsTr("Place the FUTURE CONTINUOUS WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 6, + "maxNumberOfBad": 6, + "prefix": "", + "good": ["I will not be waiting for you.","He will not flying a kite.","It will be raining tomorrow.","They won't be watching T.V.","What will you be doing?","She will not be sleeping."], + "bad": ["Are you dancing?","I am at park.","Which one is your car?","These are my shoes.","She is my sister.","Where were you born?."] + }, + { + "instructions": qsTr("Place the FUTURE CONTINUOUS WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 4, + "maxNumberOfBad": 5, + "prefix": "", + "good": ["I will be baking a cake.","Will you be going to market?","She will be having a bath.","John won't be sleeping now."], + "bad": ["You can do it.","We study every afternoon.","This is my car.","How old are you?"] + }, + { + "instructions": qsTr("Place the FUTURE CONTINUOUS WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 3, + "maxNumberOfBad": 3, + "prefix": "", + "good": ["I am going to be throwing a party.","I will be hosing off my car.","He will be working."], + "bad": ["You did great.","Don't give up.","Where does he live?"] + }, + { + "instructions": qsTr("Place the FUTURE PERFECT WORDS to the right and others to the left"), + "image": "Past Continuous Tense", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", - "good": ["We were going","I was playing","He was doing","He was running","I was drinking","I was eating"], - "bad": ["roam","fix","brought","washed","wash","sell"] + "good": ["I will have finished this book.","She will have cooked food.","It will have stopped raining","Will it have got colder?","Will we have watched the film?","When will you have finished?"], + "bad": ["He accepted the job","What does he work?","How is the food here?","Let me solve this problem.","","He sells vegetables."] + }, + { + "instructions": qsTr("Place the FUTUR PERFECT WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 5, + "maxNumberOfBad": 4, + "prefix": "", + "good": ["When will you have read the book?","We will have cleaned the house.","John will have eaten the cake.","The train will have left.","The guests will have arrived."], + "bad": ["What are you listening to?","I can't ride a bike","The sky is blue.","Tomorrow is Monday."] + }, + { + "instructions": qsTr("Place the FUTURE PERFECT WORDS to the right and others to the left"), + "image": "Past Continuous Tense", + "maxNumberOfGood": 3, + "maxNumberOfBad": 3, + "prefix": "", + "good": ["She is going to have had my book.","I will have been in London.","They will have completed the project."], + "bad": ["These cushions are new.","I have my exam tomorrow.","The baby is smiling."] } ] } ] } diff --git a/src/activities/categorization_words/resource/board/categ-en/category3.qml b/src/activities/categorization_words/resource/board/categ-en/category3.qml index a0ad51dc5..ee30b01d6 100644 --- a/src/activities/categorization_words/resource/board/categ-en/category3.qml +++ b/src/activities/categorization_words/resource/board/categ-en/category3.qml @@ -1,254 +1,254 @@ /* GCompris * * Copyright (C) 2016 Divyam Madaan * * Authors: * Divyam Madaan * * 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.0 QtObject { property string imagesPrefix: "qrc:/gcompris/src/activities/categorization/resource/images/alphabets/" property variant levels: [ { "name": qsTr("Pronouns"), "categoryLesson": qsTr("A pronoun is a word which replaces other words to avoid repetition. We can class them in different categories.
-1. Personal pronouns: A personnal pronoun is a word which replaces a person or an object.
+1. Personal pronouns: A personal pronoun is a word which replaces a person or an object.
The blue word is personal pronoun in these cases:
I go to swim.
He is intelligent.
They are tired.

2. Reflexive Pronouns: A reflexive pronoun is used when the object of a sentence is the same as the subject.
The blue word is reflexive pronoun in these cases:
They cooked themselves.
We did the job ourselves.
I bought the fruits myself.

3. Possessive pronouns: A possessive pronoun is a little word used to indicate possesion.
The blue word is possesive pronoun in these cases:
This book is mine
Is this ball yours?
He lost his pen.

4. Demonstrative pronouns: A demonstrative pronoun points somebody or something in a phrase and replaces it.
The blue word is demonstrative pronoun in these cases:
This is my book.
I ate those apples.
That place is far away.

5. Indefinite Pronouns: A indefinite pronoun refers to non-specific beings, objects, or places.
The blue word is indefinite pronoun in these cases:
Everyone was late.
Someone stole my pen.
Either will do.

6. Relative pronouns: A relative pronoun is used to connect a relative clause to the main clause in a sentence.
The blue word is relative pronoun in these cases:
I ate the fruits that I bought yesterday.
I am looking for someone who can help me.
This is the park where they will come.

7.Interrogative pronoun: A interrogative pronoun is a word which is used to ask a question.
The blue word is interrogative pronoun in these cases:
Whose eraser is this?
Which your favorite team?
Where were you?" ), "image": imagesPrefix + "alphabets.jpg", "content": [ { "instructions": qsTr("Place the PERSONAL PRONOUNS to the right and others to the left"), "image": "Personal Pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["I study maths.","We play football","It is raining.","They speak English.","She is eating.","You were sleeping."], "bad": ["Who was reading?","Daniel was playing.","George went outside.","Do it yourself.","The blue car.","Some milk is left."] }, { "instructions": qsTr("Place the PERSONAL PRONOUNS to the right and others to the left"), "image": "Personal Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["It's getting late.","He loves football","I am writing.","We were laughing.","They didn't play."], "bad": ["Whose pen is it?","John went.","The door was open.","Who went to school yesterday?"] }, { "instructions": qsTr("Place the PERSONAL PRONOUNS to the right and others to the left"), "image": "Personal Pronouns", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", "good": ["It's snowing","Do you need help?","Have you seen him today?"], "bad": ["When is the meeting?","His work was complete.","Where's the pencil"] }, { "instructions": qsTr("Place the REFLEXIVE PRONOUNS to the right and others to the left"), "image": "Reflexive Pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["She did the work herself","Can you talk to him yourself?","The door opened itself","I made the food myself","You should do your work yourself","I saw myself in the mirror."], "bad": ["Who cooked the food?","They were laughing.","John played.","I read a book.","She bought fruits.","A wonderful old clock."] }, { "instructions": qsTr("Place the REFLEXIVE PRONOUNS to the right and others to the left"), "image": "Reflexive Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["We painted the wall ourselves","Do your work yourself.","The door opened itself.","She saved herself.","They looked after themselves."], "bad": ["I have some friends.","Would you like some bread.","She ate all apples.","He did his job."] }, { "instructions": qsTr("Place the REFLEXIVE PRONOUNS to the right and others to the left"), "image": "Reflexive Pronouns", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", "good": ["We blamed ourselves.","Did you hurt yourself?","They looked after themselves."], "bad": ["He writes properly.","He didn't drink milk.","We studied maths."] }, { "instructions": qsTr("Place the POSSESSIVE PRONOUNS to the right and others to the left"), "image": "Possessive Pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["This is her birthday.","Its your ball.","This is my cat.","She bought her a dress.","He lost his watch.","The black dress is mine."], "bad": ["He writes properly.","She cooks well","I am a singer","I lost my book","They gifted me a watch","I love swimming"] }, { "instructions": qsTr("Place the POSSESSIVE PRONOUNS to the right and others to the left"), "image": "Possessive Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["The bag is theirs.","I liked his singing.","Susan is a friend of mine.","His name was Alex.","Their eyes were paining."], "bad": ["He writes poems.","They play volleyball.","We cooked meal.","Its raining outside."] }, { "instructions": qsTr("Place the POSSESSIVE PRONOUNS to the right and others to the left"), "image": "Possessive Pronouns", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", "good": ["He took his pen.","The dog wagged his tail.","My car is bigger."], "bad": ["He loves nature.","They played well.","George is singing."] }, { "instructions": qsTr("Place the DEMONSTRATIVE PRONOUNS to the right and others to the left"), "image": "Demonstrative Pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["This tastes good.","That is beautiful.","That book is good.","I'll buy these.","Is this yours?","That is incorrect."], "bad": ["He was running.","I drank milk.","They complained.","We did well.","I did the work myself.","He brushes his teeth."] }, { "instructions": qsTr("Place the DEMONSTRATIVE PRONOUNS to the right and others to the left"), "image": "Demonstrative Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["I wanted that.","Is that Jim?","I own those.","Did you see this?","I read this book."], "bad": ["He swims.","Ben writes beautifully.","They won the match.","We sco#3bb0de well in exams."] }, { "instructions": qsTr("Place the DEMONSTRATIVE PRONOUNS to the right and others to the left"), "image": "Demonstrative Pronouns", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", "good": ["These are blue pens.","This is an apple.","Those were my fruits."], "bad": ["They went home.","The #3bb0de pen was mine.","I am sleeping."] }, { "instructions": qsTr("Place the INDEFINITE PRONOUNS to the right and others to the left"), "image": "Indefinite Pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["Somebody ate my sandwich.","None is interested.","Everyone played football.","Either choice has its advantages.","I don't know any of the answers.","Everything happens for a reason."], "bad": ["He lost his dog.","Jone likes listening music.","She is a dancer.","He speaks good English.","Mom has went to market.","I am cooking food."] }, { "instructions": qsTr("Place the INDEFINITE PRONOUNS to the right and others to the left"), "image": "Indefinite Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["Everybody enjoyed the concert.","Nobody came.","Anyone can play this game.","Very few came for the class.","All were late for the party."], "bad": ["Sun rises from east.","I drive car.","They lost their keys","He loves yellow color."] }, { "instructions": qsTr("Place the INDEFINITE PRONOUNS to the right and others to the left"), "image": "Indefinite Pronouns", "maxNumberOfGood": 3, "maxNumberOfBad": 3, "prefix": "", "good": ["Everyone enjoyed the food.","Is anyone available today?","Few came to the wedding."], "bad": ["They won the contest.","An apple a day keeps doctor away.","We went on holidays."] }, { "instructions": qsTr("Place the RELATIVE PRONOUNS to the right and others to the left"), "image": "Relative pronouns", "maxNumberOfGood": 6, "maxNumberOfBad": 6, "prefix": "", "good": ["The car which I drive is old","This is not the icecreamthatI like.","That's the dog who doesn't like me.","The man who I saw was a thief.","These are some books which I love.","This is the place where I ate lunch."], "bad": ["These are not my shoes.","Did you hear her poem?","Jim works slow.","I didn't go to the party.","I love pizza.","This is my computer."] }, { "instructions": qsTr("Place the RELATIVE PRONOUNS to the right and others to the left"), "image": "Relative pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["The car which hit me was yellow.","The car that I drive is old.","This is the cake that I baked.","I will open whichever package arrives fast.","The person who called me is my best friend."], "bad": ["His shoes are dirty.","He drives slow.","I completed my work myself.","The class passed the test."] }, { "instructions": qsTr("Place the RELATIVE PRONOUNS to the right and others to the left"), "image": "Relative pronouns", "maxNumberOfGood": 2, "maxNumberOfBad": 4, "prefix": "", "good": ["Katie, who is very kind is my friend","Whoever spilled the milk will have to clean it."], "bad": ["It was sunny.","She went to the doctor.","That's my umbrella.","I bought a new dog."] }, { "instructions": qsTr("Place the INTERROGATIVE PRONOUNS to the right and others to the left"), "image": "Interrogative Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 7, "prefix": "", "good": ["Who will design the logo?","Whose pen is it?","What will you do there?","Whom did you ask the details?","Which place is it?"], "bad": ["I play guitar.","They like watching movies.","He topped the class.","Sun sets in the west.","Exercises keep fit.","Phil is a good boy.","Diana is my best friend."] }, { "instructions": qsTr("Place the INTERROGATIVE PRONOUNS to the right and others to the left"), "image": "Interrogative Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 4, "prefix": "", "good": ["Which is your favorite color?","Whose pen is this?","What is your name?","What are you talking about?","Whose camera is this?"], "bad": ["I play alone.","This is my book.","They played well.","I am going."] }, { "instructions": qsTr("Place the INTERROGATIVE PRONOUNS to the right and others to the left"), "image": "Interrogative Pronouns", "maxNumberOfGood": 5, "maxNumberOfBad": 7, "prefix": "", "good": ["Who won the race?","Whom shall we ask?","Which of these do you prefer?"], "bad": ["He went to the stadium.","Do you play?","She is dancing."] } ] } ] } diff --git a/src/activities/categorization_words/resource/board/uparrow.svg b/src/activities/categorization_words/resource/board/uparrow.svg deleted file mode 100644 index 3ed1a0139..000000000 --- a/src/activities/categorization_words/resource/board/uparrow.svg +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - - - - - - - - - diff --git a/src/activities/categorization_words/resource/downArrow.svg b/src/activities/categorization_words/resource/downArrow.svg deleted file mode 100644 index c762ccf16..000000000 --- a/src/activities/categorization_words/resource/downArrow.svg +++ /dev/null @@ -1,314 +0,0 @@ - - - - Go Down Orange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Go Down Orange Button Tango Style - 2012-01-09T19:10:10 - Go Down Orange (Tango Style) - https://openclipart.org/detail/166961/go-down-orange-by-rygle - - - rygle - - - - - arrow - button - buttons - down - forward - glossy - go - next - tango - under - ▼ - ↓ - - - - - - - - - - - diff --git a/src/activities/categorization_words/resource/upArrow.svg b/src/activities/categorization_words/resource/upArrow.svg deleted file mode 100644 index 7714b293a..000000000 --- a/src/activities/categorization_words/resource/upArrow.svg +++ /dev/null @@ -1,317 +0,0 @@ - - - - Go Up Orange - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - Openclipart - - - Go Up Orange Button Tango Style - 2012-01-09T19:23:48 - Go Up Orange (Tango Style) - https://openclipart.org/detail/166962/go-up-orange-by-rygle - - - rygle - - - - - ^ - arrow - back - button - buttons - glossy - go - previous - start - tango - up - ▲ - ↑ - - - - - - - - - - -