diff --git a/src/activities/magic-hat-minus/MagicHat.qml b/src/activities/magic-hat-minus/MagicHat.qml --- a/src/activities/magic-hat-minus/MagicHat.qml +++ b/src/activities/magic-hat-minus/MagicHat.qml @@ -65,7 +65,7 @@ property GCSfx audioEffects: activity.audioEffects property alias bar: bar property var levels: activity.datasetLoader.item.data - property var maxValue: activity.datasetLoader.item.maxValue + property int maxValue: activity.datasetLoader.item.maxValue property alias bonus: bonus property alias hat: theHat property alias introductionText: introText diff --git a/src/activities/magic-hat-minus/StarsBar.qml b/src/activities/magic-hat-minus/StarsBar.qml --- a/src/activities/magic-hat-minus/StarsBar.qml +++ b/src/activities/magic-hat-minus/StarsBar.qml @@ -32,7 +32,6 @@ property bool authorizeClick: false property int coefficient: 1 property bool coefficientVisible: false - property var maxRange property int starsSize property string backgroundColor property string starsColor: "1" @@ -46,7 +45,8 @@ GCText { id: text visible: item.coefficientVisible - text: qsTr("%1%2").arg(item.coefficient).arg("x") + //: text displaying coefficient with which the set of stars is to be multiplied along with multipli. + text: qsTr("%1x").arg(item.coefficient) fontSizeMode: Text.HorizontalFit width: rowlayout.width / 10 color: "white" diff --git a/src/activities/magic-hat-minus/resource/1/Data.qml b/src/activities/magic-hat-minus/resource/1/Data.qml --- a/src/activities/magic-hat-minus/resource/1/Data.qml +++ b/src/activities/magic-hat-minus/resource/1/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 5") + objective: qsTr("Learn to calculate remaining stars up to 5") difficulty: 1 property int maxValue: 10 data: [ diff --git a/src/activities/magic-hat-minus/resource/2/Data.qml b/src/activities/magic-hat-minus/resource/2/Data.qml --- a/src/activities/magic-hat-minus/resource/2/Data.qml +++ b/src/activities/magic-hat-minus/resource/2/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 10") + objective: qsTr("Learn to calculate remaining stars up to 10") difficulty: 2 property int maxValue: 10 data: [ diff --git a/src/activities/magic-hat-minus/resource/3/Data.qml b/src/activities/magic-hat-minus/resource/3/Data.qml --- a/src/activities/magic-hat-minus/resource/3/Data.qml +++ b/src/activities/magic-hat-minus/resource/3/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 30") + objective: qsTr("Learn to calculate remaining stars up to 30") difficulty: 3 property int maxValue: 10 data: [ diff --git a/src/activities/magic-hat-minus/resource/4/Data.qml b/src/activities/magic-hat-minus/resource/4/Data.qml --- a/src/activities/magic-hat-minus/resource/4/Data.qml +++ b/src/activities/magic-hat-minus/resource/4/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 100 with coefficients") + objective: qsTr("Learn to calculate remaining stars up to 100 with coefficients") difficulty: 4 property int maxValue: 100 data: [ diff --git a/src/activities/magic-hat-minus/resource/5/Data.qml b/src/activities/magic-hat-minus/resource/5/Data.qml --- a/src/activities/magic-hat-minus/resource/5/Data.qml +++ b/src/activities/magic-hat-minus/resource/5/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 1000 with coefficients") + objective: qsTr("Learn to calculate remaining stars up to 1000 with coefficients") difficulty: 5 property int maxValue: 1000 data: [ diff --git a/src/activities/magic-hat-minus/resource/6/Data.qml b/src/activities/magic-hat-minus/resource/6/Data.qml --- a/src/activities/magic-hat-minus/resource/6/Data.qml +++ b/src/activities/magic-hat-minus/resource/6/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate remaining stars upto 1000 with coefficients") + objective: qsTr("Learn to calculate remaining stars up to 1000 with coefficients") difficulty: 6 property int maxValue: 10000 data: [ diff --git a/src/activities/magic-hat-plus/resource/1/Data.qml b/src/activities/magic-hat-plus/resource/1/Data.qml --- a/src/activities/magic-hat-plus/resource/1/Data.qml +++ b/src/activities/magic-hat-plus/resource/1/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 5") + objective: qsTr("Learn to calculate total stars up to 5") difficulty: 1 property int maxValue: 5 data: [ diff --git a/src/activities/magic-hat-plus/resource/2/Data.qml b/src/activities/magic-hat-plus/resource/2/Data.qml --- a/src/activities/magic-hat-plus/resource/2/Data.qml +++ b/src/activities/magic-hat-plus/resource/2/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 10") + objective: qsTr("Learn to calculate total stars up to 10") difficulty: 2 property int maxValue: 10 data: [ diff --git a/src/activities/magic-hat-plus/resource/3/Data.qml b/src/activities/magic-hat-plus/resource/3/Data.qml --- a/src/activities/magic-hat-plus/resource/3/Data.qml +++ b/src/activities/magic-hat-plus/resource/3/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 30") + objective: qsTr("Learn to calculate total stars up to 30") difficulty: 3 property int maxValue: 30 data: [ diff --git a/src/activities/magic-hat-plus/resource/4/Data.qml b/src/activities/magic-hat-plus/resource/4/Data.qml --- a/src/activities/magic-hat-plus/resource/4/Data.qml +++ b/src/activities/magic-hat-plus/resource/4/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 100 with coefficients") + objective: qsTr("Learn to calculate total stars up to 100 with coefficients") difficulty: 4 property int maxValue: 100 data: [ diff --git a/src/activities/magic-hat-plus/resource/5/Data.qml b/src/activities/magic-hat-plus/resource/5/Data.qml --- a/src/activities/magic-hat-plus/resource/5/Data.qml +++ b/src/activities/magic-hat-plus/resource/5/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 1000 with coefficients") + objective: qsTr("Learn to calculate total stars up to 1000 with coefficients") difficulty: 5 property int maxValue: 1000 data: [ diff --git a/src/activities/magic-hat-plus/resource/6/Data.qml b/src/activities/magic-hat-plus/resource/6/Data.qml --- a/src/activities/magic-hat-plus/resource/6/Data.qml +++ b/src/activities/magic-hat-plus/resource/6/Data.qml @@ -23,7 +23,7 @@ import "../../../../core" Dataset { - objective: qsTr("Learn to calculate total stars upto 10000 with coefficients") + objective: qsTr("Learn to calculate total stars up to 10000 with coefficients") difficulty: 6 property int maxValue: 10000 data: [