diff --git a/src/activities/calendar/resource/Tutorial1.qml b/src/activities/calendar/resource/Tutorial1.qml index 21e2dbc27..f8fffcb38 100644 --- a/src/activities/calendar/resource/Tutorial1.qml +++ b/src/activities/calendar/resource/Tutorial1.qml @@ -1,29 +1,29 @@ /* GCompris - Tutorial1.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("January \t February \t March \t April \t May \t June \t July \t August \t September \t October \t November \t December.") } diff --git a/src/activities/calendar/resource/Tutorial2.qml b/src/activities/calendar/resource/Tutorial2.qml index f8113b867..2f2bc06d1 100644 --- a/src/activities/calendar/resource/Tutorial2.qml +++ b/src/activities/calendar/resource/Tutorial2.qml @@ -1,28 +1,28 @@ /* GCompris - Tutorial2.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("Sunday \t Monday \t Tuesday \t Wednesday \t Thusday \t Friday \t Saturday \t") } diff --git a/src/activities/calendar/resource/Tutorial3.qml b/src/activities/calendar/resource/Tutorial3.qml index 7d20389ba..e553ef0a5 100644 --- a/src/activities/calendar/resource/Tutorial3.qml +++ b/src/activities/calendar/resource/Tutorial3.qml @@ -1,28 +1,28 @@ /* GCompris - Tutorial3.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("February has 29 days if the year is a leap year and 28 days if it is not.") } diff --git a/src/activities/calendar/resource/Tutorial4.qml b/src/activities/calendar/resource/Tutorial4.qml index 91f10756f..a852c6841 100644 --- a/src/activities/calendar/resource/Tutorial4.qml +++ b/src/activities/calendar/resource/Tutorial4.qml @@ -1,29 +1,28 @@ /* GCompris - Tutorial4.qml - * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("If an year is divisible by 400 then it is a leap year.\nIf an year is divisible by 100 and not 400 then it is not a leap year.\nIf none of the above cases hold then only the years which are divisible by 4 are leap years.") } diff --git a/src/activities/calendar/resource/Tutorial5.qml b/src/activities/calendar/resource/Tutorial5.qml index afde526a6..ba7d92cd6 100644 --- a/src/activities/calendar/resource/Tutorial5.qml +++ b/src/activities/calendar/resource/Tutorial5.qml @@ -1,32 +1,31 @@ /* GCompris - Tutorial5.qml - * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: "Select Leap year" firstNumber: "2018" secondNumber: "2016" answer: 2016 } diff --git a/src/activities/calendar/resource/Tutorial6.qml b/src/activities/calendar/resource/Tutorial6.qml index b5a2379d9..0c7fd8a64 100644 --- a/src/activities/calendar/resource/Tutorial6.qml +++ b/src/activities/calendar/resource/Tutorial6.qml @@ -1,30 +1,30 @@ /* GCompris - Tutorial6.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { firstNumber: "111" secondNumber: "108" } diff --git a/src/activities/calendar/resource/TutorialBase.qml b/src/activities/calendar/resource/TutorialBase.qml index 7a3eff40f..f1e495435 100644 --- a/src/activities/calendar/resource/TutorialBase.qml +++ b/src/activities/calendar/resource/TutorialBase.qml @@ -1,126 +1,126 @@ /* GCompris - TutorialBase.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import "../../../core" Rectangle { id: tutorialRectangle anchors.fill: parent color: "#80FFFFFF" property alias firstNumber: firstNumber.textLabel property alias secondNumber: secondNumber.textLabel property alias questionText: question.text property int answer GCText { id: question fontSizeMode: Text.Fit fontSize: mediumSize anchors.left: tutorialRectangle.left anchors.leftMargin: parent.height * 0.01 color: "black" horizontalAlignment: Text.AlignLeft width: parent.width height: parent.height wrapMode: Text.WordWrap z: 2 } AnswerButton { id: firstNumber visible: answer textLabel: "" anchors { top: parent.top topMargin: parent.height * 0.3 left: parent.left leftMargin: parent.width * 0.2 } width: parent.width * 0.2 height: parent.height * 0.4 isCorrectAnswer: Number(textLabel) === tutorialRectangle.answer onPressed: { if(isCorrectAnswer) { message.text = qsTr("Great") message.visible = true messageRectangle.visible = true } } } AnswerButton { id: secondNumber textLabel: "" visible: answer anchors { top: parent.top topMargin: parent.height * 0.3 left: parent.left leftMargin: parent.width * 0.65 } width: parent.width * 0.2 height: parent.height * 0.4 isCorrectAnswer: Number(textLabel) === tutorialRectangle.answer onPressed: { if(isCorrectAnswer) { message.text = qsTr("Great") message.visible = true messageRectangle.visible = true } } } Rectangle { id: messageRectangle anchors { horizontalCenter: parent.horizontalCenter top: parent.top topMargin: parent.height * 0.75 } opacity: 0.8 radius: 10 border.width: 6 color: "white" border.color: "#87A6DD" width: parent.width * 1.15 height: parent.height * 0.4 visible: false GCText { id: message anchors { centerIn: parent margins: parent.border.width+1 } text: "" fontSizeMode: Text.Fit fontSize: smallSize color: "black" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter width: parent.width height: parent.height wrapMode: Text.WordWrap z: 2 } } } diff --git a/src/activities/calendar/tutorial_instructions.js b/src/activities/calendar/tutorial_instructions.js index 6788ee3ad..089f73dd6 100644 --- a/src/activities/calendar/tutorial_instructions.js +++ b/src/activities/calendar/tutorial_instructions.js @@ -1,51 +1,51 @@ /* GCompris - tutorial_instructions.js * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * 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 . */ function get() { return [ { "instruction": qsTr("This activity teaches how to use a calendar."), "instructionQml": "" }, { "instruction": qsTr("For every year there are 12 months namely,"), "instructionQml": "qrc:/gcompris/src/activities/calendar/resource/Tutorial1.qml" }, { "instruction": qsTr("For every week there are 7 days namely,"), "instructionQml" : "qrc:/gcompris/src/activities/calendar/resource/Tutorial2.qml" }, { "instruction": qsTr("The number of days in a month are fixed for every year, except for february."), "instructionQml" : "qrc:/gcompris/src/activities/calendar/resource/Tutorial3.qml" }, { "instruction": qsTr("Calculating Leap years."), "instructionQml": "qrc:/gcompris/src/activities/calendar/resource/Tutorial4.qml" }, { "instruction": qsTr("Select the leap year out of the two."), "instructionQml": "qrc:/gcompris/src/activities/calendar/resource/Tutorial5.qml" } ] -} \ No newline at end of file +} diff --git a/src/activities/find_the_day/resource/Tutorial1.qml b/src/activities/find_the_day/resource/Tutorial1.qml index 934ecd50a..606be0bce 100644 --- a/src/activities/find_the_day/resource/Tutorial1.qml +++ b/src/activities/find_the_day/resource/Tutorial1.qml @@ -1,29 +1,29 @@ /* GCompris - Tutorial1.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("We add 5 to the current date, which gives us the new date 20, and since December has 31 days and the new date is less than that. So the answer will be 20 December 2018.") } diff --git a/src/activities/find_the_day/resource/Tutorial2.qml b/src/activities/find_the_day/resource/Tutorial2.qml index a0add3c8c..f56605b40 100644 --- a/src/activities/find_the_day/resource/Tutorial2.qml +++ b/src/activities/find_the_day/resource/Tutorial2.qml @@ -1,28 +1,28 @@ /* GCompris - Tutorial2.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("Since July has 31 days, out of 20 the first 7 days will change the month from July to August. Now we have to add the remaining 20 - 7 = 14 days to 1 August 2018 which will make the final date equal to 14 August 2018") } diff --git a/src/activities/find_the_day/resource/Tutorial3.qml b/src/activities/find_the_day/resource/Tutorial3.qml index b74cb3859..6d3dab4b5 100644 --- a/src/activities/find_the_day/resource/Tutorial3.qml +++ b/src/activities/find_the_day/resource/Tutorial3.qml @@ -1,31 +1,31 @@ /* GCompris - Tutorial3.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("Select the correct option") firstNumber: "16" secondNumber: "14" answer: 16 } diff --git a/src/activities/find_the_day/resource/Tutorial4.qml b/src/activities/find_the_day/resource/Tutorial4.qml index 60f728679..b3cd7f758 100644 --- a/src/activities/find_the_day/resource/Tutorial4.qml +++ b/src/activities/find_the_day/resource/Tutorial4.qml @@ -1,32 +1,31 @@ /* GCompris - Tutorial4.qml - * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import GCompris 1.0 import "../../../core" TutorialBase { questionText: qsTr("Select the correct option") firstNumber: "18" secondNumber: "13" answer: 13 } diff --git a/src/activities/find_the_day/resource/TutorialBase.qml b/src/activities/find_the_day/resource/TutorialBase.qml index 7a3eff40f..f1e495435 100644 --- a/src/activities/find_the_day/resource/TutorialBase.qml +++ b/src/activities/find_the_day/resource/TutorialBase.qml @@ -1,126 +1,126 @@ /* GCompris - TutorialBase.qml * - * Copyright (C) 2019 Deepak Kumar + * Copyright (C) 2019 Akshay Kumar * * Authors: - * Deepak Kumar + * Akshay Kumar * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 3 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, see . */ import QtQuick 2.6 import "../../../core" Rectangle { id: tutorialRectangle anchors.fill: parent color: "#80FFFFFF" property alias firstNumber: firstNumber.textLabel property alias secondNumber: secondNumber.textLabel property alias questionText: question.text property int answer GCText { id: question fontSizeMode: Text.Fit fontSize: mediumSize anchors.left: tutorialRectangle.left anchors.leftMargin: parent.height * 0.01 color: "black" horizontalAlignment: Text.AlignLeft width: parent.width height: parent.height wrapMode: Text.WordWrap z: 2 } AnswerButton { id: firstNumber visible: answer textLabel: "" anchors { top: parent.top topMargin: parent.height * 0.3 left: parent.left leftMargin: parent.width * 0.2 } width: parent.width * 0.2 height: parent.height * 0.4 isCorrectAnswer: Number(textLabel) === tutorialRectangle.answer onPressed: { if(isCorrectAnswer) { message.text = qsTr("Great") message.visible = true messageRectangle.visible = true } } } AnswerButton { id: secondNumber textLabel: "" visible: answer anchors { top: parent.top topMargin: parent.height * 0.3 left: parent.left leftMargin: parent.width * 0.65 } width: parent.width * 0.2 height: parent.height * 0.4 isCorrectAnswer: Number(textLabel) === tutorialRectangle.answer onPressed: { if(isCorrectAnswer) { message.text = qsTr("Great") message.visible = true messageRectangle.visible = true } } } Rectangle { id: messageRectangle anchors { horizontalCenter: parent.horizontalCenter top: parent.top topMargin: parent.height * 0.75 } opacity: 0.8 radius: 10 border.width: 6 color: "white" border.color: "#87A6DD" width: parent.width * 1.15 height: parent.height * 0.4 visible: false GCText { id: message anchors { centerIn: parent margins: parent.border.width+1 } text: "" fontSizeMode: Text.Fit fontSize: smallSize color: "black" horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter width: parent.width height: parent.height wrapMode: Text.WordWrap z: 2 } } } diff --git a/src/activities/find_the_day/tutorial_instructions.js b/src/activities/find_the_day/tutorial_instructions.js index ddc9ac24f..4480267a3 100644 --- a/src/activities/find_the_day/tutorial_instructions.js +++ b/src/activities/find_the_day/tutorial_instructions.js @@ -1,45 +1,45 @@ /* GCompris - tutorial_instructions.js * * Copyright (C) 2019 Akshay Kumar * * Authors: * Akshay Kumar * * 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 . */ function get() { return [ { "instruction": qsTr("This activity teaches students to find the exact date."), "instructionQml": "" }, { "instruction": qsTr("For example if today is 15 December 2019, find the date 5 days after today,"), "instructionQml": "qrc:/gcompris/src/activities/find_the_day/resource/Tutorial1.qml" }, { "instruction": qsTr("What will be the date 20 days after 25 July 2018"), "instructionQml" : "qrc:/gcompris/src/activities/find_the_day/resource/Tutorial2.qml" }, { "instruction": qsTr("What will be the date 5 days after 11 August 2018."), "instructionQml" : "qrc:/gcompris/src/activities/find_the_day/resource/Tutorial3.qml" }, { "instruction": qsTr("What will be the date 25 days after 18 April 2018."), "instructionQml": "qrc:/gcompris/src/activities/find_the_day/resource/Tutorial4.qml" } ] -} \ No newline at end of file +}