[Sugar-devel] [PATCH sugar v2 0/2] Use pgettext() for Remove

2011-02-12 Thread Sascha Silbe
Use pgettext() to distinguish between different Remove strings so we
can translate them differently in some languages (e.g. Spanish)

v1-v2: wrap line  79 characters

Sascha Silbe (2):
  recognise translations using pgettext
  Allow Remove in Clipboard resp. Volumes palette to be translated
differently

 po/Makevars   |1 +
 src/jarabe/frame/clipboardmenu.py |4 +++-
 src/jarabe/view/palettes.py   |3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 po/Makevars

--
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [PATCH sugar v2 1/2] recognise translations using pgettext

2011-02-12 Thread Sascha Silbe
Since Python doesn't support pgettext, we need to teach xgettext to recognise
it.

Signed-off-by: Sascha Silbe si...@activitycentral.com
---
 po/Makevars |1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 po/Makevars

diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 000..da4dba6
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1 @@
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=C_:1c,2 
--keyword=NC_:1c,2 --keyword=Q_ --keyword=g_dgettext:2 
--keyword=g_dngettext:2,3 --keyword=g_dpgettext:2 --keyword=g_dpgettext2=2c,3 
--keyword=pgettext:1c,2
-- 
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [PATCH sugar v2 2/2] Allow Remove in Clipboard resp. Volumes palette to be translated differently

2011-02-12 Thread Sascha Silbe
Some languages (e.g. Spanish) benefit from having the translation for the
Remove item in the Volumes palette different from the translation for the
Remove item in the Clipboard palette.

This builds on the pgettext() support in sugar-toolkit.

Signed-off-by: Sascha Silbe si...@activitycentral.com
---
 src/jarabe/frame/clipboardmenu.py |4 +++-
 src/jarabe/view/palettes.py   |3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/jarabe/frame/clipboardmenu.py 
b/src/jarabe/frame/clipboardmenu.py
index d11538d..1d22d8e 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -30,6 +30,7 @@ from sugar.graphics.xocolor import XoColor
 from sugar.datastore import datastore
 from sugar import mime
 from sugar import env
+from sugar.activity.i18n import pgettext
 
 from jarabe.frame import clipboard
 from jarabe.journal import misc
@@ -51,7 +52,8 @@ class ClipboardMenu(Palette):
 
 self._progress_bar = None
 
-self._remove_item = MenuItem(_('Remove'), 'list-remove')
+self._remove_item = MenuItem(pgettext('Clipboard', 'Remove'),
+ 'list-remove')
 self._remove_item.connect('activate', self._remove_item_activate_cb)
 self.menu.append(self._remove_item)
 self._remove_item.show()
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index d9c1f6b..a13be46 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -28,6 +28,7 @@ from sugar.graphics.menuitem import MenuItem
 from sugar.graphics.icon import Icon
 from sugar.graphics import style
 from sugar.graphics.xocolor import XoColor
+from sugar.activity.i18n import pgettext
 
 from jarabe.model import shell
 from jarabe.view.viewsource import setup_view_source
@@ -217,7 +218,7 @@ class VolumePalette(Palette):
 
 self.connect('popup', self.__popup_cb)
 
-menu_item = MenuItem(_('Remove'))
+menu_item = MenuItem(pgettext('Volume', 'Remove'))
 
 icon = Icon(icon_name='media-eject', icon_size=gtk.ICON_SIZE_MENU)
 menu_item.set_image(icon)
-- 
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [PATCH sugar] fix whitespace error introduced by 4b6a534 (revert of 4a3416b)

2011-02-12 Thread Sascha Silbe
Signed-off-by: Sascha Silbe si...@activitycentral.com
---
 src/jarabe/model/bundleregistry.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/jarabe/model/bundleregistry.py 
b/src/jarabe/model/bundleregistry.py
index 594630e..84d55c0 100644
--- a/src/jarabe/model/bundleregistry.py
+++ b/src/jarabe/model/bundleregistry.py
@@ -179,7 +179,7 @@ class BundleRegistry(gobject.GObject):
 if bundle.get_bundle_id() == bundle_id:
 return bundle
 return None
-
+
 def __iter__(self):
 return self._bundles.__iter__()
 
-- 
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH v2] Free space displayed for Journal Button in Volumes Toolbar. (Ticket #2318)

2011-02-12 Thread Sascha Silbe
Excerpts from Ishan Bansal's message of Sun Oct 17 20:44:59 +0200 2010:

 Pallete added to calculate and display free journal space when we write click.

Pushed (with a different description) as 8e59b30 [1], thanks!

I tried refactoring this to use jarabe.views.palettes.JournalPalette,
but the latter builds on jarabe.views.palettes.BasePalette which
requires a HomeActivity instance to work. Since
jarabe.journal.JournalButton is added during Journal initialisation,
a HomeActivity instance (which is basically a wrapper around a mapped
window in our window manager code) is not available.

I'm not perfectly happy with the code duplication, but we can revisit
this when we slim out our window manager code.

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/8e59b300caeff8fee61eb8e586ef54ad64cdf0f1
-- 
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 v6] Show busy cursor during session shutdown

