[Sugar-devel] When owner leaves, shared activity does not always go away on his own view (dextrose)

2010-10-22 Thread Simon Schampijer

Hi,

I have been fixing that bug [1] on 0.84. As The PS has been killed in 
0.90 it is not of need there. So it is of use in 0.88 (e.g. dextrose), 
so I will push it there if nobody objects.


Dextrose will be interested as well in #10400 [2], it is present there 
as well.


Regards,
   Simon

[1] http://dev.laptop.org/ticket/10308
[2] http://dev.laptop.org/ticket/10400
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH sugar 00/21] style cleanup series

2010-10-22 Thread Simon Schampijer

On 10/17/2010 12:20 AM, Sascha Silbe wrote:

This is the sugar part of the style cleanups I've wanted to land at
least two releases ago, but kept missing the window.

I have done some basic testing, but naturally cannot test all code
paths I've touched (some even appear to be unused). This is why I'd like
to land this right after we branched off sucrose-0.90: to ensure it gets
enough testing before the next release.

There are a couple of pylint complaints remaining. Some of them are
pylint bugs, but a fair number are things that should be looked at more
closely. One even shows the cause of SL#1748.


Awesome, thanks for that work! I am a bit busy with 0.84 work at the 
moment but will have a look when I get to it.


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


Re: [Sugar-devel] Activity updates

2010-10-22 Thread Aleksey Lim
On Tue, Oct 19, 2010 at 07:28:45PM -0200, Bernie Innocenti wrote:
 Quoting you from IRC:
 
 garycmartin 09:36:21 bernie: Was it you that mentioned that
 deployments did not want to point to ASLO for update as version were not
 being flagged correctly for Sugar release compatibility?
 garycmartin 09:45:09 bernie: FWIW, I've just been through 60+
 activities testing ASLO installs on a clean XO-1 0.82 build (0.84 is
 next on my todo list). I only found 4 activities that didn't have an old
 enough past version uploaded for that release of Sugar, and only one
 activity that failed to launch due to a trivial file permission error in
 the bundle (SL#2464).
 
 
 Indeed, almost all activities are compatible across 0.84-0.88. Probably
 also 0.90.
 
 But the point is that deployments really need to ensure that the
 activity works with their lesson plans. For example, Turtle Art's
 sensors support has been broken for a while in ASLO.
 
 At any time someone could upload a new version of an activity that
 breaks some feature that deployments were relying upon. Without
 interposing an interim QA stage, possibly done by the deployment's
 education team, ASLO cannot be relied upon for updates.

 My proposed solution consits in reviving the microformat protocol for
 activity updating (already done by Anish) and then augment the existing
 concept of collections in ASLO to let deployments specify a particular
 bundle version.

Just a couple of problem that can't be solved in such way:

* problem is not only in activities itself but also in dependencies
  (some sugar distributions might have them but other don't)
  the only way for ASLO is bundling them all

* binary based activities that are strictly depends on particular distro
  version (eg TuxPaint being built against fc9 crashes on fc9+updates)
  it is nightmare to try cover such questions on ASLO

* collections are more users' method, so if one user decided to create
  new collection, he will break any QA efforts because can add arbitrary
  activity/version

The way I have in mind is using Bazaar to cover all technical questions
(development and QA related) and keep ASLO as a frontend for Bazaar
packages.

At the end, ASLO might have all activities hosted on Bazaar
(for effectively solving issues w/ dependencies and binaries). Each ASLO
activity will have a source, i.e., Bazaar project.

(We should have a possibility to have bunch of versions of the same
activity at the same time, eg, results of experiments of doers.)

So, users can filter all activities (not only in plain list but in their
collections as well) by source project. If sugar deployment created
New Deployment project on Bazaar and linked/branched/created-new
activities there, all their users can download only these activities
(if they want to get QAed stuff).

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


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Gonzalo Odiard
Lucien:
I have added the patches to http://dev.laptop.org/ticket/10364
Can you review it?
If you will create a branch 0.90, probably must be done before pushing this
tickets.
Please give me feedback about your plans.
Thanks!

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


Re: [Sugar-devel] [RELEASE] Browse-119

2010-10-22 Thread Simon Schampijer

On 10/19/2010 04:08 PM, Lucian Branescu wrote:

Thanks a lot.

I'll do a new release after I fix the tab close crash.

On 19 Oct 2010 14:41, Gonzalo Odiardgonz...@laptop.org  wrote:

I have commited a patch to solve the problem when you quit from the activity
and there are not a valid url active.

Gonzalo


Great - thanks. There is as well the X bug that would be great to diagnose.

Regards,
   Simon

Gdk-ERROR **: The program 'sugar-activity' received an X Window System 
error.

This probably reflects a bug in the program.
The error was 'RenderBadPicture (invalid Picture parameter)'.
  (Details: serial 4752 error_code 144 request_code 143 minor_code 7)
  (Note to programmers: normally, X errors are reported asynchronously;
   that is, you will receive the error a while after causing it.
   To debug your program, run it with the --sync command line
   option to change this behavior. You can then get a meaningful
   backtrace from your debugger if you break on the gdk_x_error() 
function.)

aborting...
Terminated by signal 6, pid 4796 data (None, open file 'fdopen', mode 
'w' at 0xa1930c0, 
dbus.ByteArray('cdef5f9d3be6e89b9848e1e39490ce56c04a9e17', variant_level=1))

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


Re: [Sugar-devel] [Systems] [Marketing] A little change to www.sugarlabs.org

2010-10-22 Thread Simon Schampijer

On 10/15/2010 04:00 PM, Christian Marc Schmidt wrote:

Hi--I can add this information this weekend.

Christian


Christian - can you change the page to not open the links in a new 
window? That would be great, it really hurts us a lot!


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


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Lucian Branescu
On 22 October 2010 12:05, Gonzalo Odiard gonz...@laptop.org wrote:
 Lucien:
 I have added the patches to http://dev.laptop.org/ticket/10364
 Can you review it?

Patch looks good, but it makes the toolbar extremely crowded. I'll
accept it for now, with the caveat of having a Browse toolbar overhaul
as soon as I get time for the other pressing issues (browse tab crash
and read brokenness).

 If you will create a branch 0.90, probably must be done before pushing this
 tickets.

Yes, the home button thing should certainly be in a new branch. I'll
make the 0.90 branch when I get home (no git env here). Or if you have
access, you can create a branch yourself in the mainline repository.

 Please give me feedback about your plans.
 Thanks!

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


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Simon Schampijer

On 10/22/2010 01:32 PM, Lucian Branescu wrote:

On 22 October 2010 12:05, Gonzalo Odiardgonz...@laptop.org  wrote:

Lucien:
I have added the patches to http://dev.laptop.org/ticket/10364
Can you review it?


Patch looks good, but it makes the toolbar extremely crowded. I'll
accept it for now, with the caveat of having a Browse toolbar overhaul
as soon as I get time for the other pressing issues (browse tab crash
and read brokenness).


Yes, +1 here. We should think about how we make the bar less crowded. I 
think we can think as well about how tabs are represented. In the Sugar 
case we might do differently (thumbs like we do for the session 
bookmarks for example).



If you will create a branch 0.90, probably must be done before pushing this
tickets.


Yes, the home button thing should certainly be in a new branch. I'll
make the 0.90 branch when I get home (no git env here). Or if you have
access, you can create a branch yourself in the mainline repository.


+1 from me. Ok, I will show Gonzalo to do that after lunch...

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


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Gonzalo Odiard
On Fri, Oct 22, 2010 at 8:32 AM, Lucian Branescu
lucian.brane...@gmail.comwrote:

 On 22 October 2010 12:05, Gonzalo Odiard gonz...@laptop.org wrote:
  Lucien:
  I have added the patches to http://dev.laptop.org/ticket/10364
  Can you review it?

 Patch looks good, but it makes the toolbar extremely crowded. I'll
 accept it for now, with the caveat of having a Browse toolbar overhaul
 as soon as I get time for the other pressing issues (browse tab crash
 and read brokenness).


Ok, if you want I can push it in 0.84 branch.
I agree with you, we must work in the toolbar.

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


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Lucian Branescu
On 22 October 2010 12:44, Gonzalo Odiard gonz...@laptop.org wrote:


 On Fri, Oct 22, 2010 at 8:32 AM, Lucian Branescu lucian.brane...@gmail.com
 wrote:

 On 22 October 2010 12:05, Gonzalo Odiard gonz...@laptop.org wrote:
  Lucien:
  I have added the patches to http://dev.laptop.org/ticket/10364
  Can you review it?

 Patch looks good, but it makes the toolbar extremely crowded. I'll
 accept it for now, with the caveat of having a Browse toolbar overhaul
 as soon as I get time for the other pressing issues (browse tab crash
 and read brokenness).


 Ok, if you want I can push it in 0.84 branch.

You should make a 0.90 branch first and then push your patch to the
master branch. We want to keep the 0.90 branch stable and only put in
manageable and low-risk fixes.

If you don't know how to make a branch, you'll have to wait 8-9h until
I get home.

 I agree with you, we must work in the toolbar.

 Gonzalo


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


[Sugar-devel] Bridge activity code maintenance

2010-10-22 Thread Gary C Martin
Hi fang,

Just wanted to ping and check you have no objections to me picking up 
maintenance of the Bridge activity. I note that you originally uploaded the 
version 2 activity bundle to ASLO and so wanted to give you a heads up:

http://activities.sugarlabs.org/en-US/sugar/addon/4231

A number of new developers have contacted me and asked if they can contribute 
to Sugar activities, I suggested Bridge was a good candidate to start on as 
there is already a number of enhancements/fixes from similar work on the 
Physics activity that we could easily land. I'll create a new git.sugarlabs.org 
repository for the work, migrating over from dev.laptop.org, and we'll post new 
releases to the ASLO once ready.

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


Re: [Sugar-devel] looking to contribute

2010-10-22 Thread Gary C Martin
Hi Jon et al,

Hope you don't mind me cc:ing the sugar-devel mail-list, it helps give other 
folks a head's up on likely activity. Folks may want to join the mail-list as 
it's useful for posting questions, getting help – though traffic can be a 
little noisy at times.

On 20 Oct 2010, at 19:24, WSU CS401 wrote:

 On Wed, Oct 20, 2010 at 2:04 PM, Gary C Martin garycmar...@googlemail.com 
 wrote:
 Hi Lindsey,
 
 On 19 Oct 2010, at 19:51, WSU CS401 wrote:
 
  Hello,
 We are four college students looking to contribute to sugar activities.  
  Your activities caught our eye and we were wondering, as you are a 
  maintainer, if you have any projects/fixes (small at first) that we could 
  help with as we are new to sugar.
 
 Did you have an activity in mind? Physics, Clock, Labyrinth, Calculate, Moon 
 are the ones I try specifically to help maintain in my free time, though 
 Moon is the only one I originally wrote, the others are all adopted.
 
 There are quite a few activities out there that could do with some minimal 
 maintenance/release effort, perhaps a few feature additions if something 
 grabs your interest and your time allows.
 
 One quick example: I've been hoping to pick up Bridge at some point:
 
http://wiki.laptop.org/go/Bridge
 
 It's based on the same code as Physics and I've plenty of patches there that 
 I'm sure could be easily made to Bridge with minimal effort. It's a fun 
 little game that needs a bit of tidy-up (was originally written as part of a 
 game jam over a few days). As far as features, it could do with some game 
 level progression (only one level at the moment), perhaps a budget system 
 where you only have so many coins to spend on building materials.
 
 Someone did at least upload the Bridge-2 bundle to activities.sugarlabs.org:
 
http://activities.sugarlabs.org/en-US/sugar/addon/4231
 
 But they made no changes and didn't make a git repository for the source 
 code, would be a fine candidate to help out on.
 
 Shout if it doesn't grab your interest, sure there are other I can find that 
 are in need of help.
  
 
 That sounds excellent, just the kind of thing we were looking for. How should 
 we go about starting this project? We have done a lot of research, but we are 
 still unsure of how sugar's development cycle actually works. Thanks a lot 
 for your reply! :)

Good question ;) OK, so I've created some Sugar Labs resources for Bridge to 
get things going. First a quick wiki page template, nothing too exciting but 
feel free to tinker and add to it as needed:

