This revision currently contains the diffs for ascending_order and alphabetical_order activity. On acceptance of proposals, they will be implemented as planned.
Details
Diff Detail
- Repository
- R2 GCompris
- Lint
Lint Skipped - Unit
Unit Tests Skipped
There should not be all the changes, you should do the diff from the ascending_order branch, not the master (and write it in the description so other people know the start branch)
git apply ascending.diff
ascending.diff:398: trailing whitespace.
<polygon fill="#BAD806" points="497.354,926.124 506.997,955.802 538.203,955.802 512.957,974.145 522.6,1003.823
ascending.diff:400: trailing whitespace.
<polygon fill="#5A0E2E" points="548.737,926.124 558.381,955.802 589.587,955.802 564.34,974.145 573.984,1003.823
ascending.diff:402: trailing whitespace.
<polygon fill="#653BF4" points="600.066,926.124 609.709,955.802 640.915,955.802 615.669,974.145 625.312,1003.823
ascending.diff:404: trailing whitespace.
<polygon fill="#99A372" points="651.415,926.124 661.058,955.802 692.264,955.802 667.018,974.145 676.661,1003.823
ascending.diff:406: trailing whitespace.
<polygon fill="#F068F6" points="702.775,926.124 712.418,955.802 743.624,955.802 718.378,974.145 728.021,1003.823
error: patch failed: src/activities/alphabetical_order/alphabetical_order.svg:1
error: src/activities/alphabetical_order/alphabetical_order.svg: patch does not apply
error: patch failed: src/activities/ascending_order/ascending_order.svg:1
error: src/activities/ascending_order/ascending_order.svg: patch does not apply
Note that there are no reason to have changes on the icons
src/activities/alphabetical_order/ActivityInfo.qml | ||
---|---|---|
37 | reading |
I commited the changes without the hints and the icons changes in https://commits.kde.org/gcompris/ade955e042ceb9774459a1181382159606a31502
The score sometimes overrides with the numbers/letters, it can be placed besides the OK button, it should be fine.
The hints are displayed behind the letters/numbers on small screens.