2011-02-12 Thread Sascha Silbe
Excerpts from James Cameron's message of Tue Dec 14 23:00:57 +0100 2010:

 Reviewed-by: James Cameron qu...@laptop.org

Thanks, pushed as df126ba [1].

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/df126badb7b76e5152c4abfdfec17db02cefa014
-- 
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] [PATCH sugar] Intro: Fall back to user name if GECOS real name field is empty

2011-02-12 Thread Sascha Silbe
Signed-off-by: Sascha Silbe si...@activitycentral.com
---

I'd like to offer this version instead. It eliminates the now superflous
check on pw_gecos, too.

 src/jarabe/intro/window.py |   10 +++---
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/jarabe/intro/window.py b/src/jarabe/intro/window.py
index a18a0d2..e64d46b 100644
--- a/src/jarabe/intro/window.py
+++ b/src/jarabe/intro/window.py
@@ -172,13 +172,9 @@ class _IntroBox(hippo.CanvasBox):
 self._page = self.PAGE_COLOR
 if default_nick == 'system':
 pwd_entry = pwd.getpwuid(os.getuid())
-if pwd_entry.pw_gecos:
-nick = pwd_entry.pw_gecos.split(',')[0]
-self._name_page.set_name(nick)
-else:
-self._name_page.set_name(pwd_entry.pw_name)
-else:
-self._name_page.set_name(default_nick)
+default_nick = (pwd_entry.pw_gecos.split(',')[0] or
+pwd_entry.pw_name)
+self._name_page.set_name(default_nick)

 self._setup_page()

--
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH sugar] Intro: Fall back to user name if GECOS real name field is empty

2011-02-12 Thread Aleksey Lim
Reviewed-by: Aleksey Lim alsr...@activitycentral.org

-- 
Aleksey
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] Sugar Ad-hoc icons show in search results when connect/disconnect to AP OLPC #10412

2011-02-12 Thread Sascha Silbe
Excerpts from Simon Schampijer's message of Wed Nov 03 15:20:31 +0100 2010:

 When searching for an AP the Sugar ad-hoc networks are greyed
 out (if their name does not contain the search string). When
 then trying to connect to an AP the Sugar ad-hoc networks get
 colored again.

[...]

Pushed as 5169e7f [1], thanks!

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/5169e7f74a65df3e0c622a620f13088453405423
-- 
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] Intro: Fall back to user name if GECOS real name field is empty

2011-02-12 Thread Sascha Silbe
Excerpts from Aleksey Lim's message of Sat Feb 12 18:27:44 +0100 2011:

 Reviewed-by: Aleksey Lim alsr...@activitycentral.org

Thanks, pushed as 2150b3a [1].

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/2150b3aaa0c80d58989c4e9859b1d2bc3af47053
-- 
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] [off topic] OLPCs running on XP?

2011-02-12 Thread Nagarjuna G
Where on earth are OLPCs running on XP?  What percent of the OLPCs
actually are running on XP?

I know there are very few, possibly in Peru.  Do any of you know any
other places? If any of you even direct me to a place where I can get
some info on this, that will help.  I am sending some answers to
someone, and if my reply is accurate that will help.

--
GN
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [off topic] OLPCs running on XP?

2011-02-12 Thread Walter Bender
On Sat, Feb 12, 2011 at 1:14 PM, Nagarjuna G nagar...@gnowledge.org wrote:
 Where on earth are OLPCs running on XP?  What percent of the OLPCs
 actually are running on XP?

 I know there are very few, possibly in Peru.  Do any of you know any
 other places? If any of you even direct me to a place where I can get
 some info on this, that will help.  I am sending some answers to
 someone, and if my reply is accurate that will help.

With the exception of a few machines that were part of a Microsoft
trial, I don't know of any XOs running XP in the field.

-walter


 --
 GN
 ___
 Sugar-devel mailing list
 Sugar-devel@lists.sugarlabs.org
 http://lists.sugarlabs.org/listinfo/sugar-devel




-- 
Walter Bender
Sugar Labs
http://www.sugarlabs.org
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [DESIGN] [PATCH sugar] Speaker frame device: pop up palette on left-click instead of toggling mute

2011-02-12 Thread Sascha Silbe
Reports from the field indicate that users accidently left-click the Speaker
icon and don't realise it got muted. By popping up the palette we enable them
to explicitly choose the mute action without instead of surprising them by
automatically executing one of the secondary actions (there is no primary
action).