http://wiki.sugarlabs.org/go/Activities/Bridge

The git source repository is here

http://git.sugarlabs.org/projects/bridge

Each member of the team that's going to work on code should create a user 
account on git.sugarlabs.org. On the machine/home directory you each intend to 
work from you'll need to create a SSH key pair, and add the public key to your 
git.sugarlabs.org accounts, this allows you to git push your changes back to 
the main repository. Once you have accounts, I can either add commit privileges 
for you to the Bridge mainline, or initially the best workflow is usually to 
create your own clone or clones to experiment with first:

http://git.sugarlabs.org/projects/bridge/repos/mainline (login to see 
the Clone repository link to the right)

I've filed a request for a Trac component, we use this to collect 
bug/enhancement/task tickets, if you also create accounts at bugs.sugarlabs.org 
tickets can easily be assigned so we know who working on what issue (useful if 
there are a number of folks all wanting to work in parallel):

http://bugs.sugarlabs.org/ticket/2470

The usual workflow when there is more than one of you working is something 
like: 

 - file some Trac tickets for various bugs/enhancements/tasks making sure the 
component is set to Bridge.
 - assign tickets you want to work on to yourself so others can see who is 
doing what
 - make yourself a local clone of a repository ready to work on
 - make the _minimal_ code changes necessary for your assigned ticket
 - once your happy and tested locally, push your clean changes back to the 
public repository
 - request a merge of your public repository into mainline
 - wait for review feedback or notification that your change was accepted and 
merged
 - repeat

BTW I'm no master git user, I try to stick to a simple git workflow so as not 
to get into a source code tangle :)

Have a skim through the Activity Team wiki pages, it has various FAQs and links 
to using git and other useful topics that may help get things up and running:

http://wiki.sugarlabs.org/go/Activity_Team

If something confusing/missing let me know as wikis are notorious for gathering 
moss and going off at tangents.

Regards,
--Gary

 Jon B.
 WSU Senior | Computer Science
 
 Kind Regards,
 --Gary
 
  Thanks,
 
  Lindsey L.
 
  WSU Senior| Computer Science
___
Sugar-devel 

Re: [Sugar-devel] [Dextrose] Pending patchs for Paint

2010-10-22 Thread Gary Martin
On 20 Oct 2010, at 21:56, James Cameron wrote:

 On Wed, Oct 20, 2010 at 04:56:41PM +0100, Gary Martin wrote:
  http://git.sugarlabs.org/projects/paint/repos/mainline
 
 I noticed that the activity.info file is still for version 27. As
 Paint-28 has been released I'd expect to mainline to at least be up to
 date with those commits. Maybe the rest of the source is current, and
 it's just the activity.info file change that was not pushed?
 
 While it would be nice if every release of every activity has a matching
 tag and sources in the respective repository, we've had situations where
 that has not been desirable, such as when a version of Record was
 released for a deployment via activities.sugarlabs.org but the changes
 were not accepted into mainline because consensus had not been reached.

In such cases git.sugarlabs.org provides very easy cloning of any rep where 
deployments can have full control and create, say, a custom Record-Peru.

 A release of an activity is not done using the master repository, it is
 done using a local clone of the repository.  Therefore during testing
 and diagnosis I've always presumed that the source code shipped in the
 .xo file might be different to the tagged source in the master
 repository.

Hmm, I'd have to disagree. This seems like a terrible workflow for a community. 
I try to make sure every release of activities I maintain is made with mainline 
in sync with my local development/testing git rep. If I was hit by a bus 
tomorrow, or my laptop HD crashed, or I went AWOL, we'd have a release out in 
the wild with no source history for the community to pick up, and possibly no 
source (though luckily most activities are python source, so code could be 
rescued from a bundle out in the wild).

Regards,
--Gary

 I'm happy with the current situation, and it is a good learning
 experience for people who might think that there is more rigour.
 
 However, if this needs fixing, then whomever released Paint-28 might
 merge their changes into the repository ... or if they are unavailable
 to do this then one of us could take the Paint-28 sources from the .xo
 and merge them.
 
 -- 
 James Cameron
 http://quozl.linux.org.au/

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


Re: [Sugar-devel] [Dextrose] DESIGN: Proposed UI simplifications

2010-10-22 Thread Gary Martin
On 21 Oct 2010, at 11:26, Bernie Innocenti wrote:

 From my experience with first-time Sugar users in Mozambique, I've come
 up with a list of UI changes that would help:
 
 1) EASY: kill the name picker that pops up when quitting
   activities. Nobody ever uses it, it's just annoying and confusing
   for new users who don't know how to dismiss it. Maybe one day
   someone will come out with a less intrusive UI for the same purpose,
   but for the time being we're much better off without anything.

+1, ideally we would replace this with Walter's patch to raise the details view 
within any activity for editing via the top frame menu for each activity:

https://wiki.sugarlabs.org/go/Features/Write_to_journal_anytime

 2) EASY: kill the Mute function on the volume icon in the frame.
   I can't think of a useful use-case for it, and children often
   manage to turn on muting by simply clicking on the speaker icon
   (which is a lame UI, btw). If we remove this feature, we have to
   unconditionally unmute on startup!

+1, sounds reasonable. Can you file a ticket for it.

 3) MEDIUM: Figure out why so many control panels require restarting
   Sugar, and fix them not to. Because we use GConf for settings,
   we should be able to setup callbacks to be invoked on any change.

+1.

--Gary

 Removing existing features is always hard in free software, as there's
 always some user who advocates in favor of keeping them. As consumers,
 it's hard for us to cope with the sense of loss, even if the feature
 had no practical value for us.
 
 If we can't get these proposals approved upstream, perhaps we can make
 them configurable. IMHO, it sucks to add a knob every time we fail to
 find consensus, but it's still a little better than maintaining off-tree
 patches.
 
 -- 
   // Bernie Innocenti - http://codewiz.org/
 \X/  Sugar Labs   - http://sugarlabs.org/
 
 ___
 Dextrose mailing list
 dextr...@lists.sugarlabs.org
 http://lists.sugarlabs.org/listinfo/dextrose

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


[Sugar-devel] Easy development process of core sugar components

2010-10-22 Thread Aleksey Lim
Hi all,

This is a trying to replace jhbuild. For example, for me it was all time
needless obscured, i.e., it somewhat `git clone` to somewhere, somehow
built it and somehow run it, and all this only for 4-5 core projects
(its deps might be installed from official or custom repos).

New workflow is inspired of evidence and simplicity (in workflow, not
in how it works under-the-hood) by activity development workflow.
What you need are:

* in most cases (except fc14) you need additional run-time dependencies,
  attach Platform and Core repositories and install sugar
  `sweets download sugar/emulator` (to install all required deps and
  glucose for usage by default) from Bazaar
