Re: [Sugar-devel] [PATCH jukebox] Don't call into GTK+ when setting video sink from gstreamer thread
On Tue, Jun 7, 2011 at 7:16 AM, Gonzalo Odiard gonz...@laptop.org wrote: Kushal, my user in git is godiard Done , thanks for the help :) Kushal -- http://fedoraproject.org http://kushaldas.in ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Only approve and not handle channels in the shell, part of OLPC #10738
Tested-by: Samuel Greenfeld greenf...@laptop.org
see: http://dev.laptop.org/ticket/10768
On 05/23/2011 01:21 PM, Simon Schampijer wrote:
We only approve channels in the shell and do not claim to handle them
anymore. The handling is now done by the activity (toolkit patch).
More info about approving and handling of channels can be found at [1].
This patch does only handle sugar activity invitations, invitations
from non-sugar clients will be handled in a separate patch.
[1]
http://telepathy.freedesktop.org/doc/book/sect.channel-dispatcher.clients.html
---
src/jarabe/model/telepathyclient.py | 21 +++--
1 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/jarabe/model/telepathyclient.py
b/src/jarabe/model/telepathyclient.py
index c6fbac1..3a60866 100644
--- a/src/jarabe/model/telepathyclient.py
+++ b/src/jarabe/model/telepathyclient.py
@@ -19,11 +19,16 @@ import logging
import dbus
from dbus import PROPERTIES_IFACE
from telepathy.interfaces import CLIENT, \
+ CHANNEL, \
+ CHANNEL_TYPE_TEXT, \
CLIENT_APPROVER, \
CLIENT_HANDLER, \
CLIENT_INTERFACE_REQUESTS
from telepathy.server import DBusProperties
+from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
+from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
+
from sugar import dispatch
@@ -48,9 +53,6 @@ class TelepathyClient(dbus.service.Object, DBusProperties):
self._implement_property_get(CLIENT, {
'Interfaces': lambda: list(self._interfaces),
})
-self._implement_property_get(CLIENT_HANDLER, {
-'HandlerChannelFilter': self.__get_filters_cb,
- })
self._implement_property_get(CLIENT_APPROVER, {
'ApproverChannelFilter': self.__get_filters_cb,
})
@@ -59,9 +61,16 @@ class TelepathyClient(dbus.service.Object, DBusProperties):
self.got_dispatch_operation = dispatch.Signal()
def __get_filters_cb(self):
-logging.debug('__get_filters_cb')
-filter_dict = dbus.Dictionary({}, signature='sv')
-return dbus.Array([filter_dict], signature='a{sv}')
+filt = {
+CHANNEL + '.ChannelType': CHANNEL_TYPE_TEXT,
+CHANNEL + '.TargetHandleType': CONNECTION_HANDLE_TYPE_ROOM,
+}
+filter_dict = dbus.Dictionary(filt, signature='sv')
+filters = dbus.Array([filter_dict], signature='a{sv}')
+
+logging.debug('__get_filters_cb %r', filters)
+
+return filters
@dbus.service.method(dbus_interface=CLIENT_HANDLER,
in_signature='ooa(oa{sv})aota{sv}', out_signature='')
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar-toolkit] Handle DBUS tubes in the activity telepathy client, part of OLPC #10738
Tested-by: Samuel Greenfeld greenf...@laptop.org
see: http://dev.laptop.org/ticket/10768
On 05/23/2011 01:17 PM, Simon Schampijer wrote:
This adds the handling of DBUS tube channels to the
'HandlerChannelFilter' in activity's telepathy client.
Signed-off-by: Simon Schampijersi...@laptop.org
---
src/sugar/activity/activity.py | 30 ++
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/sugar/activity/activity.py b/src/sugar/activity/activity.py
index 35082cc..09ba3cc 100644
--- a/src/sugar/activity/activity.py
+++ b/src/sugar/activity/activity.py
@@ -65,9 +65,11 @@ import cjson
from telepathy.server import DBusProperties
from telepathy.interfaces import CHANNEL, \
CHANNEL_TYPE_TEXT, \
+ CHANNEL_TYPE_DBUS_TUBE, \
CLIENT, \
CLIENT_HANDLER
from telepathy.constants import CONNECTION_HANDLE_TYPE_CONTACT
+from telepathy.constants import CONNECTION_HANDLE_TYPE_ROOM
from sugar import util
from sugar.presence import presenceservice
@@ -368,6 +370,7 @@ class Activity(Window, gtk.Container):
# There's already an instance on the mesh, join it
logging.debug('*** Act %s joining existing mesh instance %r',
self._activity_id, mesh_instance)
+self._client_handler = _ClientHandler(self.get_bundle_id(), None)
self.shared_activity = mesh_instance
self.shared_activity.connect('notify::private',
self.__privacy_changed_cb)
@@ -927,15 +930,22 @@ class _ClientHandler(dbus.service.Object, DBusProperties):
})
def __get_filters_cb(self):
-logging.debug('__get_filters_cb')
-filters = {
+filter_text = {
CHANNEL + '.ChannelType': CHANNEL_TYPE_TEXT,
CHANNEL + '.TargetHandleType': CONNECTION_HANDLE_TYPE_CONTACT,
}
-filter_dict = dbus.Dictionary(filters, signature='sv')
-logging.debug('__get_filters_cb %r', dbus.Array([filter_dict],
-signature='a{sv}'))
-return dbus.Array([filter_dict], signature='a{sv}')
+filter_dict = dbus.Dictionary(filter_text, signature='sv')
+filters = dbus.Array([filter_dict], signature='a{sv}')
+
+filter_tube = {
+CHANNEL + '.ChannelType': CHANNEL_TYPE_DBUS_TUBE,
+CHANNEL + '.TargetHandleType': CONNECTION_HANDLE_TYPE_ROOM,
+}
+filter_dict = dbus.Dictionary(filter_tube, signature='sv')
+filters.append(filter_dict)
+
+logging.debug('__get_filters_cb Activity filters=%r', filters)
+return filters
@dbus.service.method(dbus_interface=CLIENT_HANDLER,
in_signature='ooa(oa{sv})aota{sv}', out_signature='')
@@ -945,8 +955,12 @@ class _ClientHandler(dbus.service.Object, DBusProperties):
account, connection, channels, requests_satisfied,
user_action_time, handler_info)
try:
-for channel in channels:
-self._got_channel_cb(connection, channel[0])
+for object_path, properties in channels:
+channel_type = properties[CHANNEL + '.ChannelType']
+handle_type = properties[CHANNEL + '.TargetHandleType']
+if channel_type == CHANNEL_TYPE_TEXT and \
+ handle_type == CONNECTION_HANDLE_TYPE_ROOM:
+self._got_channel_cb(connection, object_path)
except Exception, e:
logging.exception(e)
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ASLO] Release Jukebox-21
Activity Homepage: http://activities.sugarlabs.org/addon/4045 Sugar Platform: 0.82 - 0.92 Download Now: http://activities.sugarlabs.org/downloads/file/27400/jukebox-21.xo Release notes: Don't call into GTK+ when setting video sink from gstreamer thread - SL #2853 (Daniel Drake) Updated translations Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [ASLO] Release Jukebox-21
Activity Homepage: http://activities.sugarlabs.org/addon/4045 Sugar Platform: 0.82 - 0.92 Download Now: http://activities.sugarlabs.org/downloads/file/27401/jukebox-21.xo Release notes: Notas de la versión: Don't call into GTK+ when setting video sink from gstreamer thread - SL #2853 (Daniel Drake) Updated translations Sugar Labs Activities http://activities.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar-toolkit] Debug logs for default profile
On 7 June 2011 12:06, Simon Schampijer si...@schampijer.de wrote: The generic path foes nt work for the telepathy logs. As we Couple of typos there :) have removed the support for different profiles it is ok to just use the default path. --- src/sugar/profile.py | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sugar/profile.py b/src/sugar/profile.py index 8a76d2c..c1dffd7 100644 --- a/src/sugar/profile.py +++ b/src/sugar/profile.py @@ -196,14 +196,14 @@ class Profile(object): '#export LM_DEBUG=net\n' \ '#export GABBLE_DEBUG=all\n' \ '#export GABBLE_LOGFILE=' \ - '$HOME/.sugar/$SUGAR_PROFILE/logs/telepathy-gabble.log\n' \ + '$HOME/.sugar/default/logs/telepathy-gabble.log\n' \ Maybe define PROFILE_PATH=$HOME/.sugar/$SUGAR_PROFILE/logs to avoid all the duplication. Marco ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [DESIGN] copy-to-option in Journal (part of removing the keep button)
Hi Simon, On 6 Jun 2011, at 12:27, Simon Schampijer wrote: On 05/25/2011 12:49 AM, Simon Schampijer wrote: I have now implemented everything like described below (4-7). The only thing I need is an icon for the clipboard option. Some icon ideas: the pin from the Physics activity, a paper clip (or is that too much Windows Word :). Patches, mockups...welcome! Go designers go! Regards, Simon In the design meeting it has been argued that the 'copy-to-Journal' [1] might be misleading. And instead make it a separate function in the palette [2]. Walter people in the meeting wanted your opinion on that? I still need the icon for the clipboard. Any news on those? Here's a shot at the icon for edit-duplicate. I've gone for the simplest step from our existing icon desing, using a + rather than an arrow to indicate duplication rather than movement. An alternative if you want something more distinct could be two overlapping rectangles, one with a + sign in, but that would be different to the current visual language: inline: Duplicate_mockup.gifinline: edit-duplicate.svg For the clipboard icon I have been thinking we might want to stay with the toolbar-edit scissors icon to reinforce the idea of the Activity Edit toolbar where copy and paste access is the common use case. Here's a quick mockup of what the scissors might look like in the palette: inline: Clipboard_mockup.gif I have a half finished simplified clipboard silhouette I could complete if folks don't like the idea of re-using the scissors (a clipboard shape also allows for using user fill/stroke colour, though I don't think that is essential here). Manuel, you mentioned in the design meeting you had some ideas for a clipboard icon, did you make any progress or have some suggestions? Regards, --Gary Regards, Simon [1] http://dev.laptop.org/~erikos/copy/4_copy-to.png [2] http://dev.laptop.org/~erikos/copy/duplicate.png ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] Packages size list 11.2.0 build 20
Hi James, this list was made with the command rpm -q -a, so I don't think it has the real measure on disk. On Fri, Jun 3, 2011 at 7:43 PM, James Cameron qu...@laptop.org wrote: Are those sizes before or after filesystem compression by ubifs or jffs2? The ordering might change. -- James Cameron http://quozl.linux.org.au/ -- GNU/Linux User # 480207 http://yadervblog.drupalgardens.com/ https://fedoraproject.org/wiki/User:Yaderv*¡Desde abajo y a la izquierda!* ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [PATCH Browse] Clarify warning on Stop with pending downloads (SL#1508)
The warning previously used the word cancel to describe two antagonistic
operations: Not continuing the download (including erasing it from the
Journal) and not stopping Browse.
The new wording was agreed upon [1] by the Design Team.
[1] http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-05-29T16:09:15.html
Closes: SL#1508
Signed-off-by: Sascha Silbe si...@activitycentral.com
---
downloadmanager.py |4
webactivity.py | 14 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/downloadmanager.py b/downloadmanager.py
index a88389f..4eab726 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -64,6 +64,10 @@ def can_quit():
return len(_active_downloads) == 0
+def num_downloads():
+return len(_active_downloads)
+
+
def remove_all_downloads():
for download in _active_downloads:
download.cancelable.cancel(NS_ERROR_FAILURE)
diff --git a/webactivity.py b/webactivity.py
index 48cb3ed..fc9e913 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -18,6 +18,7 @@
import logging
from gettext import gettext as _
+from gettext import ngettext
import os
import subprocess
@@ -650,10 +651,17 @@ class WebActivity(activity.Activity):
return True
else:
alert = Alert()
-alert.props.title = _('Download in progress')
-alert.props.msg = _('Stopping now will cancel your download')
+alert.props.title = ngettext('Download in progress',
+ 'Downloads in progress',
+ downloadmanager.num_downloads())
+message = ngettext('Stopping now will erase your download',
+ 'Stopping now will erase your downloads',
+ downloadmanager.num_downloads())
+alert.props.msg = message
cancel_icon = Icon(icon_name='dialog-cancel')
-alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'), cancel_icon)
+cancel_label = ngettext('Continue download', 'Continue downloads',
+downloadmanager.num_downloads())
+alert.add_button(gtk.RESPONSE_CANCEL, cancel_label, cancel_icon)
stop_icon = Icon(icon_name='dialog-ok')
alert.add_button(gtk.RESPONSE_OK, _('Stop'), stop_icon)
stop_icon.show()
--
1.7.4.1
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Register with schoolserver: adopt to changes in xmlrpclib for python 2.7 OLPC #10776
Excerpts from Simon Schampijer's message of Mon May 23 10:01:01 +0200 2011: I guess we don't need to subclass Transport, but we probably need to call socket.setdefaulttimeout() during Sugar start-up: [...] Hmm, yes sounds about right. I don't think we have to do it during sugar startup (not sure about other side-effects), just after the 'else' is fine. The side effects are exactly the reason I want it to run on start-up. That way things will always behave the same, instead of potentially breaking in odd ways only after the user has used Register during the current session (which is rather hard to diagnose - to the user it's a one-time glitch, not reproducible). Another, less risky idea would be to call socket.setdefaulttimeout(None) afterwards (using try-final) to reset the value to the default (no timeout). In any case I guess the real solution is to make the registration asynchronous: http://bugs.sugarlabs.org/ticket/2289#comment:4 but I did not want to block on it. +1 on both. If somebody provides a patch, we can push it to master. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH Browse] Clarify warning on Stop with pending downloads (SL#1508)
On Tue, Jun 7, 2011 at 11:31 AM, Sascha Silbe si...@activitycentral.comwrote:
The warning previously used the word cancel to describe two antagonistic
operations: Not continuing the download (including erasing it from the
Journal) and not stopping Browse.
The new wording was agreed upon [1] by the Design Team.
[1]
http://meeting.sugarlabs.org/sugar-meeting/meetings/2011-05-29T16:09:15.html
Closes: SL#1508
Signed-off-by: Sascha Silbe si...@activitycentral.com
---
downloadmanager.py |4
webactivity.py | 14 +++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/downloadmanager.py b/downloadmanager.py
index a88389f..4eab726 100644
--- a/downloadmanager.py
+++ b/downloadmanager.py
@@ -64,6 +64,10 @@ def can_quit():
return len(_active_downloads) == 0
+def num_downloads():
+return len(_active_downloads)
+
+
def remove_all_downloads():
for download in _active_downloads:
download.cancelable.cancel(NS_ERROR_FAILURE)
diff --git a/webactivity.py b/webactivity.py
index 48cb3ed..fc9e913 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -18,6 +18,7 @@
import logging
from gettext import gettext as _
+from gettext import ngettext
import os
import subprocess
@@ -650,10 +651,17 @@ class WebActivity(activity.Activity):
return True
else:
alert = Alert()
-alert.props.title = _('Download in progress')
-alert.props.msg = _('Stopping now will cancel your download')
+alert.props.title = ngettext('Download in progress',
+ 'Downloads in progress',
+ downloadmanager.num_downloads())
+message = ngettext('Stopping now will erase your download',
+ 'Stopping now will erase your downloads',
+ downloadmanager.num_downloads())
+alert.props.msg = message
cancel_icon = Icon(icon_name='dialog-cancel')
-alert.add_button(gtk.RESPONSE_CANCEL, _('Cancel'),
cancel_icon)
+cancel_label = ngettext('Continue download', 'Continue
downloads',
+downloadmanager.num_downloads())
+alert.add_button(gtk.RESPONSE_CANCEL, cancel_label,
cancel_icon)
stop_icon = Icon(icon_name='dialog-ok')
alert.add_button(gtk.RESPONSE_OK, _('Stop'), stop_icon)
stop_icon.show()
--
1.7.4.1
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
One comment here: when one stops a download described by
'Stopping now will erase your download', it
also quits the activity.
agree with the 'Continue download', dialog.
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] Browse: Set and restore index in the history - Fix OLPC #10779
On Mon, Jun 6, 2011 at 3:31 PM, godi...@sugarlabs.org wrote:
From: Gonzalo Odiard godi...@gmail.com
If the user go back, or select any page in the history and
close the activity, need restore at the next start, the history,
and the index in the history too.
---
browser.py |6 ++
webactivity.py | 24 ++--
2 files changed, 16 insertions(+), 14 deletions(-)
diff --git a/browser.py b/browser.py
index b9c1f69..9bb7a1b 100644
--- a/browser.py
+++ b/browser.py
@@ -351,6 +351,12 @@ class Browser(WebView):
interfaces.nsIMarkupDocumentViewer)
markupDocumentViewer.fullZoom -= _ZOOM_AMOUNT
+def get_history_index(self):
+return self.web_navigation.sessionHistory.index
+
+def set_history_index(self, index):
+self.web_navigation.gotoIndex(index)
+
class PopupDialog(gtk.Window):
def __init__(self):
diff --git a/webactivity.py b/webactivity.py
index 48cb3ed..8619144 100644
--- a/webactivity.py
+++ b/webactivity.py
@@ -458,6 +458,12 @@ class WebActivity(activity.Activity):
link['owner'], -1, link['hash'])
logging.debug('## reading %s', data)
self._tabbed_view.set_session(self.model.data['history'])
+tab_number = 0
+for current in self.model.data['currents']:
+browser = self._tabbed_view.get_nth_page(tab_number)
+browser.set_history_index(current['index'])
+tab_number = tab_number + 1
+
self._tabbed_view.set_current_page(self.model.data['current_tab'])
elif self.metadata['mime_type'] == 'text/uri-list':
data = self._get_data_from_file_path(file_path)
@@ -469,19 +475,6 @@ class WebActivity(activity.Activity):
'list of multiple uris by now.')
else:
self._tabbed_view.props.current_browser.load_uri(file_path)
-self._load_urls()
-
-def _load_urls(self):
-if self.model.data['currents'] != None:
-first = True
-for current_tab in self.model.data['currents']:
-if first:
-browser = self._tabbed_view.current_browser
-first = False
-else:
-browser = Browser()
-self._tabbed_view._append_tab(browser)
-browser.load_uri(current_tab['url'])
def write_file(self, file_path):
if not self.metadata['mime_type']:
@@ -505,7 +498,10 @@ class WebActivity(activity.Activity):
if n_browser != None:
nsiuri = browser.progress.location
ui_uri = browser.get_url_from_nsiuri(nsiuri)
-info = {'title': browser.props.title, 'url': ui_uri}
+index = browser.get_history_index()
+info = {'title': browser.props.title, 'url': ui_uri,
+'index': index}
+
self.model.data['currents'].append(info)
f = open(file_path, 'w')
--
1.7.4.4
Tested and works as expected.
Thanks and cheers.
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar-toolkit] Handle DBUS tubes in the activity telepathy client, part of OLPC #10738
Excerpts from Simon Schampijer's message of Mon May 30 14:41:59 +0200 2011: One part has to claim the interest into the dbus channels, either the Shell or the Activity. Before my patch sharing with dbus tubes did work, since the shell claimed that they would handle the channels, but this had the side effect of ghost invitations. Now I changed the code that the shell only approves invitations and the activity is responsible to handle/claim the channels they are interested in. Etoys (currently still using the presence service) will need to make the same, create a Handler that claims the channels Etoys is interested in [2]. OK, thanks, this makes things a little clearer, though there are still one question I can't answer myself yet: Do we need to change something in sugar-presence-service to make activities that still rely on it (like EToys) work after your patches? (we'll drop sugar-presence-service in 0.94, but not in 0.92.x) There was another question I was going to ask re. Etoys compatibility, but I noticed it's part of Glucose (etoys) / Fructose (Etoys), so we can simply assume that matching versions of sugar-toolkit resp. Etoys will be installed. We should point out the exact version relationships in the Release Notes, of course. I don't want to block these patches any further, so in the hope that you'll write the Release Notes [1] entry explaining what non-Python activity authors need to change I give my: Acked-By: Sascha Silbe si...@activitycentral.com Your patches change the API, but AIUI there's no reasonable alternative. Sascha [1] http://wiki.sugarlabs.org/go/0.92/Notes -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] customize icon patch
Excerpts from Walter Bender's message of Mon Jun 06 20:31:08 +0200 2011: Alas, git send-email would [not] accept this patch. Please see the attach patch (and icon). This icon is used by the new View Source copy bundle code. The reason is that you're using very long lines that cannot be represented in an email without encoding them with Base64 (because SMTP has a 1000 character limit on line length [1]). Since this also affects readability of the file itself (if someone edits it in a text editor), the best way forward is to wrap the lines. XML treats all line breaks exactly the same as regular space characters [2,3] so you don't need to do anything special. Sascha [1] http://www.apps.ietf.org/rfc/rfc2821.html#sec-4.5.3.1 [2] http://www.w3.org/TR/2004/REC-xml-20040204/#sec-line-ends [3] http://www.w3.org/TR/2004/REC-xml-20040204/#AVNormalize -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Use the same wording for the filesize of an entry without a file SL #2880
Excerpts from Simon Schampijer's message of Mon Jun 06 11:25:36 +0200 2011: The change has no impact on existing translations, since we use as well util.format_size when no filesize is specified. Acked-By: Sascha Silbe si...@activitycentral.com Thanks for the patch! Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Make sure the entry has the right color when copying from external device to Journal SL #2690
Excerpts from Simon Schampijer's message of Fri Jun 03 12:38:03 +0200 2011: [src/jarabe/journal/model.py] @@ -615,6 +617,9 @@ def copy(metadata, mount_point): Copies an object to another mount point metadata = get(metadata['uid']) +if mount_point == '/' and metadata['icon-color'] == '#00,#ff': Where does this colour come from? If we don't know the colour, why is it set? Otherwise the patch looks fine. Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Add copy-to option in the Journal
Excerpts from Simon Schampijer's message of Sun May 29 15:59:56 +0200 2011: If you look at 'get_file' [1], you can see that we return 'None' when there is not a file associated with the entry. This is the case for example for memorize activity entry. When we want to clone such an entry 'get_file' will return None, but the DS expect the filepatch to be '' when there is no file associated with it [2]. Sure. But I thought we only show an error message if the user tries to copy an entry without an associated file? Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
[Sugar-devel] [RELEASE] Terminal-33
== Bundle == http://activities.sugarlabs.org/en-US/sugar/downloads/file/27403/terminal-33.xo == Source == http://download.sugarlabs.org/sources/sucrose/fructose/Terminal/Terminal-33.tar.bz2 == News - Release Notes == * Adding a zoom out and zoom in button, with accelerators, which change text font size of the terminal area. Same accelerators as used by GNOME Terminal. by:manuel quiñones manuel.por@gmail.com * Changing gtk notebook to sugar notebook by natetheis, natetheis @ gmail.com EOL :) ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Fix invitations from a non sugar client (empathy), part of OLPC #10814
Excerpts from Simon Schampijer's message of Tue May 31 19:39:25 +0200 2011: [src/jarabe/model/invites.py] +class PrivateInvite(BaseInvite): [...] +def join(self): [...] +if bundle is None: +self._call_handle_with() Did you post the wrong patch? In your previous mail you said you removed the dead code block in PrivateInvite.join(). Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH sugar] Display title in palette of shared activity OLPC #10676
Excerpts from Simon Schampijer's message of Mon May 30 15:57:26 +0200 2011: Looks nice and simple but seems to be more complicated in practice: We don't follow changes to the activity title because the palette gets created just once in ActivityView.__init__(). I think it has to do with [1] and can be handled apart from that patch. It's the same kind of deficiency, but in existing and unrelated code. For the new behaviour you're introducing (showing the activity title in the Neighborhood) this issue is more severe because it reduces the usefulness of showing the title: If you share a new activity and change the title to attract others to join you, all they will see is the unhelpful default activity instance name. We should at least discuss this with the Design Team. [1] http://bugs.sugarlabs.org/ticket/1474 Sascha -- http://sascha.silbe.org/ http://www.infra-silbe.de/ signature.asc Description: PGP signature ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] Browse: Set and restore index in the history - Fix OLPC #10779
Excerpts from godiard's message of Mon Jun 06 22:31:48 +0200 2011:
If the user go back, or select any page in the history and
close the activity, need restore at the next start, the history,
and the index in the history too.
Please mentions the upstream ticket (SL#2499 [1]) as well.
I tried your patch and while it did restore all tabs (something I wasn't
sure it'd do from reading the code), both the history and the current
page in at least one tab were different after Stop/Resume.
+tab_number = 0
+for current in self.model.data['currents']:
+browser = self._tabbed_view.get_nth_page(tab_number)
+browser.set_history_index(current['index'])
+tab_number = tab_number + 1
You can use enumerate() instead:
for number, tab in enumerate(self.model.data['currents']):
browser = self._tabbed_view.get_nth_page(number)
browser.set_history_index(current['history_index'])
@@ -505,7 +498,10 @@ class WebActivity(activity.Activity):
if n_browser != None:
nsiuri = browser.progress.location
ui_uri = browser.get_url_from_nsiuri(nsiuri)
-info = {'title': browser.props.title, 'url': ui_uri}
+index = browser.get_history_index()
+info = {'title': browser.props.title, 'url': ui_uri,
+'index': index}
Renaming index to history_index would make its meaning clearer.
Sascha
[1] https://bugs.sugarlabs.org/ticket/2499
--
http://sascha.silbe.org/
http://www.infra-silbe.de/
signature.asc
Description: PGP signature
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Record-92
On Mon, Jun 6, 2011 at 5:34 PM, Sugar Labs Activities activit...@sugarlabs.org wrote: Activity Homepage: http://activities.sugarlabs.org/addon/4081 Sugar Platform: 0.90 - 0.92 Download Now: http://activities.sugarlabs.org/downloads/file/27398/record-92.xo Release notes: Can we have a tar file release for this? Peter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [ASLO] Release Jukebox-21
On Tue, Jun 7, 2011 at 12:56 PM, Sugar Labs Activities activit...@sugarlabs.org wrote: Activity Homepage: http://activities.sugarlabs.org/addon/4045 Sugar Platform: 0.82 - 0.92 Download Now: http://activities.sugarlabs.org/downloads/file/27401/jukebox-21.xo Release notes: Notas de la versión: Don't call into GTK+ when setting video sink from gstreamer thread - SL #2853 (Daniel Drake) Updated translations Can we have a tar file release please? Peter ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
Re: [Sugar-devel] [PATCH] customize icon patch
On Tue, Jun 7, 2011 at 1:46 PM, Sascha Silbe si...@sugarlabs.org wrote: Excerpts from Walter Bender's message of Mon Jun 06 20:31:08 +0200 2011: Alas, git send-email would [not] accept this patch. Please see the attach patch (and icon). This icon is used by the new View Source copy bundle code. The reason is that you're using very long lines that cannot be represented in an email without encoding them with Base64 (because SMTP has a 1000 character limit on line length [1]). Since this also affects readability of the file itself (if someone edits it in a text editor), the best way forward is to wrap the lines. XML treats all line breaks exactly the same as regular space characters [2,3] so you don't need to do anything special. Sascha [1] http://www.apps.ietf.org/rfc/rfc2821.html#sec-4.5.3.1 [2] http://www.w3.org/TR/2004/REC-xml-20040204/#sec-line-ends [3] http://www.w3.org/TR/2004/REC-xml-20040204/#AVNormalize -- http://sascha.silbe.org/ http://www.infra-silbe.de/ I hadn't modified the inkscape output except to add the entity definitions. I'll take care of it once we finalize the icon design. thanks, -walter -- Walter Bender Sugar Labs http://www.sugarlabs.org ___ Sugar-devel mailing list Sugar-devel@lists.sugarlabs.org http://lists.sugarlabs.org/listinfo/sugar-devel