Signed-off-by: Sascha Silbe si...@activitycentral.com
---
 extensions/deviceicon/speaker.py |8 
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/extensions/deviceicon/speaker.py b/extensions/deviceicon/speaker.py
index b6e33d8..d396bfb 100644
--- a/extensions/deviceicon/speaker.py
+++ b/extensions/deviceicon/speaker.py
@@ -76,12 +76,12 @@ class DeviceView(TrayIcon):
 self.icon.props.xo_color = xo_color

 def __button_release_event_cb(self, widget, event):
-if event.button == 1:
-self._model.props.muted = not self._model.props.muted
-return True
-else:
+if event.button != 1:
 return False

+self.palette_invoker.notify_right_click()
+return True
+
 def __expose_event_cb(self, *args):
 self._update_info()

--
1.7.2.3

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] Copying files multiple times results in bogus names #2060

2011-02-12 Thread Sascha Silbe
Excerpts from Aleksey Lim's message of Thu Dec 16 00:22:42 +0100 2010:


A different patch for the same issue was already pushed to master [1],
but I love that yours adds a test case. Would you be willing to rebase
your patch on mainline/master so we get the test case?

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/569c713e8300da659234b2192c78a1343f032144
-- 
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-toolkit] Insert activity root path in front of the reset of sys.path

2011-02-12 Thread Sascha Silbe
Excerpts from Martin Langhoff's message of Tue Feb 08 04:46:32 +0100 2011:

 To wit, note the first entry at
 
 $ python
 Python 2.7 (r27:82500, Sep 16 2010, 18:03:06)
[...]
  sys.path
 ['', '/usr/lib/python27.zip', '/usr/lib/python2.7',
[...]

 The behaviour sought by Aleksey's patch makes sense. I am surprised
 that CWD isn't set to SUGAR_BUNDLE_PATH, maybe that needs to get fixed
 instead.

Thanks for disproving my assumption that it's something Python 2.x does
differently and pointing at the actual issue.

I agree that we should either change the working directory or tweak
sys.path, but I'm still a bit worried about compatibility.

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] [PATCH 1/2] shell: handle activities that cycle through windows dlo#10695

2011-02-12 Thread martin . langhoff
From: Martin Langhoff mar...@laptop.org

Now activities have a stack of windows (Activity._windows). The
lowest still-valid window in the stack is considered the main window.

When a window is closed, the shell finds what activity had that window,
tells it to remove it from its stack. If that was the last window
in the activities' stack, the activity is marked as closed.

With this patch, activities can switch from one window to another
safely, without sugar shell losing track of them. Activities based
on AdobeAIR have been seen to switch windows (perhaps when they navigate
from one SWF to another).

This replaces the one-window = one-activity model, where the moment
an activity closed one window (perhaps one of many) it was considered
closed by the shell.
---
 src/jarabe/model/shell.py |   81 +---
 1 files changed, 53 insertions(+), 28 deletions(-)

diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index 661e370..bd7e367 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -62,11 +62,12 @@ class Activity(gobject.GObject):
 the type of activity being created.
 activity_id -- unique identifier for this instance
 of the activity type
-window -- Main WnckWindow of the activity
+_windows -- WnckWindows registered for the activity. The lowest
+one in the stack is the main window.
 
 gobject.GObject.__init__(self)
 
-self._window = None
+self._windows = []
 self._service = None
 self._activity_id = activity_id
 self._activity_info = activity_info
@@ -74,7 +75,7 @@ class Activity(gobject.GObject):
 self._launch_status = Activity.LAUNCHING
 
 if window is not None:
-self.set_window(window)
+self.add_window(window)
 
 self._retrieve_service()
 
@@ -96,15 +97,20 @@ class Activity(gobject.GObject):
 
 launch_status = gobject.property(getter=get_launch_status)
 
-def set_window(self, window):
-Set the window for the activity
-
-We allow resetting the window for an activity so that we
-can replace the launcher once we get its real window.
-
+def add_window(self, window):
+Add a window to the windows stack.
 if not window:
 raise ValueError('window must be valid')
-self._window = window
+self._windows.append(window)
+
+def remove_window_by_xid(self, xid):
+Remove a window from the windows stack.
+for wnd in self._windows:
+if wnd.get_xid() == xid:
+# must break after changing array
+self._windows.remove(wnd)
+return True
+return False
 
 def get_service(self):
 Get the activity service
@@ -118,8 +124,8 @@ class Activity(gobject.GObject):
 
 def get_title(self):
 Retrieve the application's root window's suggested title
-if self._window:
-return self._window.get_name()
+if self._windows:
+return self._windows[0].get_name()
 else:
 return ''
 
@@ -171,31 +177,44 @@ class Activity(gobject.GObject):
 
 def get_xid(self):
 Retrieve the X-windows ID of our root window
-if self._window is not None:
-return self._window.get_xid()
+if self._windows:
+return self._windows[0].get_xid()
 else:
 return None
 
