diff --git a/src/activities/alphabetical_order/ActivityInfo.qml b/src/activities/alphabetical_order/ActivityInfo.qml
--- a/src/activities/alphabetical_order/ActivityInfo.qml
+++ b/src/activities/alphabetical_order/ActivityInfo.qml
@@ -18,17 +18,22 @@
import GCompris 1.0
ActivityInfo {
- name: "alphabetical_order/Alphabetical_order.qml"
- difficulty: 2
- icon: "alphabetical_order/alphabetical_order.svg"
- author: "Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>"
- demo: true
- title: "Alphabetical Order"
- description: qsTr("Arrange the given alphabets in ascending or descending order as instructed")
- //intro: "arrange the alphabets in the correct order by placing an alphabet in it's correct position"
- goal: qsTr("arranging alphabets in ascending or descending order as instructed")
- prerequisite: qsTr("Move, drag and drop using mouse")
- manual: qsTr("You are provided with few alphabets. Drag and Drop the alphabets in its correct position to reorder the numbers in ascending or descending order as instructed")
- section: "math"
- createdInVersion: 8000
+ name: "alphabetical_order/Alphabetical_order.qml"
+ difficulty: 2
+ icon: "alphabetical_order/alphabetical_order.svg"
+ author: "Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>"
+ demo: true
+ //: Activity title
+ title: qsTr("Alphabetical Order")
+ //: Help title
+ description: qsTr("Arrange the given alphabets in ascending or descending order as instructed")
+ //intro: "arrange the alphabets in the correct order by placing an alphabet in it's correct position"
+ //: Help goal
+ goal: qsTr("arranging alphabets in ascending or descending order as instructed")
+ //: Help prerequisite
+ prerequisite: qsTr("Move, drag and drop using mouse")
+ //: Help manual
+ manual: qsTr("You are provided with few alphabets. Drag and Drop the alphabets in its correct position to reorder the numbers in ascending or descending order as instructed")
+ section: "math"
+ createdInVersion: 8000
}
diff --git a/src/activities/alphabetical_order/Alphabetical_order.qml b/src/activities/alphabetical_order/Alphabetical_order.qml
--- a/src/activities/alphabetical_order/Alphabetical_order.qml
+++ b/src/activities/alphabetical_order/Alphabetical_order.qml
@@ -19,7 +19,8 @@
* along with this program; if not, see .
*/
-import QtQuick 2.1
+import QtQuick 2.6
+import GCompris 1.0
import "../../core"
import "../ascending_order"
diff --git a/src/activities/alphabetical_order/alphabetical_order.svg b/src/activities/alphabetical_order/alphabetical_order.svg
--- a/src/activities/alphabetical_order/alphabetical_order.svg
+++ b/src/activities/alphabetical_order/alphabetical_order.svg
@@ -1,334 +1,334 @@
-
-
-
-
+
+
+
+
diff --git a/src/activities/ascending_order/ActivityInfo.qml b/src/activities/ascending_order/ActivityInfo.qml
--- a/src/activities/ascending_order/ActivityInfo.qml
+++ b/src/activities/ascending_order/ActivityInfo.qml
@@ -18,17 +18,22 @@
import GCompris 1.0
ActivityInfo {
- name: "ascending_order/Ascending_order.qml"
- difficulty: 2
- icon: "ascending_order/ascending_order.svg"
- author: "Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>"
- demo: true
- title: qsTr("Ascending and Descending Order")
- description: qsTr("Arrange the given numbers in ascending or descending order as instructed")
-// intro: "arrange the numbers in the correct order by placing a number in it's correct position"
- goal: qsTr("arranging numbers in ascending or descending order as instructed")
- prerequisite: qsTr("Move, drag and drop using mouse")
- manual: qsTr("You are provided with few numbers. Drag and Drop the numbers in its correct position to reorder the numbers in ascending or descending order as instructed")
- section: "math"
- createdInVersion: 8000
+ name: "ascending_order/Ascending_order.qml"
+ difficulty: 2
+ icon: "ascending_order/ascending_order.svg"
+ author: "Rudra Nil Basu <rudra.nil.basu.1996@gmail.com>"
+ demo: true
+ //: Activity title
+ title: qsTr("Ascending and Descending Order")
+ //: Help title
+ description: qsTr("Arrange the given numbers in ascending or descending order as instructed")
+ //: intro: "arrange the numbers in the correct order by placing a number in it's correct position"
+ //: Help goal
+ goal: qsTr("arranging numbers in ascending or descending order as instructed")
+ //: Help prerequisite
+ prerequisite: qsTr("Move, drag and drop using mouse")
+ //: Help manual
+ manual: qsTr("You are provided with few numbers. Drag and Drop the numbers in its correct position to reorder the numbers in ascending or descending order as instructed")
+ section: "math"
+ createdInVersion: 8000
}
diff --git a/src/activities/ascending_order/Ascending_order.qml b/src/activities/ascending_order/Ascending_order.qml
--- a/src/activities/ascending_order/Ascending_order.qml
+++ b/src/activities/ascending_order/Ascending_order.qml
@@ -18,7 +18,7 @@
* 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 2.6
import GCompris 1.0
import "../../core"
@@ -54,6 +54,7 @@
property alias bonus: bonus
property alias boxes: boxes
property alias flow: flow
+ property alias hints: hints
property alias container: container
property alias instruction: instruction
property real ratio: ApplicationInfo.ratio
@@ -88,6 +89,35 @@
}
}
+ GCText {
+ id: hints
+ wrapMode: TextEdit.WordWrap
+ fontSize: tinySize
+ horizontalAlignment: Text.Center
+ anchors.horizontalCenter: parent.horizontalCenter
+ anchors.top: parent.top
+ anchors.topMargin: instruction.height * 1.25
+ width: parent.width * 0.5
+ color: 'white'
+ visible: false
+ text: ""
+ Rectangle {
+ z: -1
+ opacity: 0.8
+ gradient: Gradient {
+ GradientStop { position: 0.0; color: "#000" }
+ GradientStop { position: 0.9; color: "#666" }
+ GradientStop { position: 1.0; color: "#AAA" }
+ }
+ radius: 10
+ border.color: 'black'
+ border.width: 1
+ anchors.centerIn: parent
+ width: parent.width * 1.1
+ height: parent.contentHeight
+ }
+ }
+
Rectangle {
id: container
color: "transparent"
@@ -211,13 +241,14 @@
Bar {
id: bar
- content: BarEnumContent { value: help | home | level }
+ content: BarEnumContent { value: (mode === 'alphabets') ? help | home | level | hint : help | home | level }
onHelpClicked: {
displayDialog(dialogHelp)
}
onPreviousLevelClicked: Activity.previousLevel()
onNextLevelClicked: Activity.nextLevel()
onHomeClicked: activity.home()
+ onHintClicked: hints.visible = !hints.visible
}
Bonus {
diff --git a/src/activities/ascending_order/ascending_order.js b/src/activities/ascending_order/ascending_order.js
--- a/src/activities/ascending_order/ascending_order.js
+++ b/src/activities/ascending_order/ascending_order.js
@@ -48,6 +48,7 @@
if (mode == "alphabets") {
//: list containing all the characters separated by a "/"
var letters = qsTr("a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z")
+ items.hints.text = letters
alphabets = letters.split("/")
}
diff --git a/src/activities/ascending_order/ascending_order.svg b/src/activities/ascending_order/ascending_order.svg
--- a/src/activities/ascending_order/ascending_order.svg
+++ b/src/activities/ascending_order/ascending_order.svg
@@ -1,1857 +1,1857 @@
-
-
-
+
+
+