* git clone glucose project to ~/sweets (or to ~/Activities)
* check what will happen while building by looking to spec file -
  sweets.recipe[2] (i.e., an analog of activity.info)
* run `sweets build` being within git cloned directory to build it
* from any place in fs, call `sweets sweet-value-from-recipe`
  to launch it (build phase might be omitted, sweets will check if
  build already happened and start building otherwise)
* you can change python code in cloned projects w/o need to run build
  command (the same .py files are used to run sugar, see implement
  option in Build section in recipe file), of course sugar itself should
  be restarted to take into account new .py code
* the same for all glucose project (if component was not cloned,
  installed version will be used)

Current limitations:

* to use new scheme, glucose needs to be patched. It is not in master,
  so use bazaar branches[3] that any synced w/ trunk
* dependency solving is inefficient and temporary, it will be replaced
  by invoking 0install in further implementation
* build time dependencies need to be installed manually, auto-install will
  be supported later, by 0install (here 0install means not only fetching
  custom builds but, most likely, ask 0install what native packages
  should be installed by PackageKit)
  * fedora based systems:
autoconf automake libtool make intltool pygtk2-devel gtk2-devel
GConf2-devel gnome-common icon-slicer icon-naming-utils xorg-x11-apps
libSM-devel alsa-lib-devel
  * debian based systems:
build-essential intltool python-gtk2-dev libgtk2.0-dev libgconf2-dev
icon-slicer icon-naming-utils x11-apps  libsm-dev libasound2-dev
libtool gnome-common


[1] http://lists.sugarlabs.org/archive/sugar-devel/2010-October/028108.html
[2] 
http://wiki.sugarlabs.org/go/Activity_Team/Zero_Sugar/Recipe_Specification#.5BBuid.5D
[3] git://git.sugarlabs.org/sugar-base/bazaar.git
git://git.sugarlabs.org/sugar/bazaar.git
git://git.sugarlabs.org/sugar-toolkit/bazaar.git
git://git.sugarlabs.org/sugar-presence-service/bazaar.git
git://git.sugarlabs.org/sugar-artwork/bazaar.git

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


[Sugar-devel] [PATCH] Support isolated start

2010-10-22 Thread Aleksey Lim
Running process is based on injection (how 0install works) of evironment
variables to final application process, e.g., via PYTHONPATH. Patch will let
bazaar.sugarlabs.org build sugar packages, also runnning from git cloned
directories will be supported (i.e., without jhbuild).
---
 .gitignore |3 +-
 bin/Makefile.am|2 +-
 bin/sugar  |   91 
 bin/sugar-session  |1 -
 bin/sugar.in   |   82 
 configure.ac   |1 -
 src/jarabe/config.py.in|   17 ---
 src/jarabe/model/bundleregistry.py |7 ++-
 sweets.recipe  |   49 +++
 9 files changed, 156 insertions(+), 97 deletions(-)
 create mode 100755 bin/sugar
 mode change 100644 = 100755 bin/sugar-activity
 mode change 100644 = 100755 bin/sugar-control-panel
 mode change 100644 = 100755 bin/sugar-install-bundle
 mode change 100644 = 100755 bin/sugar-launch
 mode change 100644 = 100755 bin/sugar-ui-check
 delete mode 100644 bin/sugar.in
 create mode 100644 sweets.recipe

diff --git a/.gitignore b/.gitignore
index 047a849..0f7dc7f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,8 @@ Makefile.in
 .*.sw?
 *.service
 stamp-*
+*.tar.*
+.sweets
 
 # Absolute
 
@@ -51,7 +53,6 @@ m4/intltool.m4
 sugar/browser/_sugarbrowser.c
 browser/sugar-marshal.c
 browser/sugar-marshal.h
-bin/sugar
 shell/extensions/_extensions.c
 data/sugar.gtkrc
 data/sugar.xml
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 05a9215..bf66dbd 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -11,4 +11,4 @@ bin_SCRIPTS = \
sugar   \
$(python_scripts)
 
-EXTRA_DIST = $(python_scripts) sugar.in
+EXTRA_DIST = $(python_scripts)
diff --git a/bin/sugar b/bin/sugar
new file mode 100755
index 000..9d079ed
--- /dev/null
+++ b/bin/sugar
@@ -0,0 +1,91 @@
+#!/bin/sh
+
+if [ $(id -u) -eq 0 -o $(id -ru) -eq 0 ] ; then
+   echo Refusing to run as root.
+   exit 3
+fi
+
+usage() {
+cat EOF
+Usage: sugar [OPTION]..
+
+Start Sugar window manager.
+
+Optional arguments.
+  -d, --display DISPLAY Display to start sugar
+  -s, --scaling SCALING Scale Sugar theme
+Supported values: 72, 100
+EOF
+exit 0
+}
+
+while [ $# -ne 0 ] ; do
+case $1 in
+   -d | --display)
+shift
+export DISPLAY=$1
+;;
+   -s | --scaling)
+shift
+export SUGAR_SCALING=$1
+;;
+   -h | --help)
+usage
+;;
+esac
+shift
+done
+
+# Set default profile dir
+if test -z $SUGAR_PROFILE; then
+export SUGAR_PROFILE=default
+fi
+
+if test $SUGAR_SHELL_PREFIX; then
+include=include \\$(HOME)/.sugar/gconf.path\
+grep $include ~/.gconf.path /dev/null 21 || \
+echo $include  ~/.gconf.path
+mkdir -p ~/.sugar
+echo xml:readonly:$SUGAR_SHELL_PREFIX/gconf.xml  ~/.sugar/gconf.path
+gconftool-2 --shutdown
+fi
+
+if test -z $SUGAR_SCALING; then
+export SUGAR_SCALING=72
+fi
+
+export GTK2_RC_FILES=$(dirname $(dirname 
$0))/share/sugar/data/sugar-$SUGAR_SCALING.gtkrc
+
+# Needed for executing wpa_passphrase
+export PATH=$PATH:/sbin:/usr/sbin
+
+if ! test -f $GTK2_RC_FILES; then
+echo sugar: ERROR: Gtk theme for scaling $SUGAR_SCALING not available in 
path $GTK2_RC_FILES
+exit 1
+fi
+
+# Set default language
+export LANG=${LANG:-en_US.utf8}
+export LANGUAGE=${LANGUAGE:-${LANG}}
+
+# Set Sugar's telepathy accounts directory
+export MC_ACCOUNT_DIR=$HOME/.sugar/$SUGAR_PROFILE/accounts
+
+# Workaround until gnome-keyring-daemon lets dbus activate it
+# https://bugzilla.gnome.org/show_bug.cgi?id=628302
+if test $SUGAR_EMULATOR = yes -a $(type gnome-keyring-daemon); then
+gnome-keyring-daemon --components=secrets 
+fi
+
+# Source language settings and debug definitions
+if [ -f ~/.i18n ]; then
+. ~/.i18n
+fi
+if [ -f ~/.sugar/debug ]; then
+. ~/.sugar/debug
+fi
+
+echo Xcursor.theme: sugar | xrdb -merge
+metacity --no-force-fullscreen -d $DISPLAY 
+
+exec sugar-session
diff --git a/bin/sugar-activity b/bin/sugar-activity
old mode 100644
new mode 100755
diff --git a/bin/sugar-control-panel b/bin/sugar-control-panel
old mode 100644
new mode 100755
diff --git a/bin/sugar-install-bundle b/bin/sugar-install-bundle
old mode 100644
new mode 100755
diff --git a/bin/sugar-launch b/bin/sugar-launch
old mode 100644
new mode 100755
diff --git a/bin/sugar-session b/bin/sugar-session
index 91ebf6f..e2157ba 100755
--- a/bin/sugar-session
+++ b/bin/sugar-session
@@ -218,7 +218,6 @@ def main():
 # strings in the module scope.
 from jarabe import config
 gettext.bindtextdomain('sugar', config.locale_path)
-gettext.bindtextdomain('sugar-toolkit', config.locale_path)
 gettext.textdomain('sugar')
 
 from jarabe.desktop import 

[Sugar-devel] [PATCH] Support isolated start

2010-10-22 Thread Aleksey Lim
Running process is based on injection (how 0install works) of evironment
variables to final application process, e.g., via PYTHONPATH. Patch will let
bazaar.sugarlabs.org build sugar packages, also runnning from git cloned
directories will be supported (i.e., without jhbuild).
---
 .gitignore|2 ++
 sweets.recipe |   29 +
 2 files changed, 31 insertions(+), 0 deletions(-)
 create mode 100644 sweets.recipe

diff --git a/.gitignore b/.gitignore
index 9acb07c..4ad2f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,5 @@ test/exported_*
 .DS_Store
 gtk/theme/sugar-100.gtkrc
 gtk/theme/sugar-72.gtkrc