+def has_xid(self, xid):
+Retrieve the X-windows ID of our root window
+if self._windows:
+for wnd in self._windows:
+if wnd.get_xid() == xid:
+return True
+return None
+
 def get_window(self):
 Retrieve the X-windows root window of this application
 
-This was stored by the set_window method, which was
-called by HomeModel._add_activity, which was called
+This was stored by the add_window method, which was 
+called by HomeModel._add_activity, which was called 
 via a callback that looks for all 'window-opened'
 events.
 
+We keep a stack of the windows. The lowest window in the
+stack that is still valid we consider the main one.
+
 HomeModel currently uses a dbus service query on the
 activity to determine to which HomeActivity the newly
 launched window belongs.
 
-return self._window
+   if self._windows:
+return self._windows[0]
+return None
 
 def get_type(self):
 Retrieve the activity bundle id for future reference
-if self._window is None:
+if not self._windows:
 return None
 else:
-return wm.get_bundle_id(self._window)
+return wm.get_bundle_id(self._windows[0])
 
 def is_journal(self):
 Returns boolean if the activity is of type JournalActivity

[Sugar-devel] [PATCH 2/2] trace flipping windows for debugging purposes dlo#10683

2011-02-12 Thread martin . langhoff
From: Simon Schampijer si...@schampijer.de

badly behaved activities flip windows quickly, add log for
tracing them
---
 src/jarabe/model/shell.py |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
index bd7e367..f01eb8e 100644
--- a/src/jarabe/model/shell.py
+++ b/src/jarabe/model/shell.py
@@ -504,6 +504,9 @@ class ShellModel(gobject.GObject):
 return self._activities.index(obj)
 
 def _window_opened_cb(self, screen, window):
+# badly behaved activities flip windows quickly
+# trace it for debugging purposes dlo#10683
+logging.debug('_window_opened_cb wnd %s' % window)
 if window.get_window_type() == wnck.WINDOW_NORMAL:
 home_activity = None
 
@@ -536,8 +539,8 @@ class ShellModel(gobject.GObject):
 and home_activity.get_launch_status() == 
Activity.LAUNCHING:
 self.emit('launch-completed', home_activity)
 startup_time = time.time() - home_activity.get_launch_time()
-logging.debug('%s launched in %f seconds.',
-home_activity.get_type(), startup_time)
+logging.debug('%s launched in %f seconds.' %
+   (service_name, startup_time))
 
 if self._active_activity is None:
 self._set_active_activity(home_activity)
-- 
1.7.3.4

___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] make 'setup.py genpot' produce a pot without a full path in filenames #2508

2011-02-12 Thread Sascha Silbe
Excerpts from Simon Schampijer's message of Mon Nov 29 13:21:03 +0100 2010:

 -python_files.append(os.path.join(root, file_name))
 +relpath = os.path.relpath(os.path.join(root, file_name),
 +  config.source_dir)
 +python_files.append(relpath)

Pushed (with minor changes) as b30bc01 [1], thanks!

Sascha

[1] 
http://git.sugarlabs.org/sugar-toolkit/mainline/commit/b30bc0151c357f0e60eb92c934daa56ca28d2df0
-- 
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] [off topic] OLPCs running on XP?

2011-02-12 Thread Rafael Ortiz
On Sat, Feb 12, 2011 at 1:18 PM, Walter Bender walter.ben...@gmail.comwrote:

 On Sat, Feb 12, 2011 at 1:14 PM, Nagarjuna G nagar...@gnowledge.org
 wrote:
  Where on earth are OLPCs running on XP?  What percent of the OLPCs
  actually are running on XP?
 
  I know there are very few, possibly in Peru.  Do any of you know any
  other places? If any of you even direct me to a place where I can get
  some info on this, that will help.  I am sending some answers to
  someone, and if my reply is accurate that will help.

 With the exception of a few machines that were part of a Microsoft
 trial, I don't know of any XOs running XP in the field.

 -walter


There are some of these laptops here in Colombia (215)
in comparisson with over 4000 running Gnu/Linux





  
  --
  GN
  ___
  Sugar-devel mailing list
  Sugar-devel@lists.sugarlabs.org
  http://lists.sugarlabs.org/listinfo/sugar-devel
 



 --
 Walter Bender
 Sugar Labs
 http://www.sugarlabs.org
 ___
 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] fix whitespace error introduced by 4b6a534 (revert of 4a3416b)

2011-02-12 Thread Aleksey Lim
Reviewed-by: Aleksey Lim alsr...@activitycentral.org

-- 
Aleksey
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH sugar-toolkit] Insert activity root path in front of the reset of sys.path

2011-02-12 Thread Martin Langhoff
On Sat, Feb 12, 2011 at 1:57 PM, Sascha Silbe si...@activitycentral.com wrote:
 The behaviour sought by Aleksey's patch makes sense. I am surprised
 that CWD isn't set to SUGAR_BUNDLE_PATH, maybe that needs to get fixed
 instead.

 Thanks for disproving my assumption that it's something Python 2.x does
 differently and pointing at the actual issue.

 I agree that we should either change the working directory or tweak
 sys.path, but I'm still a bit worried about compatibility.

