Commit Graph

5912 Commits

Author SHA1 Message Date
Pootle daemon
1d42e7b7e6 Merge branch 'master' of git.sugarlabs.org:sugar-toolkit/mainline 2011-09-28 00:34:08 -04:00
Pootle daemon
436489cb26 Commit from Sugar Labs: Translation System by user godiard.: 40 of 40 messages translated (0 fuzzy). 2011-09-27 20:28:23 +02:00
Pootle daemon
d587acdf70 Commit from Sugar Labs: Translation System by user cjl.: 40 of 40 messages translated (0 fuzzy). 2011-09-27 17:23:35 +02:00
Daniel Drake
720b33ab30 Remove hippo from naming alert
Reimplement the favorite icon as a ToggleButton, and use standard
boxes, entrys and textviews for the other aspects.
2011-09-27 14:57:21 +01:00
Simon Schampijer
d39a813969 Don't put event box in toplevel window
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.
2011-09-27 12:43:51 +01:00
Pootle daemon
47cc7f7e77 Commit from Sugar Labs: Translation System by user Jakub.: 40 of 40 messages translated (0 fuzzy). 2011-09-26 22:46:15 +02:00
Simon Schampijer
7ecfbc6cd0 Release 0.93.4 2011-09-20 18:18:53 +02:00
Simon Schampijer
1609340503 Joining shared activity: set title for activity palette in frame, SL #3109
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>
2011-09-20 08:35:10 +02:00
Simon Schampijer
b582736375 XO_Packager: package files that are in git and the locale folder, OLPC #11217
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>
2011-09-19 18:49:54 +02:00
Pootle daemon
cdbeb682cb Commit from Sugar Labs: Translation System by user aman0115.: 40 of 40 messages translated (0 fuzzy). 2011-09-08 11:52:28 +02:00
Simon Schampijer
4e8a50163e Release 0.93.3 2011-09-07 18:35:33 +02:00
Simon Schampijer
a16eedff46 Some activities segfault when closing, OLPC #11201
TurtleArt and Abacus are two known candidates

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
2011-09-07 18:20:01 +02:00
Pootle daemon
2d3076a151 Commit from Sugar Labs: Translation System by user ganesh.: 40 of 40 messages translated (0 fuzzy). 2011-09-02 10:35:59 +02:00
Pootle daemon
f1d4d66aad Commit from Sugar Labs: Translation System by user cjl.: 40 of 40 messages translated (0 fuzzy). 2011-09-02 06:08:44 +02:00
Pootle daemon
8502d4c4bb Commit from Sugar Labs: Translation System by user cjl.: 40 of 40 messages translated (0 fuzzy). 2011-08-26 20:24:20 +02:00
Pootle daemon
986b918ff8 Commit from Sugar Labs: Translation System by user anderson861.: 40 of 40 messages translated (0 fuzzy). 2011-08-24 18:08:04 +02:00
Simon Schampijer
51496ff5b8 Release 0.93.2 2011-08-19 13:26:57 +02:00
Simon Schampijer
c1f9d716ab Correct title in the activity frame SL #3042
Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Gonzalo Odiard <gonzalo@laptop.org>
Tested-by: Gonzalo Odiard <gonzalo@laptop.org>
2011-08-18 17:17:00 +02:00
Simon Schampijer
e022aa8e4a Do not remove the Keep button completely, keep around for backward compatibility
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>
2011-08-17 18:04:47 +02:00
Gonzalo Odiard
507dfecc09 Add alpha and scale functionality to the icon, can be used in the launcher to do the animation - v2
Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
        Acked-By: Simon Schampijer <simon@laptop.org>
2011-08-17 12:13:10 -03:00
Simon Schampijer
0082e10f8e Remove the Keep button from the activity toolbar
The keep button has led to a false assumption: learners
confused it with a traditional save button and not recognising
it as what it is, an option to duplicate an entry.

Eben suggested to remove the button [1] and others have since
then. The functionality of duplicating an entry will be moved
to the entry palette in the Journal and the entry detail view [2].

We will print a warning when the KeepButton is used and remove
it after another cycle.