+*.tar.*
+.sweets
diff --git a/sweets.recipe b/sweets.recipe
new file mode 100644
index 000..5e39563
--- /dev/null
+++ b/sweets.recipe
@@ -0,0 +1,29 @@
+[DEFAULT]
+sweet = sugar-artwork
+summary   = Themes and icons
+license   = LGPLv2.1+
+homepage  = http://git.sugarlabs.org/projects/sugar-artwork
+
+version   = 0.90.0
+stability = testing
+
+depends   = gtk; pygobject; cairo = 0.1.1
+
+[Component]
+requires  = %(depends)s
+binding   = GTK_PATH lib/gtk-2.0
+replace GTK_DATA_PREFIX
+XDG_DATA_DIRS share
+XCURSOR_PATH share/icons
+arch  = any
+
+[Build]
+requires  = %(depends)s; icon-slicer; icon-naming-utils; xcursorgen
+pkg-config; make; gcc-c
+cleanup   = make distclean; ./autogen.sh
+configure = ./configure --prefix=%(PREFIX)s CFLAGS=%(CFLAGS)s
+make  = make
+install   = make DESTDIR=%(DESTDIR)s install
+
+[Source]
+exec  = ./autogen.sh  make dist
-- 
1.7.2.2

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


[Sugar-devel] [PATCH] Support isolated start

2010-10-22 Thread Aleksey Lim
Running process is based on injection (how 0install works) of evironment
variables to final application process, e.g., via PYTHONPATH. Patch will let
bazaar.sugarlabs.org build sugar packages, also runnning from git cloned
directories will be supported (i.e., without jhbuild).
---
 .gitignore |4 
 src/Makefile.am|3 +++
 src/__init__.py|   20 
 src/sugar/Makefile.am  |4 ++--
 src/sugar/__init__.py  |   13 -
 src/sugar/dispatch/Makefile.am |2 +-
 sweets.recipe  |   33 +
 7 files changed, 63 insertions(+), 16 deletions(-)
 create mode 100644 src/__init__.py
 create mode 100644 sweets.recipe

diff --git a/.gitignore b/.gitignore
index 25cb6e9..8285052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,10 @@
 *.lo
 *.la
 stamp-*