Hm. AFAICS, when an activity starts under S-0.84 the cwd is set
correctly. I've been debugging an activity that starts from a shell
script (as activities using libsugarize are prone to do) and the
script assumes (correctly) that CWD is the activity directory.

So I am intrigued about Aleksey's patch. Aleksey -- did you prep your
patch in response to an observed behaviour? What was it? Maybe the
problem was misdiagnosed?

cheers,


m
-- 
 martin.langh...@gmail.com
 mar...@laptop.org -- Software Architect - OLPC
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [ASLO] Release Visual Match-28

2011-02-12 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4246

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27209/visual_match-28.xo

Release notes:
Added attract mode on first launch to demonstrate how to play the game



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] time for a design meeting?

2011-02-12 Thread Sascha Silbe
Excerpts from Walter Bender's message of Sat Feb 12 02:26:21 +0100 2011:

 Thanks. This is very helpful. I have a couple of additional topics:
 one trivial and one that needs some discussion.
[...]

I took the liberty of collecting the requested topics on the wiki
page [1] and arranging them according to urgency (i.e. 0.92 vs. later)
and guesstimated time it will take to discuss them:


Topics for 0.92:
* Size issue with icons in Random Layout (Home View) (walterbender)
* Speaker frame device: pop up palette on left-click instead of toggling
  mute (silbe)
* Don't hide Register menu item upon successful registration (silbe)
* Journal entries on external media:
  [http://lists.sugarlabs.org/archive/sugar-devel/2011-February/029848.html 
Invalidate preview]
  if the data file was changed? (silbe)
* Remove 'Keep' Button: Replace by 'copy to' functionality in the Journal
  (erikos)
** Alternative (if we can't agree on removing it): rename 'Keep' to 'Keep Copy'
   (silbe)
* Move more activities to the new toolbar (erikos)


I expect the 0.92 topics to take up all our time and would prefer to
schedule another meeting for the remaining topics. If, however, we have
still plenty of time left, we could start discussing some near-future
changes:


Topics for 0.94+:
* CPU and memory resource indicator for the Frame (silbe)
* Activity startup in the Home View: Introduce new concept to distinguish
  between 'start new' vs 'resume' (erikos)
* Replace Naming Alert: a) switch to Journal detail view b) option in the
  activity toolbar to do a description and tags (erikos)
* Control Panel
  
[http://lists.sugarlabs.org/archive/sugar-devel/2011-February/thread.html#29827 
rework]
  (erikos)
* Frame: Expand hot corner on the upper left to be the entire grid cell
  (big enough for finger) (walterbender)


Sascha

[1] 
http://wiki.sugarlabs.org/go/Design_Team/Meetings#Upcoming_IRC_meeting:_Sunday_13_February_2011_16:00_UTC
-- 
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] fix whitespace error introduced by 4b6a534 (revert of 4a3416b)

2011-02-12 Thread Sascha Silbe
Excerpts from Aleksey Lim's message of Sat Feb 12 20:25:29 +0100 2011:

 Reviewed-by: Aleksey Lim alsr...@activitycentral.org

Thanks, pushed as fe80650 [1].

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/fe8065054e2ab3d79b6ce27a56e97b4a977620a8
-- 
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] Remove buddy-icon.jpg handling

2011-02-12 Thread Sascha Silbe
Excerpts from Bernie Innocenti's message of Wed Aug 11 00:35:25 +0200 2010:

 All this code from 2006 was supposed to create a bitmap version of the
 buddy icon for use by the presence service. However, JPEG avatars were
 disabled very early in Sugar's history due to performance
 considerations, rendering all this code useless a long time ago.
[...]

Most of this code was already removed during the sugar-presence-service /
Telepathy rewrite. I've pushed the remaining changes as c38e03f [1],
thanks!

Sascha

[1] 
http://git.sugarlabs.org/sugar/mainline/commit/c38e03f641e2f409464340bf67826809cf2f94dc
-- 
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 1/2] shell: handle activities that cycle through windows dlo#10695

2011-02-12 Thread Martin Langhoff
On Sat, Feb 12, 2011 at 2:09 PM,  martin.langh...@gmail.com wrote:
 diff --git a/src/jarabe/model/shell.py b/src/jarabe/model/shell.py
 index 661e370..bd7e367 100644

I'd like to recall this particular patch. Apologies, posted the wrong version.

cheers,


m
-- 
 martin.langh...@gmail.com
 mar...@laptop.org -- Software Architect - OLPC
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH sugar-toolkit] Insert activity root path in front of the reset of sys.path

