Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src/sugar/activity/activity.py
Commit message (Collapse)AuthorAgeFilesLines
* Backport add launch-times info to metadataGonzalo Odiard2012-10-041-0/+8
| | | | | Signed-off-by: Walter Bender <walter.bender@gmail.com> Tested-by: Gonzalo Odiard <gonzalo@laptop.org>
* Use json as included in Python SL #3142Simon Schampijer2012-08-081-3/+3
| | | | | | | | | We use json as included in Python. This will make Sugar dependent on Python 2.6 and Python 2.7 to have the highest JSON performance. The same patch landed in toolkit-gtk3 already. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-by: Manuel Quiñones <manuq@laptop.org>
* Move the translation initialisation to an earlier stage, SL #3654Simon Schampijer2012-06-051-7/+0
| | | | | | Remove the support for the langpackdir. Signed-off-by: Simon Schampijer <simon@laptop.org>
* Display spinner cursor when saving after closing the activity, OLPC #11691Simon Schampijer2012-05-301-0/+1
| | | | | | Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-by: Daniel Drake <dsd@laptop.org> Tested-by: Manuel Quiñones <manuq@laptop.org>
* Remove the Naming AlertGonzalo Odiard2012-04-241-13/+5
| | | | | | | | | | | | | | | | | | | | | | With the new 'Write to Journal anytime' feature it is possible to write a description within an activity. Hopefully this leads to more usage of the Journal for reflection by the learner. The hinting nature ('you have not named your session yet') of the Naming Alert has not been replaced, though. The patch is an adaptation from the one that landed in sugar-toolkit-gtk3 and has been ported to the sugar-toolkit. After talking with teachers and the learning team, I found out that they are very excited about this feature. Doing this change not only in sugar-toolkit-gtk3 and limit it to the activities that have been ported to the new toolkit we will have a more consistent experience across the activities in the 0.96 release. The original patch is from Simon Schampijer <simon@laptop.org> Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org>
* Restructure for new /usr/bin/sugar-activity behaviourDaniel Drake2011-12-201-0/+22
| | | | | | | | | | | | | | | | | This patch accompanies a sugar patch titled "sugar-activity: make independent of sugar-toolkit GTK versions" The core Activity-instantiating functionality of main.py has been moved into the sugar-activity binary and can be removed from here. The remaining functionality (and everything that is GTK-specific) is moved into the Activity class in this commit. This is needed to make /usr/bin/sugar-activity independent of sugar/sugar3 and GTK2/GTK3, which is a crucial step for GTK3 activity support. Signed-off-by: Daniel Drake <dsd@laptop.org> Acked-by: Sascha Silbe <silbe@activitycentral.com>
* Joining shared activity: set title for activity palette in frame, SL #3109Simon Schampijer2011-09-201-1/+1
| | | | | | | | | | We need to set the title when we join a shared session AND when we run a private session. Signed-off-by: Simon Schampijer <simon@laptop.org> Tested-By: Gonzalo Odiard <gonzalo@laptop.org> Reviewed-By: Gonzalo Odiard <gonzalo@laptop.org> Acked-by: Sascha Silbe <silbe@activitycentral.com>
* Correct title in the activity frame SL #3042Simon Schampijer2011-08-181-0/+1
| | | | | | Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org> Tested-by: Gonzalo Odiard <gonzalo@laptop.org>
* Initialize window title with bundle name, OLPC #11037Simon Schampijer2011-07-241-3/+7
| | | | | | | | | | I had to modify the patch slightly because of 0269f819761cfd803cf4d694298c8ab6a753e242, changes reviewed by Sascha. Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org> Acked-By: Simon Schampijer <simon@laptop.org> Reviewed-by: Sascha Silbe <silbe@activitycentral.com>
* Update window title when the activity title changes - OLPC #10978Simon Schampijer2011-07-241-0/+7
| | | | | | | | The patch updates the window title when the user changes the title in the toolbar or in the Journal. Signed-of-by: Gonzalo Odiard <gonzalo@laptop.org> Acked-By: Simon Schampijer <simon@laptop.org>
* Make sure the datastore entry is created in time OLPC #10755Simon Schampijer2011-07-241-13/+11
| | | | | | | | | | | | | | | To avoid that we try to access the datastore entry before it has been created we need to move the creation code up, before we do get the possible information from a shared session. If we have a shared session we do then get the title and icon-color information from it and adjust accordingly. Tested that no other operation like for example resuming has issues with that change. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-By: Sascha Silbe <silbe@activitycentral.com>
*