[1] http://lists.sugarlabs.org/archive/sugar-devel/2010-April/023439.html
[2] http://lists.sugarlabs.org/archive/sugar-devel/2011-May/031316.html

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-08-15 19:29:30 +02:00
Simon Schampijer
4010878b7f Merge branch 'master' of git.sugarlabs.org:sugar-toolkit/mainline 2011-08-13 09:45:46 +02:00
Simon Schampijer
3f0822ab1a Toolbox: replace the hippo based separator with a gtk.HSeparator
This makes the old-style Toolbar hippo free.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Benjamin Berg <benzea@sugarlabs.org>
2011-08-13 09:45:14 +02:00
Simon Schampijer
17ec110798 Replace the hippo-based TimeoutIcon with one based on a gtk.Label and gtk.Alignment
This patch depends on the addition of the SugarTimeoutIcon
to the artwork where we set the font and background color.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Benjamin Berg <benzea@sugarlabs.org>
2011-08-12 10:39:38 +02:00
Simon Schampijer
4018265f6c Replace our custom entry widget with one based on gtk.Entry
Our custom entry widget, which was based on sexyicon, did
support placing an icon in the entry (e.g. the magnifier icon
for the search entry) and displaying progress in the case of
the url entry in Browse. Both is supported since GTK+ 2.16 in the
gtk.Entry.

The patch does keep the old API, that is why we can land it in
0.94 no change in the shell needed only a small change in Browse,
in a second step I would like to use the upstream API e.g.
's/set_icon_from_name/set_icon_from_icon_name'.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-by: Benjamin Berg <benzea@sugarlabs.org>
2011-08-12 10:38:11 +02:00
Pootle daemon
8b2bc40576 Commit from Sugar Labs: Translation System by user aputsiaq.: 40 of 40 messages translated (0 fuzzy). 2011-08-12 07:48:09 +02:00
Simon Schampijer
d0a493e532 Initialize window title with bundle name, OLPC #11037
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>
2011-07-24 19:22:35 +02:00
Simon Schampijer
9d21fd7511 Update window title when the activity title changes - OLPC #10978
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>
2011-07-24 18:42:48 +02:00
Bernie Innocenti
e7430faac9 Remove incomplete MANIFEST support
This incomplete feature contributes to confuse new activity authors and
slightly complicates our bundle installation logic.

The day someone finds something useful to do with the MANIFEST
specification, we can revert this patch in no time.

Signed-off-by: Bernie Innocenti <bernie@codewiz.org>
Tested-by: Bernie Innocenti <bernie@codewiz.org>
Tested-by: James Cameron <quozl@laptop.org>
Tested-by: Sascha Silbe <silbe@activitycentral.com>
Reviewed-by: Sascha Silbe <silbe@activitycentral.com>
[rebased on git master, minor style fix]
Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
2011-07-24 16:21:38 +00:00
Simon Schampijer
1f06030269 Merge branch 'master' of git.sugarlabs.org:sugar-toolkit/mainline 2011-07-24 17:29:12 +02:00
Simon Schampijer
6b675ed45f Make sure the datastore entry is created in time OLPC #10755
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>
2011-07-24 17:27:25 +02:00
Pootle daemon
c66d931f69 Commit from Sugar Labs: Translation System by user mschlager.: 40 of 40 messages translated (0 fuzzy). 2011-07-17 23:23:24 +02:00
Simon Schampijer
a460b91e86 Merge branch 'master' of git.sugarlabs.org:sugar-toolkit/mainline 2011-07-15 18:57:47 +02:00
Gonzalo Odiard
880e60bdda Sugar-toolkit: Pack page in ToolbarButton when is connected to the window - OLPC #10930
To add the accelerator to the ToolButton the activity must have set
the 'sugar-accel-group' before. The patch does make the ToolbarButton
listen to the 'hierarchy-changed' signal and repack itself accordingly.
Since the ToolButtons of the subtoolbar do listen to 'hierarchy-changed'
as well to set the accelerator they will set it accordingly.

This fixes the accelerators for new-style-toolbar activities
like Terminal, TurtleArt and Paint, more info in #10930.

Signed-by-off: Gonzalo Odiard <gonzalo@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
2011-07-15 18:54:29 +02:00
Pootle daemon
f50968e16f Commit from Sugar Labs: Translation System by user khaled.: 40 of 40 messages translated (0 fuzzy). 2011-07-08 19:52:50 +02:00
Daniel Drake
10580fc2a7 GlibTCPServer: defer shutdown_request to avoid closing the socket too early OLPC #10906
In Python 2.7, shutdown_request was added to the BaseServer class and
TCPServer was adopted to use it instead of close_request in the
_handle_request_noblock() path.

GlibTCPServer must be adapted to account for this, so that
shutdown_request is not allowed to prematurely allowed to close the socket,
in the same way that close_request is ignored.

Fixes collaboration in activities that rely on this mechanism for
sharing (including ImageViewer and Read)