2011-02-12 Thread Aleksey Lim
On Sat, Feb 12, 2011 at 02:47:32PM -0500, Martin Langhoff wrote:
 On Sat, Feb 12, 2011 at 1:57 PM, Sascha Silbe si...@activitycentral.com 
 wrote:
  The behaviour sought by Aleksey's patch makes sense. I am surprised
  that CWD isn't set to SUGAR_BUNDLE_PATH, maybe that needs to get fixed
  instead.
 
  Thanks for disproving my assumption that it's something Python 2.x does
  differently and pointing at the actual issue.
 
  I agree that we should either change the working directory or tweak
  sys.path, but I'm still a bit worried about compatibility.
 
 Hm. AFAICS, when an activity starts under S-0.84 the cwd is set
 correctly. I've been debugging an activity that starts from a shell
 script (as activities using libsugarize are prone to do) and the
 script assumes (correctly) that CWD is the activity directory.
 
 So I am intrigued about Aleksey's patch. Aleksey -- did you prep your
 patch in response to an observed behaviour? What was it? Maybe the
 problem was misdiagnosed?

The problem is, if I got it right, that cwd means nothing for searching
modules, only sys.path(and so) makes sense. After launching Python
interpreter, the $0 becomes sys.path[0]. But the problem is that
activities start from sugar-activity command, thus sys.path[0] is
/usr/bin/. So, there is need in adding SUGAR_BUNDLE_PATH to the sys.path
manually (ie simulate Python interpreter behaviour). But existed code
does it wrong (add to the end of sys.path).

 
 cheers,
 
 
 m
 -- 
  martin.langh...@gmail.com
  mar...@laptop.org -- Software Architect - OLPC
  - ask interesting questions
  - don't get distracted with shiny stuff  - working code first
  - http://wiki.laptop.org/go/User:Martinlanghoff
 ___
 Sugar-devel mailing list
 Sugar-devel@lists.sugarlabs.org
 http://lists.sugarlabs.org/listinfo/sugar-devel
 

-- 
Aleksey
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [ASLO] Release Maze-7

2011-02-12 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4071

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27210/maze-7.xo

Release notes:
Adding 118n, Es l10n and NEWS.


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] tomorrow's design meeting

2011-02-12 Thread Gary Martin
On 12 Feb 2011, at 16:40, Walter Bender walter.ben...@gmail.com wrote:

 On Sat, Feb 12, 2011 at 11:24 AM, Christian Marc Schmidt
 christianm...@gmail.com wrote:
 9am (I assume you mean EST?) will work for me...
 Christian
 
 On Sat, Feb 12, 2011 at 11:07 AM, Walter Bender walter.ben...@gmail.com
 wrote:
 
 I may be late (or, if possible, could we start at 9am instead?)
 
 Yes. EST. If it works for Gary, let's do it.

I can be there (14:00 GMT), but watch out, the last few emails on this thread 
fell off the public mail-list, we may have folks turning up at the wrong time.

--Gary

 thanks.
 
 -walter
 
 
 -walter
 
 --
 Walter Bender
 Sugar Labs
 http://www.sugarlabs.org
 
 
 
 --
 anyth...@christianmarcschmidt.com
 917/ 575 0013
 
 http://www.christianmarcschmidt.com
 http://www.linkedin.com/in/christianmarcschmidt
 http://twitter.com/cms_
 
 
 
 
 -- 
 Walter Bender
 Sugar Labs
 http://www.sugarlabs.org
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH sugar-toolkit] Insert activity root path in front of the reset of sys.path

2011-02-12 Thread Martin Langhoff
On Sat, Feb 12, 2011 at 6:57 PM, Aleksey Lim
alsr...@activitycentral.org wrote:
 The problem is, if I got it right, that cwd means nothing for searching
 modules, only sys.path(and so) makes sense. After launching Python
 interpreter, the $0 becomes sys.path[0]. But the problem is that
 activities start from sugar-activity command, thus sys.path[0] is
 /usr/bin/. So, there is need in adding SUGAR_BUNDLE_PATH to the sys.path
 manually (ie simulate Python interpreter behaviour). But existed code
 does it wrong (add to the end of sys.path).

OK - so when starting pure Python activities, the shell is never
involved, and we just fork the python interpreter.

In that case, yes, it makes sense to put SUGAR_BUNDLE_PATH in
sys.path[0]. It mimics what Python would normally do.



m
-- 
 martin.langh...@gmail.com
 mar...@laptop.org -- Software Architect - OLPC
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [ASLO] Tech Report

2011-02-12 Thread Aleksey Lim
This is activities.sugarlabs.org report to cover only technical
ASLO aspects.

== ASLO maintaining ==

Actually, we didn't have any explicit workflows except just coding ASLO
patch on top of AMO code base, maintaining ASLO servers, and more or
less regular approving of new activities by not many people.

Nevertheless, it would be useful to have more explicit picture:

