Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* ToggleToolbutton: do hide the tooltip when clicked or touchedSimon Schampijer2013-02-151-0/+4
| | | | | | | | | This is the same behaviour as for the RadioToolButton and the ToolButton. See 344c72a3beb599b76f3ac806c34b7727a258530b where we did the same for the RadioToolbutton. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-by: Manuel Quiñones <manuq@laptop.org>
* RadioToolButton: hide tooltip on click #4268Simon Schampijer2012-11-271-0/+4
| | | | | | | This is the same behaviour as with the ToolButton. Signed-off-by: Simon Schampijer <simon@laptop.org> Acked-by: Manuel Quiñones <manuq@laptop.org>
* 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>
* Bundlebuilder: don't fail to package if git is not installed, OLPC #11341Simon Schampijer2012-08-231-2/+12
| | | | | | | | | | | | | | | When git is installed, it will return non-zero if it gets asked to list the files in a non-git-repository. The subprocess.Popen instantiation is successful in this case and the returncode attribute will contain the error code from git. The current code handles this fine and does fall back to our own source file listing facility. If git isn't installed, however, trying to instantiate subprocess.Popen will fail with OSError. We need to catch this and fall back to our own source file listing facility like we do for the non-repository case. Signed-off-by: Simon Schampijer <simon@laptop.org> Reviewed-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>
* presence: use RoomConfig1 to configure channel properties (#3629)Daniel Drake2012-07-031-8/+53
| | | | | | | | | | | | | | | | | | | | | | This code was still using regular Telepathy properties to set important configuration such as Anonymous=False. However, as of Telepathy specification 0.24.0, these properties have gone away. http://telepathy.freedesktop.org/spec/Channel_Type_Text.html Changed in 0.24.0. This interface used to have a bunch of clunky Telepathy.Properties. They have been removed in favour of D-Bus properties on the Room2, Subject2 and RoomConfig1 interfaces. Switch to using RoomConfig1 (where available) to set this configuration. The invite-restricted flag is no longer available and actually seems to have been removed a long while back. Fixes sharing of activities over gabble on new platforms such as Fedora 17. Signed-off-by: Daniel Drake <dsd@laptop.org>
* Move the translation initialisation to an earlier stage, SL #3654Simon Schampijer2012-06-052-14/+0
| | | | | | Remove the support for the langpackdir. Signed-off-by: Simon Schampijer <simon@laptop.org>
* Activity Toolbar Description input field wrap text, SL #3586Simon Schampijer2012-06-011-1/+2
| | | | | | | Corrected a space issue as well. Signed-off-by: Gary C. Martin <garycmartin@googlemail.com Acked-by: Simon Schampijer <simon@laptop.org>
* ToolButton: add 'icon_name' as a GObject property SL #3658Manuel Quiñones2012-06-011-0/+2
| | | | | | | | | | Sugar ToolButton inherits from Gtk.ToolButton but is not overwriting 'icon_name' property. So 'icon_name' can be passed to the constructor of Sugar ToolButton but the result is different than setting it via ToolButton.props.icon_name. Signed-off-by: Manuel Quiñones <manuq@laptop.org> Acked-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-243-320/+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>
* Add DescriptionEntry to the activity sub-toolbarGonzalo Odiard2012-04-241-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | This is the implementation of the 'Write to Journal anytime' feature [1]. The patch itself adds a DescriptionItem to the activity sub-toolbar to make editing a Journal entry description from within the activity possible. The code has the same error handling as the TitleEntry. 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 was done by Simon Schampijer <simon@laptop.org> and Walter Bender <walter.bender@gmail.com> Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org> Acked-by: Simon Schampijer <simon@laptop.org> [1] http://wiki.sugarlabs.org/go/Features/Write_to_journal_anytime
* 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>
*