Signed-off-by: Daniel Drake <daniel@laptop.org>
Acked-by: Simon Schampijer <simon@laptop.org>
Tested-by: Gonzalo Odiard <gonzalo@laptop.org>
Tested-by: Simon Schampijer <simon@laptop.org>
2011-06-29 14:42:53 +02:00
Simon Schampijer
7e61237c8f Debug logs for default profile
The generic path does not work for the telepathy logs. As we
have removed the support for different profiles it is ok
to just use the default path.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Reviewed-By: Marco Pesenti Gritti <marco@marcopg.org>
2011-06-29 10:01:51 +02:00
Simon Schampijer
7a0d5d9398 Use 'focus-out' event instead of 'changed' event for title entry OLPC #10956, SL #2608
To determine if the title has changed we use the 'focus-out'
event now instead of the 'changed' signal of the gtk.Entry. This
removes races we had before.

Signed-off-by: Daniel Drake <dsd@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-06-20 17:48:51 +02:00
Simon Schampijer
1ea1b2a0ab Use the activity instance name when joining a shared activity SL #2872
When we join a shared activity we use the name of the shared activity
as the title of the activity. As we set the activity metadata
accordingly this will be visible in the activity toolbar, the Journal
and the activity frame.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-06-09 16:55:56 +02:00
Simon Schampijer
c86b6d5917 Fix invitations from a non sugar client (empathy), part of OLPC #10814
This differentiates between sugar and non sugar invitations using the
handle type. For non-sugar invitations we use the activity id to
determine which activity to join.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-06-09 16:53:18 +02:00
Simon Schampijer
67143d8042 Only show joined buddies on sharer side, part of OLPC#10578
This is a follow-up patch to 95b4eeec758ffa729d0dbb219b21d428115fcc74

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-05-31 16:24:08 +02:00
Simon Schampijer
5b09eb1d74 Shared activity does not announce the 'buddy-left' signal OLPC #10800
This fixes a copy and paste error. A good test case is the Memorize
activity since we listen for the 'buddy-left' signal there to
update the members list inside the activity.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-By: Sascha Silbe <silbe@activitycentral.com>
2011-05-23 10:33:50 +02:00
Sascha Silbe
3553fbd2f0 remove obsolete comment
GTK bug #502871 [1] has been fixed in 2007.

[1] http://bugzilla.gnome.org/show_bug.cgi?id=502871

Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
2011-05-20 23:13:10 +02:00
Sascha Silbe
567bd961a5 Avoid showing decorated windows during start-up (OLPC#10713)
As a side effect, activity start-up is now subjectively faster, maybe even
objectively (due to avoiding a resize).

Tested on XO-1 running Debian Squeeze.

Acked-By: Simon Schampijer <simon@laptop.org>
2011-04-11 18:00:29 +02:00
Gonzalo Odiard
35cb4e3881 The activity icon does not handle the case of a activity without metadata.
If the activity is initiated with create_object=False

Acked-by: Sascha Silbe <silbe@activitycentral.com>
2011-04-03 17:19:54 +02:00
Simon Schampijer
17e52db2b6 Store all the buddies that have been joined in the activity metadata OLPC #10578
Before only the buddies that were present when closing the activity
were logged in the Journal. This patch does add another dictionary
'_joined_buddies' to keep track of the users that did join. The
'_buddies' dictionary keeps on tracking the users currently in the
activity.

Signed-off-by: Simon Schampijer <simon@laptop.org>
Acked-by: Sascha Silbe <silbe@activitycentral.com>
2011-03-31 12:07:53 -04:00
Pootle daemon
abe7d121ec Commit from Sugar Labs: Translation System by user cjl.: 40 of 40 messages translated (0 fuzzy). 2011-03-31 03:31:22 +02:00
Sascha Silbe
85e714ecb1 fix regressions introduced by 29582de6 (fix for SL#1742)
GTK pops down the palette before it invokes the actions on the
menu item. We need to postpone destruction of the palette until
after all signals have propagated from the menu item to the
palette owner.

Symptoms included the "View Details" palette menu item in the Journal list
view not working.

Signed-off-by: Sascha Silbe <silbe@activitycentral.com>
Acked-by: Simon Schampijer <simon@laptop.org>
2011-03-27 16:39:04 +02:00
Simon Schampijer
ca02d59e11 Open content bundles on a external device #1748
Remove the path parameter as it is not used anyhow. The patch
for the sugar module does make sure the method is called
correctly.

Signed-off-by: Gonzalo Odiard <gonzalo@laptop.org>
Acked-By: Simon Schampijer <simon@laptop.org>
Reviewed-By: Sascha Silbe<silbe@activitycentral.com>
2011-03-03 11:10:26 -05:00
Simon Schampijer
1d27039180 Release 0.92.0 2011-02-23 17:03:20 -05:00