Merge branch 'development'

CHANGES.txt

@@ -1,9 +1,22 @@
 Changelog:
-eduActiv8 - 3.80.411-rc:
+eduActiv8 - 4.18.12:
+    - the menu has been replaced with a full screen activity selection screen
+        - this allows to display all activity icons without scrolling
+        - more space for activities since the menu does not take up any screen space while in activity mode
+        - the icons on new menu screen now display progress for each challenge activity
+        - the category and activity icons have been redesigned and scaled up
+        - categories rearranged into sub-groups to display less choices at a time.
+    - theme editing screen added to customize UI and menu colours
+    - a number of new activities added - covering elapsed time as well as negative numbers
+    - new activities on equivalent fractions as well as addition, subtraction, multiplication and division of fractions
+    - a lot of cosmetic fixes across the application
+
+eduActiv8 - 3.80.411:
     - 20 new activities covering fractions, decimals, percentages and ratios - translations required for most languages.
     - 4 new activities covering linear symmetry
     - menu has been slightly redesigned - the activity icons now also have an accompanying icon indicating whether the activity is a simulation/demonstration of a concept or if it is a task that needs solving, or something else.
     - from this version the game will check for updates and will let users know if a new one has been released - update will still have to be downloaded manually - can be disabled from the settings in the login screen. This option may need to be hidden before packaging for any distros - will sort it out with next release.
+
 eduActiv8 - 3.71.115:
     - the feedback mechanism is now implemented in all activities that require completion
     - new section added with 5 new games covering patterns (only in English and Polish at the moment)

CREDITS.txt

@@ -363,6 +363,12 @@ Images for new icons:
     https://openclipart.org/detail/79933/roman-clock
     https://openclipart.org/detail/227434/relogio-digital
 
+    https://openclipart.org/detail/215910/apple-02
+    https://openclipart.org/detail/250352/icon-engineer-white-on-grey
+    https://openclipart.org/detail/11055/users
+    https://openclipart.org/detail/8611/dodge-neon-car
+    https://openclipart.org/detail/94711/blue-basket
+
 New images in eduActiv8:
     https://openclipart.org/detail/95431/star
 

README.md

@@ -11,4 +11,4 @@ To find out more please visit: www.eduactiv8.org and http://www.facebook.com/edu
 
 The installation guide is available at the following address: www.eduactiv8.org/installation/
 
-To download the official source or the 'compiled' package visit: https://sourceforge.net/projects/eduactiv8
+To download the 'compiled' package visit: https://sourceforge.net/projects/eduactiv8

README.txt

@@ -97,12 +97,12 @@ The compiled version currently does not work with espeak.
 ______________________________________________
 
 The first time the application is run will be in normal windowed mode (not in fullscreen).
-To display it in fullscreen press Ctrl+F at the start of the or go to Preferences (in login screen) and enable full screen.
+To display it in fullscreen press Ctrl+F after logging in or go to Preferences (in login screen) and enable full screen.
 
 ----------------------------------------------
 Translating:
     If you would like to help translating this application please use one of the included files within the i18n/po directory.
-    If your langauage is not there yet copy the default.pot file rename it temporarily to te_ST.po and start working with the new file using ie. the Poedit.
+    If your language is not there yet copy the default.pot file rename it temporarily to te_ST.po and start working with the new file using ie. the Poedit.
     To test your translation save the file - Poedit will create the .mo file for you - move the .mo file to the locale/te_ST/ directory and rename the file to eduactiv8.mo and start the app select the Test Language.
     Alternatively you can run the cleanup.py program to get the file renamed and moved where it should be (this program will also remove .pyc and some other temp files under eduactiv8 - this is used to automate the process of stripping eduactiv8 before compressing/packaging).
 
@@ -115,10 +115,6 @@ Translating:
 ----------------------------------------------
 
 Interface:
-Menu Panel - left:
-    left column         - list of categories
-    right column        - list of activities in the current category
-
 Top Panel:
     sound               - toggle sound effects
     voice               - toggle espeak voice synthesiser (if espeak is not installed this icon will not be available)
@@ -152,7 +148,8 @@ Controls - top:
     close button          - closes the application (2 clicks needed)
 
 Activity Panel - centre - the largest part of screen:
-    piece of screen where all activity objects are placed for you to drag around :)
+    Piece of screen where all activity objects are placed for you to drag around :)
+    This is also used to display the menu in the latest version - starting from home screen - where top categories are displayed users can navigate through the series of categories to start individual activities.
 
 
 Sorry for all the mess in the code, but this is my first and only pygame project after reading some books/tutorials, so do not expect professional product - this was my programming sandbox.