Technical support, coding and server maintaining
(content related changes only by editors request):

Aleksey Lim (lead)

Content support, ie, ASLO editors:

Anish Mangal
Bernie Innocenti
David Farning
Gary Martin
Gonzalo Odiard
Luke Faraone
Pablo Flores
Rafael Ortiz (lead)
Sascha Silbe
Simon Schampijer
Thomas Gilliard
Walter Bender

This is how ASLO staff looks today, technical people by recent changes
in ASLO code base and content people is a list of current ASLO editors
in the database. Since it is useful to have only one last person to
kick, there are leads:

Aleksey Lim (coding, server maintaining)
Rafael Ortiz (content editors)

Organizational. For technical part it is more or less clean, it is the
code. For content management, it is not so good. The activity of ASLO
editors is low, would be useful to have more editors. So, there is huge
amount of work for editors to make ASLO more community/educational
oriented.

== New Features ==

1.  Activity version in collections.
If version is set for collection activity, only this particular
version can be downloaded from collection.

2.  Micro-format interface.


http://activities.sugarlabs.org/services/micro-format.php?collection_nickname=nick[sugar=version]
e.g.

http://activities.sugarlabs.org/services/micro-format.php?collection_nickname=gcomprissugar=0.88

* if activity version was not set in collection and sugar request
  argument wasn't passed, then return recent activity version
* if activity version was not set in collection and sugar request
  argument was passed, then return either recent activity version
  only for this sugar or nothing
* if activity version was set in collection, regardless sugar request
  argument, exactly this version will be returned

== Roadmap ==

The upstream is in process of switching to new AMO code base, django
based (python based framework). We need to do the same. So, the plan is:

* Reimplement current ASLO patch to do the exactly the same in new AMO
* Add new but not breaking current behaviour:
  * Upload by one click
  * Experimental support of bundle-less activities [1]

The plan is having new ASLO ready for broad, pre-production testing,
until 2011-04-06.

=== Upload by one click ===

The only that will be required is just uploading a .xo to the server.
All needed metadata will be fetched from the bundle:

* activity.info, activity metadata
* NEWS, release notes
* po/, translation of activity.info fields

=== Bundle-less activities ===

Excluding network-less environments, the only thing anyone should know
about any activity, to run it from anywhere, is an unique Web url.
It is based on 0install[2] project. Network based nature, though, does
not mean the it will be useless w/o the net. It will be possible
to make selfcontained bundle by packaging activity itself and all its
dependencies to one .xo.

[1] 
http://wiki.sugarlabs.org/go/Platform_Team/Doers_environment#Sugar_doers_workflow
[2] http://0install.net/goals.html
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [ASLO] Release Scratch-14

2011-02-12 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4249

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27211/scratch-14.xo

Release notes:



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 Scratch-16

2011-02-12 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4249

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27213/scratch-16.xo

Release notes:
Release from http://wiki.laptop.org/go/Scratch


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 Scratch-17

2011-02-12 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4249

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27214/scratch-17.xo

Release notes:
Releases from http://wiki.laptop.org/go/Scratch


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] [off topic] OLPCs running on XP?

2011-02-12 Thread Nagarjuna G
On Sun, Feb 13, 2011 at 12:48 AM, Rafael Ortiz
raf...@activitycentral.com wrote:


 On Sat, Feb 12, 2011 at 1:18 PM, Walter Bender walter.ben...@gmail.com
 wrote:

 On Sat, Feb 12, 2011 at 1:14 PM, Nagarjuna G nagar...@gnowledge.org
 wrote:
  Where on earth are OLPCs running on XP?  What percent of the OLPCs
  actually are running on XP?
 
  I know there are very few, possibly in Peru.  Do any of you know any
  other places? If any of you even direct me to a place where I can get
  some info on this, that will help.  I am sending some answers to
  someone, and if my reply is accurate that will help.

 With the exception of a few machines that were part of a Microsoft
 trial, I don't know of any XOs running XP in the field.

 -walter


 There are some of these laptops here in Colombia (215)
 in comparisson with over 4000 running Gnu/Linux


thanks Walter and Rafael.  That will help to fill my argument.

--
GN
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [ASLO] Tech Report

2011-02-12 Thread David Farning
On Sat, Feb 12, 2011 at 7:21 PM, Aleksey Lim
alsr...@activitycentral.org wrote:
 This is activities.sugarlabs.org report to cover only technical
 ASLO aspects.

 == ASLO maintaining ==

 Actually, we didn't have any explicit workflows except just coding ASLO
 patch on top of AMO code base, maintaining ASLO servers, and more or
 less regular approving of new activities by not many people.

 Nevertheless, it would be useful to have more explicit picture:

    Technical support, coding and server maintaining
    (content related changes only by editors request):

        Aleksey Lim (lead)

    Content support, ie, ASLO editors:

        Anish Mangal
        Bernie Innocenti
        David Farning
        Gary Martin
        Gonzalo Odiard
        Luke Faraone
        Pablo Flores
        Rafael Ortiz (lead)
        Sascha Silbe
        Simon Schampijer
        Thomas Gilliard
        Walter Bender

 This is how ASLO staff looks today, technical people by recent changes
 in ASLO code base and content people is a list of current ASLO editors
 in the database. Since it is useful to have only one last person to
 kick, there are leads:

    Aleksey Lim (coding, server maintaining)
    Rafael Ortiz (content editors)

