diff options
| author | Gonzalo Odiard <godiard@sugarlabs.org> | 2011-05-12 20:05:58 (GMT) |
|---|---|---|
| committer | Gonzalo Odiard <godiard@sugarlabs.org> | 2011-05-12 20:05:58 (GMT) |
| commit | 0038e5ceb9497774952851c2a91b7acd5dc026b3 (patch) | |
| tree | 1e426b6e89ee3bc63463136584881e3ba7cb394f | |
| parent | afecca36600205998891e6c08f5b4c85fbfa60fe (diff) | |
Change the size of tools with the keys "+" and "-" - OLPC #8865
I have modified the use of the slider because the HS keyboards have different mappings
| -rw-r--r-- | Area.py | 12 | ||||
| -rw-r--r-- | OficinaActivity.py | 8 |
2 files changed, 12 insertions, 8 deletions
@@ -1050,8 +1050,8 @@ class Area(gtk.DrawingArea): self.set_tool_cursor() def drain_events(self, block=gtk.FALSE): - while gtk.events_pending(): - gtk.mainiteration(block) + while gtk.events_pending(): + gtk.mainiteration(block) def _pixbuf2Image(self, pb): """change a pixbuf to RGB image @@ -1410,16 +1410,18 @@ class Area(gtk.DrawingArea): self.window.set_cursor(gtk.gdk.Cursor(gtk.gdk.CROSS)) widget.queue_draw() - # TODO: unused method? def change_line_size(self, delta): - if self.tool['name'] in ['pencil', 'eraser', 'brush', 'rainbow', - 'stamp']: + # Used from OficinaActivity + if self.tool['name'] in ['pencil', 'eraser', 'brush', 'rainbow']: size = self.tool['line size'] + delta if size < 1: size = 1 self.tool['line size'] = size self.configure_line(size) self.queue_draw() + if self.tool['name'] == 'stamp': + self.resize_stamp(self.stamp_size + delta) + self.queue_draw() def _keep_selection_ratio(self, coords): diff --git a/OficinaActivity.py b/OficinaActivity.py index 4096a83..86175c2 100644 --- a/OficinaActivity.py +++ b/OficinaActivity.py @@ -125,9 +125,11 @@ class OficinaActivity(activity.Activity): self._setup_handle = self.connect('map', map_cp) def key_press(self, widget, event): - sliders = {65474: -5, 65475: -1, 65476: 1, 65477: 5} - if event.keyval in sliders: - self.area.change_line_size(sliders[event.keyval]) + print event.keyval + if event.keyval == 45: + self.area.change_line_size(-1) + if event.keyval == 43: + self.area.change_line_size(1) def read_file(self, file_path): '''Read file from Sugar Journal.''' |