Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* icon: use GDK for pixbuf-to-cairo conversionDaniel Drake2012-03-071-12/+12
| | | | | | | | | | | | | | | | | We currently use some strange code inside hippo to paint a pixbuf onto a cairo surface. This can be more effectively done within GDK. This solves a Sugar crash-on-startup on Fedora 17, where this hippo code is crashing, and uses the same underlying mechanism as sugar-toolkit-gtk3. Also use cairo.Context.set_source_rgb() for setting the background colour, which avoids the requirement to encapsulate the cairo context at an early stage (which would make the rest of this patch a little more complicated). Signed-off-by: Daniel Drake <dsd@laptop.org> Acked-by: Simon Schampijer <simon@schampijer.de>
* Restructure for new /usr/bin/sugar-activity behaviourDaniel Drake2011-12-203-161/+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>
* bundlebuilder: refactor get_files_git to Packager to avoid code duplicationSimon Schampijer2011-09-281-26/+14
| | | | | | | | Follow up patch for b582736375218e8944b3ce3daac667c7910a7e73 Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-by: Daniel Drake <dsd@laptop.org> Acked-by: Sascha Silbe <silbe@activitycentral.com>
* bundlebuilder: add back build_locale functionality to XOPackager SL #3116Simon Schampijer2011-09-281-0/+1
| | | | | | | | Due to the removal of the manifest support we lost as well the part of the code that does build the locale. This patch adds that functionality back. Signed-off-by: Simon Schampijer <simon@laptop.org>
* Remove hippo from naming alertDaniel Drake2011-09-271-137/+89
| | | | | Reimplement the favorite icon as a ToggleButton, and use standard boxes, entrys and textviews for the other aspects.
* Don't put event box in toplevel windowSimon Schampijer2011-09-271-8/+5
| | | | | | | | | | Remove an unnecessary toplevel widget. This event box was originally added by Marco "to make it easier to take screenshot of the canvas area only" (7f731457c2) but we're unsure why this is, and it doesn't seem to be needed for our current screenshot-taking mechanism. Screenshots continue to work fine after removing this.
* 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>
* XO_Packager: package files that are in git and the locale folder, OLPC #11217Simon Schampijer2011-09-191-1/+19
| | | | | | | | | | | | | | | | | | There had been reports about Activities that had unexpected files in the xo bundle (e.g. patches). There have been a recent change that the support for the MANIFEST has been removed from the bundle builder. The MANIFEST 'controlled' which files were bundled. The code did include all the files present in the folder (which includes patches etc). The patch does use git-ls to get a list of files to include (like the tarball packager). Furthermore the locale folder is included which has been generated. Due to the API freeze we made '_get_files_in_git' a private method which adds a bit of duplication to the 'get_files' method in the tarball packager. A patch for master which will implement Builder.get_files_git(), that can be used by XOPackager and SourcePackager. Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-By: Daniel Drake <dsd@laptop.org>
* Some activities segfault when closing, OLPC #11201Simon Schampijer2011-09-071-1/+1
| | | | | | | TurtleArt and Abacus are two known candidates Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
* 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>
* Do not remove the Keep button completely, keep around for backward compatibilitySimon Schampijer2011-08-171-0/+3
| | | | | | | | | | | In order to allow activities keeping their backward compatibility we keep the Keep button around but do not add it to the toolbar. This fixes activities that either remove or hide the Keep button or alter it in any other way. The Keep button is deprecated and we discourage the usage. Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
*