On the content side, the New Zealand testers would be perfect fit for
editors. Every weekend they could go through the queue of uploaded
activities for the week and approve the one without regressions.

There would be a strong incentive for people to fix the bugs the
NZTesters report in order have their active moved from the sandbox in
to public.

david

 Organizational. For technical part it is more or less clean, it is the
 code. For content management, it is not so good. The activity of ASLO
 editors is low, would be useful to have more editors. So, there is huge
 amount of work for editors to make ASLO more community/educational
 oriented.

 == New Features ==

 1.  Activity version in collections.
    If version is set for collection activity, only this particular
    version can be downloaded from collection.
 2.  Micro-format interface.

        
 http://activities.sugarlabs.org/services/micro-format.php?collection_nickname=nick[sugar=version]
        e.g.
        
 http://activities.sugarlabs.org/services/micro-format.php?collection_nickname=gcomprissugar=0.88

    * if activity version was not set in collection and sugar request
      argument wasn't passed, then return recent activity version
    * if activity version was not set in collection and sugar request
      argument was passed, then return either recent activity version
      only for this sugar or nothing
    * if activity version was set in collection, regardless sugar request
      argument, exactly this version will be returned

 == Roadmap ==

 The upstream is in process of switching to new AMO code base, django
 based (python based framework). We need to do the same. So, the plan is:

 * Reimplement current ASLO patch to do the exactly the same in new AMO
 * Add new but not breaking current behaviour:
  * Upload by one click
  * Experimental support of bundle-less activities [1]

 The plan is having new ASLO ready for broad, pre-production testing,
 until 2011-04-06.

 === Upload by one click ===

 The only that will be required is just uploading a .xo to the server.
 All needed metadata will be fetched from the bundle:

 * activity.info, activity metadata
 * NEWS, release notes
 * po/, translation of activity.info fields

 === Bundle-less activities ===

 Excluding network-less environments, the only thing anyone should know
 about any activity, to run it from anywhere, is an unique Web url.
 It is based on 0install[2] project. Network based nature, though, does
 not mean the it will be useless w/o the net. It will be possible
 to make selfcontained bundle by packaging activity itself and all its
 dependencies to one .xo.

 [1] 
 http://wiki.sugarlabs.org/go/Platform_Team/Doers_environment#Sugar_doers_workflow
 [2] http://0install.net/goals.html
 ___
 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


[Sugar-devel] [Design] New Home View Framebar proposal

2011-02-12 Thread Frederick Grose
mockup at:
http://wiki.sugarlabs.org/go/Design_Team/Proposals/Home_View/Toolbar

The current Home View toolbar is mostly wasted space.

There have been a number of Design discussions suggesting that
* The Home list view is confused with and should be replaced by the
  Journal.
* The Journal Icon should always be available in the Home View.
* The Frame is not discoverable enough.
* The number of and memory consumption of open Activities should be
  more apparent.

This proposal addresses these by replacing the Home View toolbar with the
Frame upperbar.

The Home View framebar would
* Activate the full Frame on hover, exposing the Frame for greater
  familiarity.
* Provide a permanent link to the Journal.
* Reveal the number of open Activities.
**  A dynamic, region for each open Activity instance that was
roughly proportional to the fraction of available memory (back-
highlighted as currently for the active Activity instance) would
help to reveal the memory economics.

* Continue to offer Home View layouts by moving that palette under
  the Home F3 palette.
* This design would also eliminate the non-functional search tool,
  (F5 or the Search button would still take one to the Journal search
  tool).
**  A search tool could be added to the Home F3 icon palette.

* Until folks are comfortable with and have a 'System' Journal
  available through Journal_s_, setting favorites for installed
  Activity bundles could be done on a list or gallery view accessed
  from the Home F3 palette that would popover the Home View, like the
  'My Settings' dialog, to distinguish it from a Journal view (for
  now).
**  Homunq's sidepane might also be suitable.

  --Fred
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] Presentation

2011-02-12 Thread Yader Velásquez
Hi everybody. My name is Yader Velásquez, I'm 18 years old and
I'm from Nicaragua. It's a great honor for me, colaborate for sugar.

Besides of develop activities, I'll begin to package activities for Fedora
(rpm)
I've been developed calendario
http://wiki.sugarlabs.org/go/Activities/calendario

Regards

-- 
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