Use standard cursors for pencil, brush, eraser and paint-bucket. The other tools need a custom cursor. Bugs #40, #296 and OLPC #4316, #8864 >From 14b03a73bb0603fabeeb2e2640dbef7419fa549c Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard <<a href="mailto:godiard@gmail.com">godiard@gmail.com</a>> Date: Tue, 25 May 2010 06:36:26 -0300 Subject: [PATCH] use standard cursors --- Area.py | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-) diff --git a/Area.py b/Area.py index 611f944..44edebb 100644 --- a/Area.py +++ b/Area.py @@ -1057,11 +1057,20 @@ class Area(gtk.DrawingArea): # Setting the cursor try: - pixbuf = gtk.gdk.pixbuf_new_from_file('./images/' + tool['name'] + '.png') - cursor = gtk.gdk.Cursor(gtk.gdk.display_get_default() , pixbuf, 6, 21) + if (self.tool['name'] is 'pencil'): + cursor = gtk.gdk.cursor_new_from_name(gtk.gdk.display_get_default(), 'pencil') + elif (self.tool['name'] is 'brush'): + cursor = gtk.gdk.cursor_new_from_name(gtk.gdk.display_get_default(), 'paintbrush') + elif (self.tool['name'] is 'eraser'): + cursor = gtk.gdk.cursor_new_from_name(gtk.gdk.display_get_default(), 'eraser') + elif (self.tool['name'] is 'bucket'): + cursor = gtk.gdk.cursor_new_from_name(gtk.gdk.display_get_default(), 'paint-bucket') + else: + pixbuf = gtk.gdk.pixbuf_new_from_file('./images/' + tool['name'] + '.png') + cursor = gtk.gdk.Cursor(gtk.gdk.display_get_default() , pixbuf, 6, 21) except gobject.GError: cursor = None - + self.window.set_cursor(cursor) def getout(self,undo=False,widget=None): -- 1.6.6.1 Gonzalo