+m4/*
+*.so
+*.tar.*
+.sweets
 
 # Absolute
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 4fa44db..c399f12 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,4 @@
 SUBDIRS = sugar
+
+sugardir = $(pythondir)/sugar_base
+sugar_PYTHON = __init__.py
diff --git a/src/__init__.py b/src/__init__.py
new file mode 100644
index 000..3ff9423
--- /dev/null
+++ b/src/__init__.py
@@ -0,0 +1,20 @@
+# Copyright (C) 2010, Aleksey Lim
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+import gettext
+from os.path import join, dirname
+
+locale_path = join(dirname(__file__), '..', '..', 'share', 'locale')
+gettext.bindtextdomain('sugar-base', locale_path)
diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index 871871e..3db2eda 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
@@ -2,13 +2,13 @@ SUBDIRS = dispatch
 
 INCLUDES = -DXDG_PREFIX=sugar_mime
 
-sugardir = $(pythondir)/sugar
+sugardir = $(pythondir)/sugar_base/sugar
 sugar_PYTHON = \
__init__.py \
logger.py   \
mime.py
 
-pkgpyexecdir = $(pythondir)/sugar
+pkgpyexecdir = $(pythondir)/sugar_base/sugar
 
 pkgpyexec_LTLIBRARIES = _sugarbaseext.la
 
diff --git a/src/sugar/__init__.py b/src/sugar/__init__.py
index d24d665..2683bc6 100644
--- a/src/sugar/__init__.py
+++ b/src/sugar/__init__.py
@@ -15,16 +15,3 @@
 # License along with this library; if not, write to the
 # Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
-
-import os
-import gettext
-
-
-if 'SUGAR_PREFIX' in os.environ:
-prefix = os.environ['SUGAR_PREFIX']
-else:
-prefix = '/usr'
-
-locale_path = os.path.join(prefix, 'share', 'locale')
-
-gettext.bindtextdomain('sugar-base', locale_path)
diff --git a/src/sugar/dispatch/Makefile.am b/src/sugar/dispatch/Makefile.am
index eb44a32..ad0f69d 100644
--- a/src/sugar/dispatch/Makefile.am
+++ b/src/sugar/dispatch/Makefile.am
@@ -1,4 +1,4 @@
-sugardir = $(pythondir)/sugar/dispatch
+sugardir = $(pythondir)/sugar_base/sugar/dispatch
 sugar_PYTHON = \
__init__.py \
dispatcher.py   \
diff --git a/sweets.recipe b/sweets.recipe
new file mode 100644
index 000..581c774
--- /dev/null
+++ b/sweets.recipe
@@ -0,0 +1,33 @@
+[DEFAULT]
+sweet = sugar-base
+summary   = Helpers for the development of services and activities
+license   = LGPLv2.1+
+homepage  = http://git.sugarlabs.org/projects/sugar-base
+
+version   = 0.90.1
+stability = testing
+
+depends   = pygtk; pygobject = 2.15
+
+[Component]
+requires  = %(depends)s; decorator
+binding   = PYTHONPATH python
+arch  = any
+
+[Build]
+requires  = %(depends)s; pkg-config; intltool = 0.33; make; gcc-c
+cleanup   = make distclean; ./autogen.sh
+configure = ./configure
+--prefix=%(PREFIX)s
+am_cv_python_pythondir=%(PREFIX)s/python
+am_cv_python_pyexecdir=%(PREFIX)s/python
+CFLAGS=%(CFLAGS)s
+make  = make
+install   = make DESTDIR=%(DESTDIR)s install
+implement = %(install)s 
+rm -rf %(DESTDIR)s/%(PREFIX)s/python/sugar_base/sugar 
+ln -s %(BUILDDIR)s/src/sugar 
%(DESTDIR)s/%(PREFIX)s/python/sugar_base/ 
+ln -fs .libs/_sugarbaseext.so src/sugar/
+
+[Source]
+exec  = ./autogen.sh  make dist
-- 
1.7.2.2

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


[Sugar-devel] [PATCH] Support isolated start

2010-10-22 Thread Aleksey Lim
Running process is based on injection (how 0install works) of evironment
variables to final application process, e.g., via PYTHONPATH. Patch will let
bazaar.sugarlabs.org build sugar packages, also runnning from git cloned
directories will be supported (i.e., without jhbuild).
---
 .gitignore   |3 +++
 configure.ac |1 +
 src/sugar/Makefile.am|8 ++--
 src/sugar/__init__.py|   20 
 src/sugar/_sugarbaseext.py   |   16 
 src/sugar/activity/main.py   |1 -
 src/sugar/dispatch/Makefile.am   |6 ++
 src/sugar/dispatch/__init__.py   |   16 
 src/sugar/dispatch/dispatcher.py |   16 
 src/sugar/dispatch/saferef.py|   16 
 src/sugar/logger.py  |   16 
 src/sugar/mime.py|   16 
 sweets.recipe|   34 ++
 13 files changed, 166 insertions(+), 3 deletions(-)
 create mode 100644 src/sugar/__init__.py
 create mode 100644 src/sugar/_sugarbaseext.py
 create mode 100644 src/sugar/dispatch/Makefile.am
 create mode 100644 src/sugar/dispatch/__init__.py
 create mode 100644 src/sugar/dispatch/dispatcher.py
 create mode 100644 src/sugar/dispatch/saferef.py
 create mode 100644 src/sugar/logger.py
 create mode 100644 src/sugar/mime.py
 create mode 100644 sweets.recipe

diff --git a/.gitignore b/.gitignore
index fe4cc56..a28347a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@
 *~
 .deps
 .libs
+*.so
 
 py-compile
 Makefile
@@ -22,3 +23,5 @@ libtool
 ltmain.sh
 missing
 compile
+*.tar.*
+.sweets
diff --git a/configure.ac b/configure.ac
index 41798ea..5b21a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,5 +44,6 @@ src/sugar/bundle/Makefile
 src/sugar/graphics/Makefile
 src/sugar/presence/Makefile
 src/sugar/datastore/Makefile
+src/sugar/dispatch/Makefile
 po/Makefile.in
 ])
diff --git a/src/sugar/Makefile.am b/src/sugar/Makefile.am
index 236e337..584edde 100644
--- a/src/sugar/Makefile.am
+++ b/src/sugar/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = activity bundle graphics presence datastore
+SUBDIRS = activity bundle graphics presence datastore dispatch
 
 sugardir = $(pythondir)/sugar
 sugar_PYTHON = \
@@ -7,7 +7,11 @@ sugar_PYTHON = \
profile.py  \
session.py  \
util.py \
-   wm.py
+   wm.py \
+   _sugarbaseext.py \
+   logger.py \
+   mime.py \
+   __init__.py
 
 pkgpyexecdir = $(pythondir)/sugar
 
diff --git a/src/sugar/__init__.py b/src/sugar/__init__.py
new file mode 100644
index 000..b4fdb9a
--- /dev/null
+++ b/src/sugar/__init__.py
@@ -0,0 +1,20 @@
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import gettext
+from os.path import join, dirname
+
+locale_path = join(dirname(__file__), '..', '..', 'share', 'locale')
+gettext.bindtextdomain('sugar-toolkit', locale_path)
diff --git a/src/sugar/_sugarbaseext.py b/src/sugar/_sugarbaseext.py
new file mode 100644
index 000..6602314
--- /dev/null
+++ b/src/sugar/_sugarbaseext.py
@@ -0,0 +1,16 @@
+# Copyright (C) 2010, Aleksey Lim
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see http://www.gnu.org/licenses/.
+
+from sugar_base.sugar._sugarbaseext import *
diff --git a/src/sugar/activity/main.py b/src/sugar/activity/main.py
index c04257a..5b0a87d 100644
--- a/src/sugar/activity/main.py
+++ b/src/sugar/activity/main.py
@@ -111,7 +111,6 @@ def main():
 locale_path = i18n.get_locale_path(bundle.get_bundle_id())
 
 gettext.bindtextdomain(bundle.get_bundle_id(), locale_path)
-gettext.bindtextdomain('sugar-toolkit', sugar.locale_path)
 

[Sugar-devel] [PATCH] Support isolated start

2010-10-22 Thread Aleksey Lim
Running process is based on injection (how 0install works) of evironment
variables to final application process, e.g., via PYTHONPATH. Patch will let
bazaar.sugarlabs.org build sugar packages, also runnning from git cloned
directories will be supported (i.e., without jhbuild).
---
 .gitignore|2 ++
 src/sugar-presence-service.in |4 +++-
 sweets.recipe |   27 +++
 3 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 sweets.recipe

diff --git a/.gitignore b/.gitignore
index 89e441e..7b18edf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,8 @@ Makefile.in
 *.loT
 .*.sw?
 *.service
+*.tar.*
+.sweets
 
 # Absolute
 
diff --git a/src/sugar-presence-service.in b/src/sugar-presence-service.in
index ff8d66a..96c9757 100644
--- a/src/sugar-presence-service.in
+++ b/src/sugar-presence-service.in
@@ -16,8 +16,10 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 import sys
+from os.path import join, dirname
 
-sys.path.append('@prefix@/share/sugar-presence-service')
+path = join(dirname(__file__), '..', 'share', 'sugar-presence-service')
+sys.path.append(path)
 
 import main
 
diff --git a/sweets.recipe b/sweets.recipe
new file mode 100644
index 000..bde72a5
--- /dev/null
+++ b/sweets.recipe
@@ -0,0 +1,27 @@
+[DEFAULT]
+sweet = sugar-presence-service
+summary   = Interfaces between Sugar and Telepathy Connection Managers
+license   = LGPLv2.1+
+homepage  = http://git.sugarlabs.org/projects/sugar-presence-service
+
+version   = 0.90.1
+stability = testing
+
+[Component]
+requires  = sugar-toolkit; telepathy-python
+telepathy-salut = 0.4; telepathy-gabble = 0.10
+binding   = PATH bin; XDG_DATA_DIRS share
+arch  = any
+
+[Build]
+requires  = make
+cleanup   = make distclean; ./autogen.sh
+configure = ./configure --prefix=%(PREFIX)s
+make  = make
+install   = make DESTDIR=%(DESTDIR)s install
+implement = %(install)s 
+rm -rf %(DESTDIR)s/%(PREFIX)s/share/sugar-presence-service 
+ln -s %(BUILDDIR)s/src 
%(DESTDIR)s/%(PREFIX)s/share/sugar-presence-service
+
+[Source]
+exec  = ./autogen.sh  make dist
-- 
1.7.2.2

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


Re: [Sugar-devel] Re-initiate Packaging Team

2010-10-22 Thread Aleksey Lim
On Thu, Oct 21, 2010 at 04:28:18PM +0200, Bert Freudenberg wrote:
 
 On 21.10.2010, at 04:59, Aleksey Lim wrote:
 
  On Thu, Oct 21, 2010 at 11:26:49AM +, Aleksey Lim wrote:
  On Thu, Oct 21, 2010 at 04:31:49PM +0530, Manusheel Gupta wrote:
  On Thu, Oct 21, 2010 at 4:13 PM, Aleksey Lim alsr...@member.fsf.org 
  wrote:
  
  On Thu, Oct 21, 2010 at 03:45:58PM +0530, Manusheel Gupta wrote:
  On Thu, Oct 21, 2010 at 1:32 PM, Aleksey Lim alsr...@member.fsf.org
  wrote:
  
  Hi all,
  
  This a request to relaunch Packaging Team by giving it a bit another
  meaning that it has before.
  
  The main idea I see for this new/old team is:
  
Let people start sugar in any environment they have in most
convenient way.
  
  The team will cover not only questions how sugar is packaged for
  major GNU/Linux distribution but also:
  
  * having Bazaar as a central place of all (out of distro) efforts
  * building packages that are not(yet/well) packaged
  * support distros that don't have packaged sugar
  * run daily snapshot of sugar in as many as possible environments
  * take care of Sugar Platform dependencies (how many, are they packaged
  and make custom build otherwise)
  * support meta sugar distribution ie just a bunch of repositories of
  sugar packages that can be attached to existed system to run sugar
  
  BTW, maybe Packaging is not appropriate name, any ideas?
  
  
  
  Account Services team is the preferred trade name for small size teams
  engaged in support work (answering questions, or communicating with the
  development team, maintaining builds and their timely releases). Some
  companies use Internal System Architect nomenclature too. When team
  sizes
  grew bigger, this work comes under the umbrella of Members of Technical
  Staff.
  
  Well, I personally prefer something less official/corporate, e.g., Bazaar
  Team :)
  
  
  
  Bazaar in Hindi refers to market. Suspect that many people would confuse 
  it
  with the marketing team :-)
  
  Though Bazaar is referring more to The Cathedral and the Bazaar in
  FOSS world (afaik) rather to marketing (which sounds, in some meaning, 
  quite
  opposite thing :).
  
  What about Sweet Team then, i.e., sweet is an id of packages on
  bazaar.sl.o and sweets is the main command-line tool.
  
  Of course it might be something neutral like Distribution Team.
 
 Working with distro packagers is really important. Getting Sugar to work on 
 distros that do not have current Sugar packages is important, too. And 
 running Sugar in emulation on Macs and Windows machines should also be part 
 of the Let people start sugar in any environment mission. Possibly 
 platform team would be more appropriate?

+1 for all options

I guess we don't have many options for naming and Platform Team sounds
best of all. For example, there is Sugar Platform (and Platform project
on Bazaar for the same purpose) that should be an area of responsibility
for the new team.

I'll start to copypaste Platform Team (keeping in mind original purpose
I stated in initial email) related resources on wiki to Platform_Team/
sub region on wiki.sl.o.

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


Re: [Sugar-devel] Proposal of dotted activity version number

2010-10-22 Thread Simon Schampijer

On 10/07/2010 06:39 PM, Daniel Drake wrote:

On 4 October 2010 15:27, Gonzalo Odiardgonz...@laptop.org  wrote:

What do others think about this approach? Packagers?


A clearer way to discuss this would be to just send a patch. That way
there is no doubt over the details of the implementation that you are
proposing.

Daniel


Hi Daniel,

that is what the current implementation looks like:

http://bugs.sugarlabs.org/attachment/ticket/2425/normalized_version.patch

Hope this helps,
   Simon
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


[Sugar-devel] [RELEASE] Write-72

2010-10-22 Thread Simon Schampijer
== Source ==

http://download.sugarlabs.org/sources/sucrose/fructose/Write/Write-72.tar.bz2

== News ==

* Release 72 (Simon Schampijer)
* fix SL #2001 - Write does not pass parent window xid to ObjectChooser 
(Gonzalo Odiard)
* Let abiword change zoom_percentage value before using it #1121 (Aleksey Lim)

This release fixes the issues of small font sizes in Write on the XO in 0.90.
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] Home button in browse - toolbar images

2010-10-22 Thread Simon Schampijer

On 10/22/2010 01:49 PM, Lucian Branescu wrote:

On 22 October 2010 12:44, Gonzalo Odiardgonz...@laptop.org  wrote:



On Fri, Oct 22, 2010 at 8:32 AM, Lucian Branesculucian.brane...@gmail.com
wrote:


On 22 October 2010 12:05, Gonzalo Odiardgonz...@laptop.org  wrote:

Lucien:
I have added the patches to http://dev.laptop.org/ticket/10364
Can you review it?


Patch looks good, but it makes the toolbar extremely crowded. I'll
accept it for now, with the caveat of having a Browse toolbar overhaul
as soon as I get time for the other pressing issues (browse tab crash
and read brokenness).



Ok, if you want I can push it in 0.84 branch.


You should make a 0.90 branch first and then push your patch to the
master branch. We want to keep the 0.90 branch stable and only put in
manageable and low-risk fixes.


We have done it - so everything is in place. Now we just need a new 
shiny 0.90 release :)


Have a nice weekend,
   Simon

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


Re: [Sugar-devel] [Dextrose] Pending patchs for Paint

2010-10-22 Thread Sascha Silbe
Excerpts from James Cameron's message of Wed Oct 20 22:56:04 +0200 2010:

 While it would be nice if every release of every activity has a matching
 tag and sources in the respective repository, we've had situations where
 that has not been desirable, such as when a version of Record was
 released for a deployment via activities.sugarlabs.org but the changes
 were not accepted into mainline because consensus had not been reached.

I certainly hope that each bundle released by Sugar Labs or associated
organisations (OLPC, etc). has a corresponding commit and tag in a
discoverable git repository. Otherwise this will quickly turn into a
maintenance nightmare. See SL#2149 [1] for an example where I couldn't
continue debugging due to lack of a convenient way to access the actual
source code. Sure, I could have flashed an XO with Dextrose and extract
the installed Python files. But that would have taken more time than I
could afford.

It doesn't need to be the on the master branch or even inside the
mainline repository. What matters is there is
a) a corresponding commit in a public git repository
b) the commit belonging to a particular bundle is discoverable within a
   reasonable amount of time.

Creating a fork (clone) on git.sugarlabs.org containing tags for each
released version and putting the name of the repository inside some
file of the bundle (e.g. README or HACKING) would be one way to achieve
the above without requiring cooperation from the maintainer (of the
original module).

Sascha

[1] https://bugs.sugarlabs.org/ticket/2149
--
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] Clipboard menu off screen fixed for long text strings(SL #2201)

2010-10-22 Thread Mukul Gupta
Changing maximum text length to a suitable value so that it
fits into the screen
---
 src/jarabe/frame/clipboardmenu.py |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/jarabe/frame/clipboardmenu.py 
b/src/jarabe/frame/clipboardmenu.py
index b998110..1f5259e 100644
--- a/src/jarabe/frame/clipboardmenu.py
+++ b/src/jarabe/frame/clipboardmenu.py
@@ -38,7 +38,7 @@ from jarabe.model import bundleregistry
 class ClipboardMenu(Palette):
 
 def __init__(self, cb_object):
-Palette.__init__(self, text_maxlen=100)
+Palette.__init__(self, text_maxlen=80)
 
 self._cb_object = cb_object
 
-- 
1.7.0.4

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


Re: [Sugar-devel] Edit/audit wikipedia activity

2010-10-22 Thread Martin Langhoff
Hi Chris,

(while Mitch does his magic on 1.75... I distract you a bit...)  -- I
am looking at reproducing the re-compile current es_PE Wikipedia
Bundle process.

Looking at the instructions in http://wiki.laptop.org/go/WikiBrowse,
it's not 100% clear. For a trivial example, if I have an updated
blacklist, how would I  re-run the process? Where are the source files
for wikipedia content and traffic stats?

I have a checkout of http://dev.laptop.org/git/projects/wikiserver/
and looking at http://dev.laptop.org/~cjb/eswiki/

My intention is to understand the process better to see how we edit or
override content.

thanks!



m
-- 
 martin.langh...@gmail.com
 mar...@laptop.org -- School Server Architect
 - 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] [Dextrose] Pending patchs for Paint

2010-10-22 Thread Martin Langhoff
On Fri, Oct 22, 2010 at 12:45 PM, Sascha Silbe
sascha-ml-reply-to-201...@silbe.org wrote:
 I certainly hope that each bundle released by Sugar Labs or associated

Sure. Not everything's perfect. Let's make sure we drag things back to
normality.

If something's controversial it may not be on 'master' but there's no
reason to have it in the sugarlabs git repos where everyone looks for
src.

cheers,



m
-- 
 martin.langh...@gmail.com
 mar...@laptop.org -- School Server Architect
 - 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] broken playback in record and jukebox

2010-10-22 Thread Erik Blankinship
( OLPC build 852 on a 1.5 machine.  If this is more of an OLPC question,
please let me know and I will take my question elsewhere)

If I pause a video in either the record or jukebox activities and wait about
20 seconds, then just moving the mouse causes the video to go blank!  Or I
can wait about 80 seconds and the video will go blank on its own.  Reloading
that same video file causes the video to act strangely -- it gets stuck
flickering between two frames.

I am wondering why this bug happens and how to work around it and how it can
be fixed.
___
Sugar-devel mailing list
Sugar-devel@lists.sugarlabs.org
http://lists.sugarlabs.org/listinfo/sugar-devel


Re: [Sugar-devel] [PATCH] Clipboard menu off screen fixed for long text strings(SL #2201)

2010-10-22 Thread Aleksey Lim
On Fri, Oct 22, 2010 at 11:52:26PM +0530, Mukul Gupta wrote:
 Changing maximum text length to a suitable value so that it
 fits into the screen
 ---
  src/jarabe/frame/clipboardmenu.py |2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/src/jarabe/frame/clipboardmenu.py 
 b/src/jarabe/frame/clipboardmenu.py
 index b998110..1f5259e 100644
 --- a/src/jarabe/frame/clipboardmenu.py
 +++ b/src/jarabe/frame/clipboardmenu.py
 @@ -38,7 +38,7 @@ from jarabe.model import bundleregistry
  class ClipboardMenu(Palette):
  
  def __init__(self, cb_object):
 -Palette.__init__(self, text_maxlen=100)
 +Palette.__init__(self, text_maxlen=80)

I think better to calc number of chars according to the current screen width
w/ something like this:

  layout = any_gtk_widget.create_pango_layout(...)
  print 'width =', layout.get_pixel_size()[0]


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


[Sugar-devel] [PATCH v5 sugar] Downgrading activities not allowed. (#2164)

2010-10-22 Thread anubhav
Downgrading an activity is now made possible. When a .xo file of a version older
than the currently installed version is clicked, a downgrading option is made
available, by popping up of a confirmation alert. Depending upton the choice
selected you can downgrade the activity.

Co-authored-by: Anubhav Aggarwal anub...@seeta.in, Shanjit Singh Jajmann 
shan...@seeta.in
---

v1 - v2. Named according to the nomenclature suggested,inline function used
,signal emission condition revised,global variables removed.

v2 - v3. Taking care of all calling of misc.resume.

v3 - v4. Changes in the copyright of the new file

v4 - v5. showing the alert in the same window as the journal

 src/jarabe/journal/journalactivity.py |1 +
 src/jarabe/journal/misc.py|   56 ++--
 src/jarabe/model/bundleregistry.py|7 +++-
 3 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/src/jarabe/journal/journalactivity.py 
b/src/jarabe/journal/journalactivity.py
index 44cc018..8ab6a2e 100644
--- a/src/jarabe/journal/journalactivity.py
+++ b/src/jarabe/journal/journalactivity.py
@@ -106,6 +106,7 @@ class JournalActivity(Window):
 def __init__(self):
 logging.debug(STARTUP: Loading the journal)
 Window.__init__(self)
+misc.get_journal_window(self)
 
 self.set_title(_('Journal'))
 
diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
index 32a2847..b8d8d3a 100644
--- a/src/jarabe/journal/misc.py
+++ b/src/jarabe/journal/misc.py
@@ -27,8 +27,10 @@ from sugar.activity import activityfactory
 from sugar.activity.activityhandle import ActivityHandle
 from sugar.graphics.icon import get_icon_file_name
 from sugar.graphics.xocolor import XoColor
+from sugar.graphics.alert import ConfirmationAlert
 from sugar import mime
 from sugar.bundle.activitybundle import ActivityBundle
+from sugar.bundle.bundle import AlreadyInstalledException
 from sugar.bundle.contentbundle import ContentBundle
 from sugar import util
 
@@ -148,8 +150,9 @@ def get_activities(metadata):
 
 return activities
 
-def resume(metadata, bundle_id=None):
+def resume(metadata, bundle_id=None, force_to_downgrade=False):
 registry = bundleregistry.get_registry()
+version_downgrade = False
 
 if is_activity_bundle(metadata) and bundle_id is None:
 
@@ -159,19 +162,26 @@ def resume(metadata, bundle_id=None):
 bundle = ActivityBundle(file_path)
 if not registry.is_installed(bundle):
 logging.debug('Installing activity bundle')
-registry.install(bundle)
+if not force_to_downgrade:
+try:
+registry.install(bundle)
+except AlreadyInstalledException:
+older_version_clicked(metadata)
+version_downgrade = True
+if force_to_downgrade:
+registry.install(bundle, force_downgrade=True)
 else:
 logging.debug('Upgrading activity bundle')
 registry.upgrade(bundle)
-
-logging.debug('activityfactory.creating bundle with id %r',
-bundle.get_bundle_id())
-installed_bundle = registry.get_bundle(bundle.get_bundle_id())
-if installed_bundle:
-launch(installed_bundle)
-else:
-logging.error('Bundle %r is not installed.',
-  bundle.get_bundle_id())
+if not version_downgrade:
+logging.debug('activityfactory.creating bundle with id %r',
+bundle.get_bundle_id())
+installed_bundle = registry.get_bundle(bundle.get_bundle_id())
+if installed_bundle:
+launch(installed_bundle)
+else:
+logging.error('Bundle %r is not installed.',
+  bundle.get_bundle_id())
 
 elif is_content_bundle(metadata) and bundle_id is None:
 
@@ -239,6 +249,30 @@ def launch(bundle, activity_id=None, object_id=None, 
uri=None, color=None,
 object_id=object_id, uri=uri, invited=invited)
 activityfactory.create(bundle, activity_handle)
 
+def get_journal_window(journal_window_instance):
+VersionAlert.journal_window = journal_window_instance
+
+class VersionAlert():
+journal_window = None
+
+def older_version_clicked(metadata):
+alert = ConfirmationAlert()
+alert.props.title = _('Newer Version Found')
+alert.props.msg = _('Newer version of the chosen activity is available \
+do you still want to continue with the installation? \
+ If Yes click Ok and the activity icon of the older \
+.xo file in the Journal')
+alert.connect('response', downgrade_alert_response_cb, metadata)
+VersionAlert.journal_window.add_alert(alert)
+alert.show()
+
+def downgrade_alert_response_cb(alert, response_id, metadata):
+if response_id is gtk.RESPONSE_OK:
+VersionAlert.journal_window.remove_alert(alert)
+

[Sugar-devel] [ASLO] Release Turtle Machine-7

2010-10-22 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4341

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27071/turtle_machine-7.xo

Release notes:
Another pre-turtle activity. This one I see as following on from 
Spirolaterals.
Students can specify the number of repeats and the angle.
Once a polygon is created, it becomes available for more complex pattern 
creation.



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] Fwd: [Dextrose] [PATCH v3 PaintActivity] New suggestion for arrow drawing in Paint

2010-10-22 Thread Manusheel Gupta
FYI

-- Forwarded message --
From: Gonzalo Odiard gonz...@laptop.org
Date: Fri, Oct 22, 2010 at 11:56 PM
Subject: Re: [Dextrose] [PATCH v3 PaintActivity] New suggestion for arrow
drawing in Paint
To: Anurag Chowdhury anu...@seeta.in
Cc: Manusheel Gupta m...@seeta.in


Change commited.

Gonzalo


On Fri, Oct 22, 2010 at 1:49 PM, Anurag Chowdhury anu...@seeta.in wrote:

 I have added the patch to the ticket .
 Also, can you tell  me if there is any thing more to be added or improved
 in the patch.
 And can I add you to the Reviewed-By tag in the patch?

 Regards
 Anurag


 On Fri, Oct 22, 2010 at 4:13 PM, Gonzalo Odiard gonz...@laptop.orgwrote:

 Please, add the patch to the ticket


 Gonzalo

 On Fri, Oct 22, 2010 at 12:12 AM, Anurag Chowdhury anu...@seeta.inwrote:

 In the paint activity's shape tool we were able to make only horizontal
 arrows,
 so now we have modified the arrow tool which will now make arrows in all
 directions.
 ---
  Desenho.py |   31 ++-
  1 files changed, 22 insertions(+), 9 deletions(-)

 v1-v2 :Removed the vertical-arrow tool and modified the arrow tool to
 enable
 drawing arrows in all directions.
 v2-v3 :Fixed the error of two extra lines when made the arrow with a
 different
 colour border

 diff --git a/Desenho.py b/Desenho.py
 index 3be1910..1b16ccd 100644
 --- a/Desenho.py
 +++ b/Desenho.py
 @@ -294,18 +294,31 @@ class Desenho:

 x = coords[0] - widget.oldx
 y = coords[1] - widget.oldy
 -points = [(widget.oldx, widget.oldy),\
 -(widget.oldx + int(x / 6), widget.oldy + y), \
 -(widget.oldx + int(x / 6), widget.oldy + int(y / 3)), \
 -(widget.oldx + x, widget.oldy + int(y / 3)), \
 -(widget.oldx + x, widget.oldy - int(y / 3)), \
 -(widget.oldx + int(x / 6), widget.oldy - int(y / 3)),\
 -(widget.oldx + int(x / 6), widget.oldy - y)]
 +A = math.atan2(y, x)
 +dA = 2 * math.pi / 2
 +r = math.hypot(y, x)
 +m = math.sin(A)
 +p = [(widget.oldx, widget.oldy)]
 +p.append((widget.oldx + int(r * math.cos(A)),\
 +  widget.oldy + int(r * math.sin(A
 +p.append((widget.oldx + int(0.74 * r * math.cos(A + dA / 6)),\
 +  widget.oldy + int(0.74 * r * math.sin(A + dA / 6
 +p.append((widget.oldx + int(2 * r * math.cos(A + dA / 6 + dA /
 20)),\
 +  widget.oldy + int(2 * r * math.sin(A + dA / 6 + dA /
 20
 +p.append((widget.oldx +\
 +  int(2 * r * math.cos(A + dA / 6 - dA / 20 + dA / 6)),\
 +  widget.oldy +\
 +  int(2 * r * math.sin(A + dA / 6 - dA / 20 + dA / 6
 +p.append((widget.oldx + int(0.74 * r * math.cos(A + dA / 6 + dA
 / 6)),\
 +  widget.oldy + int(0.74 * r * math.sin(A + dA / 6 + dA
 / 6
 +p.append((widget.oldx + int(r * math.cos(A + dA / 2)),\
 +  widget.oldy + int(r * math.sin(A + dA / 2
 pixmap.draw_drawable(widget.gc, widget.pixmap, 0, 0, 0, 0,
 width, height)
 +tp = tuple(p)
 if fill == True:
 -pixmap.draw_polygon(widget.gc, True, points)
 -pixmap.draw_polygon(widget.gc_line, False, points)
 +pixmap.draw_polygon(widget.gc, True, tp)
 +pixmap.draw_polygon(widget.gc_line, False, tp)
 widget.queue_draw()

 def parallelogram(self, widget, coords, temp, fill):
 --
 1.7.2.3

 ___
 Dextrose mailing list
 dextr...@lists.sugarlabs.org
 http://lists.sugarlabs.org/listinfo/dextrose




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


[Sugar-devel] Fwd: [Sur] [ASLO] Nueva version flash games-2

2010-10-22 Thread Gonzalo Odiard
Who can review the activity flash games-2  in ASLO

Mails from teachers from Uruguay in the list olpc-sur:


From: *Cristina Yiansens* crisyi...@gmail.com
Date: 2010/10/22
To: olpc-...@lists.laptop.org

Hola lista: con respecto a este enlace me gustaría saber la razón de incluir
el juego ¿Qué le harías a tu ex? junto a Adjedrez y otros.  Es el primer
botón que tiene el niño para comenzar a jugar y la verdad es que no tiene
nada de educativo. Sí tiene agresiones al límite.
Realmente  habría que revisar y colocarlo en juegos para adultos o al menos
sacarlo de ese paquete
Saludos,

-- 
*Cristina Yiansens - Mtra. Dinamizadora de Plan CEIBAL*

Google translation:
Hi all: on the link I want to know the reason for including the game What
would you do to your ex? with Adjedrez and others. Button is the first
child has to start playing and the truth is that there is nothing
educational. It does have damage to the limit.
It really should be reviewed and put on games for adults or at least out of
that package

--
From: *Natalia Pizzolanti* marna...@hotmail.com
Date: 2010/10/22
To: olpc-...@lists.laptop.org

 Estoy completamente de acuerdo contigo Cristina!!! Es terrible ver cómo
los alumnos juegan a reventar a la mujer o matar al hombre hasta que chorrea
SANGRE...

-
Google translation:
I completely agree with you Cristina !!! It is terrible to see how
students play to blow the woman or man to kill BLOOD dripping ...


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


Re: [Sugar-devel] [PATCH v5 sugar] Downgrading activities not allowed. (#2164)

2010-10-22 Thread Aleksey Lim
On Sat, Oct 23, 2010 at 01:11:18AM +0530, anub...@seeta.in wrote:
 Downgrading an activity is now made possible. When a .xo file of a version 
 older
 than the currently installed version is clicked, a downgrading option is made
 available, by popping up of a confirmation alert. Depending upton the choice
 selected you can downgrade the activity.
 
 Co-authored-by: Anubhav Aggarwal anub...@seeta.in, Shanjit Singh Jajmann 
 shan...@seeta.in
 ---
 
 v1 - v2. Named according to the nomenclature suggested,inline function used
 ,signal emission condition revised,global variables removed.
 
 v2 - v3. Taking care of all calling of misc.resume.
 
 v3 - v4. Changes in the copyright of the new file
 
 v4 - v5. showing the alert in the same window as the journal


To be hones, I'm not happy with this way. It seems to be needless
tricky, i.e, keeping journal window in alert class and storing it
all time. What about more clean way, i.e., using journal window
only on purpose and keep it out of journal activity logic, so any
code in Journal that needs main window to to do something (e.g.,
popping up an alert) can call journalwindow.get_activity_window(),
use it and do not keep in static variable.

  src/jarabe/journal/journalactivity.py |1 +
  src/jarabe/journal/misc.py|   56 ++--
  src/jarabe/model/bundleregistry.py|7 +++-
  3 files changed, 51 insertions(+), 13 deletions(-)
 
 diff --git a/src/jarabe/journal/journalactivity.py 
 b/src/jarabe/journal/journalactivity.py
 index 44cc018..8ab6a2e 100644
 --- a/src/jarabe/journal/journalactivity.py
 +++ b/src/jarabe/journal/journalactivity.py
 @@ -106,6 +106,7 @@ class JournalActivity(Window):
  def __init__(self):
  logging.debug(STARTUP: Loading the journal)
  Window.__init__(self)
 +misc.get_journal_window(self)
  
  self.set_title(_('Journal'))
  
 diff --git a/src/jarabe/journal/misc.py b/src/jarabe/journal/misc.py
 index 32a2847..b8d8d3a 100644
 --- a/src/jarabe/journal/misc.py
 +++ b/src/jarabe/journal/misc.py
 @@ -27,8 +27,10 @@ from sugar.activity import activityfactory
  from sugar.activity.activityhandle import ActivityHandle
  from sugar.graphics.icon import get_icon_file_name
  from sugar.graphics.xocolor import XoColor
 +from sugar.graphics.alert import ConfirmationAlert
  from sugar import mime
  from sugar.bundle.activitybundle import ActivityBundle
 +from sugar.bundle.bundle import AlreadyInstalledException
  from sugar.bundle.contentbundle import ContentBundle
  from sugar import util
  
 @@ -148,8 +150,9 @@ def get_activities(metadata):
  
  return activities
  

 -def resume(metadata, bundle_id=None):
 +def resume(metadata, bundle_id=None, force_to_downgrade=False):
I think better to have force_to_downgrade hidden because it is being
used only from resume() itlsef...

  registry = bundleregistry.get_registry()
 +version_downgrade = False
  
  if is_activity_bundle(metadata) and bundle_id is None:
  
 @@ -159,19 +162,26 @@ def resume(metadata, bundle_id=None):
  bundle = ActivityBundle(file_path)
  if not registry.is_installed(bundle):
  logging.debug('Installing activity bundle')
 -registry.install(bundle)
 +if not force_to_downgrade:
 +try:
 +registry.install(bundle)
 +except AlreadyInstalledException:
 +older_version_clicked(metadata)
 +version_downgrade = True
 +if force_to_downgrade:
 +registry.install(bundle, force_downgrade=True)
  else:
  logging.debug('Upgrading activity bundle')
  registry.upgrade(bundle)

...it could be done, eg, by moving this part to separate function and
call it from here and from downgrade alert callback 
 -
 -logging.debug('activityfactory.creating bundle with id %r',
 -bundle.get_bundle_id())
 -installed_bundle = registry.get_bundle(bundle.get_bundle_id())
 -if installed_bundle:
 -launch(installed_bundle)
 -else:
 -logging.error('Bundle %r is not installed.',
 -  bundle.get_bundle_id())
 +if not version_downgrade:
 +logging.debug('activityfactory.creating bundle with id %r',
 +bundle.get_bundle_id())
 +installed_bundle = registry.get_bundle(bundle.get_bundle_id())
 +if installed_bundle:
 +launch(installed_bundle)
 +else:
 +logging.error('Bundle %r is not installed.',
 +  bundle.get_bundle_id())
  
  elif is_content_bundle(metadata) and bundle_id is None:
  
 @@ -239,6 +249,30 @@ def launch(bundle, activity_id=None, object_id=None, 
 uri=None, color=None,
  object_id=object_id, uri=uri, invited=invited)
  activityfactory.create(bundle, activity_handle)
  
 

Re: [Sugar-devel] Fwd: [Sur] [ASLO] Nueva version flash games-2

2010-10-22 Thread Aleksey Lim
On Fri, Oct 22, 2010 at 06:33:48PM -0300, Gonzalo Odiard wrote:
 Who can review the activity flash games-2  in ASLO

Activity is already downgraded in its status, and ASLO admins try to
contact w/ uploader.

 
 Mails from teachers from Uruguay in the list olpc-sur:
 
 
 From: *Cristina Yiansens* crisyi...@gmail.com
 Date: 2010/10/22
 To: olpc-...@lists.laptop.org
 
 Hola lista: con respecto a este enlace me gustaría saber la razón de incluir
 el juego ¿Qué le harías a tu ex? junto a Adjedrez y otros.  Es el primer
 botón que tiene el niño para comenzar a jugar y la verdad es que no tiene
 nada de educativo. Sí tiene agresiones al límite.
 Realmente  habría que revisar y colocarlo en juegos para adultos o al menos
 sacarlo de ese paquete
 Saludos,
 
 -- 
 *Cristina Yiansens - Mtra. Dinamizadora de Plan CEIBAL*
 
 Google translation:
 Hi all: on the link I want to know the reason for including the game What
 would you do to your ex? with Adjedrez and others. Button is the first
 child has to start playing and the truth is that there is nothing
 educational. It does have damage to the limit.
 It really should be reviewed and put on games for adults or at least out of
 that package
 
 --
 From: *Natalia Pizzolanti* marna...@hotmail.com
 Date: 2010/10/22
 To: olpc-...@lists.laptop.org
 
  Estoy completamente de acuerdo contigo Cristina!!! Es terrible ver cómo
 los alumnos juegan a reventar a la mujer o matar al hombre hasta que chorrea
 SANGRE...
 
 -
 Google translation:
 I completely agree with you Cristina !!! It is terrible to see how
 students play to blow the woman or man to kill BLOOD dripping ...
 
 
 Gonzalo

 ___
 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] Read SD Comics

2010-10-22 Thread James Simmons
On the 19th I posted my new Activity Read SD Comics on ASLO and it's
still in the sandbox.  Somehow 16 people managed to download it.  I
believe I had provided everything needed, and usually it doesn't take
this long to get something out of the sandbox.  Is something needed
from me?

Thanks,

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


[Sugar-devel] [ASLO] Release Read SD Comics-1

2010-10-22 Thread Sugar Labs Activities
Activity Homepage:
http://activities.sugarlabs.org/addon/4340

Sugar Platform:
0.82 - 0.90

Download Now:
http://activities.sugarlabs.org/downloads/file/27070/read_sd_comics-1.xo

Release notes:
Read SD Comics allows you to use the Journal to read CBZ and Zip archives 
containing images that are stored on your XO laptop SD card or other mountable 
storage like USB thumb drives.  This lets you keep a much larger collection of 
comics on your XO than you could using the Journal alone.



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] Read SD Comics

2010-10-22 Thread Aleksey Lim
On Fri, Oct 22, 2010 at 05:04:15PM -0500, James Simmons wrote:
 On the 19th I posted my new Activity Read SD Comics on ASLO and it's
 still in the sandbox.  Somehow 16 people managed to download it.  I
 believe I had provided everything needed, and usually it doesn't take
 this long to get something out of the sandbox.  Is something needed
 from me?

It wasn't nominated. I've done it and made it public.

 
 Thanks,
 
 James Simmons
 ___
 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


Re: [Sugar-devel] Re-initiate Packaging Team

2010-10-22 Thread Aleksey Lim
On Fri, Oct 22, 2010 at 04:24:14PM +, Aleksey Lim wrote:
 On Thu, Oct 21, 2010 at 04:28:18PM +0200, Bert Freudenberg wrote:
  
  On 21.10.2010, at 04:59, Aleksey Lim wrote:
  
   On Thu, Oct 21, 2010 at 11:26:49AM +, Aleksey Lim wrote:
   On Thu, Oct 21, 2010 at 04:31:49PM +0530, Manusheel Gupta wrote:
   On Thu, Oct 21, 2010 at 4:13 PM, Aleksey Lim alsr...@member.fsf.org 
   wrote:
   
   On Thu, Oct 21, 2010 at 03:45:58PM +0530, Manusheel Gupta wrote:
   On Thu, Oct 21, 2010 at 1:32 PM, Aleksey Lim alsr...@member.fsf.org
   wrote:
   
   Hi all,
   
   This a request to relaunch Packaging Team by giving it a bit another
   meaning that it has before.
   
   The main idea I see for this new/old team is:
   
 Let people start sugar in any environment they have in most
 convenient way.
   
   The team will cover not only questions how sugar is packaged for
   major GNU/Linux distribution but also:
   
   * having Bazaar as a central place of all (out of distro) efforts
   * building packages that are not(yet/well) packaged
   * support distros that don't have packaged sugar
   * run daily snapshot of sugar in as many as possible environments
   * take care of Sugar Platform dependencies (how many, are they 
   packaged
   and make custom build otherwise)
   * support meta sugar distribution ie just a bunch of repositories of
   sugar packages that can be attached to existed system to run sugar
   
   BTW, maybe Packaging is not appropriate name, any ideas?
   
   
   
   Account Services team is the preferred trade name for small size teams
   engaged in support work (answering questions, or communicating with 
   the
   development team, maintaining builds and their timely releases). Some
   companies use Internal System Architect nomenclature too. When team
   sizes
   grew bigger, this work comes under the umbrella of Members of 
   Technical
   Staff.
   
   Well, I personally prefer something less official/corporate, e.g., 
   Bazaar
   Team :)
   
   
   
   Bazaar in Hindi refers to market. Suspect that many people would 
   confuse it
   with the marketing team :-)
   
   Though Bazaar is referring more to The Cathedral and the Bazaar in
   FOSS world (afaik) rather to marketing (which sounds, in some meaning, 
   quite
   opposite thing :).
   
   What about Sweet Team then, i.e., sweet is an id of packages on
   bazaar.sl.o and sweets is the main command-line tool.
   
   Of course it might be something neutral like Distribution Team.
  
  Working with distro packagers is really important. Getting Sugar to work on 
  distros that do not have current Sugar packages is important, too. And 
  running Sugar in emulation on Macs and Windows machines should also be part 
  of the Let people start sugar in any environment mission. Possibly 
  platform team would be more appropriate?
 
 +1 for all options
 
 I guess we don't have many options for naming and Platform Team sounds
 best of all. For example, there is Sugar Platform (and Platform project
 on Bazaar for the same purpose) that should be an area of responsibility
 for the new team.
 
 I'll start to copypaste Platform Team (keeping in mind original purpose
 I stated in initial email) related resources on wiki to Platform_Team/
 sub region on wiki.sl.o.

Hmm.. Platform inclines (what I like) to thinking exactly about Sugar Platform
i.e., native platform, running sugar in non-GNU/Linux environments (if I
got it right) is all about working in VM, thus using the same Sugar
Platform on GNU/Linux.

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


Re: [Sugar-devel] Bridge activity code maintenance

2010-10-22 Thread Tabitha Roder
Daniel says that would be great.

Kind regards
Tabitha Roder
eLearning specialist and olpc volunteer
tabi...@tabitha.net.nz
Cell +64 21 482229
http://tabitharoder.wordpress.com/



On 23 October 2010 01:07, Gary C Martin garycmar...@googlemail.com wrote:

 Hi fang,

 Just wanted to ping and check you have no objections to me picking up
 maintenance of the Bridge activity. I note that you originally uploaded the
 version 2 activity bundle to ASLO and so wanted to give you a heads up:

http://activities.sugarlabs.org/en-US/sugar/addon/4231

 A number of new developers have contacted me and asked if they can
 contribute to Sugar activities, I suggested Bridge was a good candidate to
 start on as there is already a number of enhancements/fixes from similar
 work on the Physics activity that we could easily land. I'll create a new
 git.sugarlabs.org repository for the work, migrating over from
 dev.laptop.org, and we'll post new releases to the ASLO once ready.

 Kind Regards,
 --Gary
 ___
 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