|
[-]
[+]
|
Changed |
harbour-math-teacher.spec
|
|
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/harbour-math-teacher.qml
^
|
| @@ -38,7 +38,7 @@
property int coins: 0 // Global property for money
property int level_points : 0 // Normally increase when you get a point when answering right
property int level: 0 //
- property int questions_count: 5
+ property int questions_count: 4
property string asset_path : "./assets/asset1/" //Asset number
property string player_name: "Horse rider" // Default player name
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/pages/About.qml
^
|
| @@ -69,7 +69,7 @@
margins: Theme.paddingLarge
}
//: The name of the app followed with a version number
- text: {qsTr("Math teacher, version") + " 0.0.7"}
+ text: {qsTr("Math teacher, version") + " 0.0.8"}
}
SectionHeader { text: qsTr("Idea") }
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/pages/ChangePlayer.qml
^
|
| @@ -76,6 +76,7 @@
if (!delete_mode) {
Mysets.updateActivePlayer(index)
Mysets.loadSettings()
+ questions_count = Math.round(4 + Math.log(level+1) * 5);
pageStack.pop()
}
else {
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/pages/QuizPage.qml
^
|
| @@ -117,7 +117,8 @@
time_slider.value = 0;
questions_count = questions_count - 1;
if (questions_count < 1) {
- questions_count = Math.max(5, level *5);
+ questions_count = Math.round(4 + Math.log(level+1) * 5);
+ //console.log("Fun page", questions_count)
pageStack.push(Qt.resolvedUrl("FunPage.qml"))
}
else if (MyFunc.level_check(level, level_points) > level) {
@@ -211,6 +212,15 @@
}
}
+ ProgressBar {
+ width: parent.width
+ //: Progress bar shows when you reach the Fun page next time
+ label:qsTr("Next fun")
+ minimumValue: 0
+ maximumValue: Math.round(4 + Math.log(level+1) * 5)
+ value: maximumValue - questions_count
+ }
+
Timer {
id: break_timer
running: false
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/pages/functions.js
^
|
| @@ -162,10 +162,10 @@
switch (_level) {
case 0:
- if (_level_points > 7) {return _level + 1};
+ if (_level_points > 11) {return _level + 1};
break;
case 1:
- if (_level_points > 13) {return _level + 1};
+ if (_level_points > 17) {return _level + 1};
break;
case 2:
if (_level_points > 23) {return _level + 1};
@@ -189,7 +189,7 @@
if (_level_points > 79) {return _level + 1};
break;
case 9:
- if (_level_points > 87) {return _level + 1};
+ if (_level_points > 89) {return _level + 1};
break;
default:
return 0
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/qml/pages/settings.js
^
|
| @@ -33,7 +33,7 @@
coins = 0;
level_points = 0;
level = 0;
- questions_count = 5;
+ questions_count = 4;
}
// player_name
tx.executeSql('DELETE FROM Settings WHERE subname = ? OR valte = ?', [ _player, _player ])
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/rpm/harbour-math-teacher.changes
^
|
| @@ -11,6 +11,10 @@
# * date Author's Name <author's email> version-release
# - Summary of changes
+* Sat Oct 26 2019 Riku Lahtinen <rikul.lajolla@kiu.as> 0.0.8-1
+- Fun page indicator added
+- Fun page is now easier to reach
+
* Tue Oct 22 2019 Riku Lahtinen <rikul.lajolla@kiu.as> 0.0.7-1
- Fun page text size bug fix
- Add Swedish translation
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/rpm/harbour-math-teacher.spec
^
|
| @@ -9,7 +9,7 @@
# << macros
Summary: Math teacher application
-Version: 0.0.7
+Version: 0.0.8
Release: 1
Group: Qt/Qt
License: LICENSE
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/rpm/harbour-math-teacher.yaml
^
|
| @@ -1,6 +1,6 @@
Name: harbour-math-teacher
Summary: Math teacher application
-Version: 0.0.7
+Version: 0.0.8
Release: 1
# The contents of the Group field should be one of the groups listed here:
# https://github.com/mer-tools/spectacle/blob/master/data/GROUPS
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/translations/harbour-math-teacher-fi.ts
^
|
| @@ -202,5 +202,10 @@
<source>Coins</source>
<translation>Kolikot</translation>
</message>
+ <message>
+ <source>Next fun</source>
+ <extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
+ <translation>Seuraava huvi</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/translations/harbour-math-teacher-fr.ts
^
|
| @@ -202,5 +202,10 @@
<source>Coins</source>
<translation>Pièces</translation>
</message>
+ <message>
+ <source>Next fun</source>
+ <extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/translations/harbour-math-teacher-sv.ts
^
|
| @@ -202,5 +202,10 @@
<source>Coins</source>
<translation>Mynt</translation>
</message>
+ <message>
+ <source>Next fun</source>
+ <extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
+ <translation>Nästa roliga</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/translations/harbour-math-teacher-zh_cn.ts
^
|
| @@ -202,5 +202,10 @@
<source>Coins</source>
<translation>硬币</translation>
</message>
+ <message>
+ <source>Next fun</source>
+ <extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
+ <translation>再次来到 fun 页!</translation>
+ </message>
</context>
</TS>
|
|
[-]
[+]
|
Changed |
harbour-math-teacher-0.0.8.tar.bz2/translations/harbour-math-teacher.ts
^
|
| @@ -202,5 +202,10 @@
<source>Coins</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <source>Next fun</source>
+ <extracomment>Progress bar shows when you reach the Fun page next time</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
</context>
</TS>
|
