[Sugar-devel] Patch: use standard cursors in Paint

James Cameron quozl at laptop.org
Mon May 31 06:59:18 EDT 2010


On Mon, May 31, 2010 at 01:07:35AM -0300, Gonzalo Odiard wrote:
> This patch change:
> * Show the shape and the size with the pencil, brush, eraser and rainbow.
> * Center this tools at the cursor coordinates
> I think it's more usable than before.
> My idea is enable the change of the size of the selected tool from the unused
> keys whith the circles in the XO.

Yes, it is more usable.

Tested fine on XO-1.5 os125 with Sugar 0.84.16.

Tested-by: James Cameron <quozl at laptop.org>

The patch introduced whitespace errors.

$ git am /tmp/0001-fix-OLPC-296.patch 
Applying: fix OLPC #296
/home/james/olpc/paint.git/.git/rebase-apply/patch:26: trailing whitespace.
            self.show_tool_shape(widget)    
/home/james/olpc/paint.git/.git/rebase-apply/patch:30: trailing whitespace.
        """ 
/home/james/olpc/paint.git/.git/rebase-apply/patch:180: trailing whitespace.
                points = [(last[0] - size/2,last[1] - size/2), (coords[0] - size/2, coords[1] - size/2), 
/home/james/olpc/paint.git/.git/rebase-apply/patch:183: trailing whitespace.
                points = [(last[0] + size/2,last[1] - size/2), (coords[0] + size/2, coords[1] - size/2), 
warning: 4 lines add whitespace errors.

> There are other bugs related like OLPC #8864 and OLPC #2154
> Sorry, the comment say OLC 296, but its Sugarlabs #296

You should mention the bugs in the patch itself.

There are many ways to make the patch again.  If you need to do it, and
it was the most recent patch you made, then use "git commit --amend" ...
otherwise, if you have made other patches since, one way to do it is to:

1.  "git checkout HASH" where hash is the patch to be fixed,

2.  "git reset HEAD^" to undo this last commit without changing the
working copy, then

3.  "git add" and "git commit" again.

-- 
James Cameron
http://quozl.linux.org.au/


More information about the Sugar-devel mailing list