diff options
| author | Daniel Francis <francis@sugarlabs.org> | 2012-07-03 22:57:34 (GMT) |
|---|---|---|
| committer | Daniel Francis <francis@sugarlabs.org> | 2012-07-03 22:57:34 (GMT) |
| commit | bf59f37fecce06e31031cacf0c073a8d2c2b4654 (patch) | |
| tree | b26cf31fa030865732ac137edc45901353c6a553 | |
| parent | 01382b2f578e5ff70cc93b4688ab2df9910320bb (diff) | |
Moving brightness scale to palette
| -rw-r--r-- | toolbars.py | 6 | ||||
| -rw-r--r-- | widgets.py | 33 |
2 files changed, 21 insertions, 18 deletions
diff --git a/toolbars.py b/toolbars.py index af91de6..16cd5d5 100644 --- a/toolbars.py +++ b/toolbars.py @@ -24,6 +24,12 @@ import gobject import gtk from sugar.graphics.toolbutton import ToolButton from sugar.graphics.toolbarbox import ToolbarBox +from sugar.activity.widgets import ToolbarButton + + +class ImageOptions(ToolbarButton): + def __init__(self): + ToolbarButton.__init__(self, icon_name='preferences-system') class PresentToolbarBox(ToolbarBox): @@ -90,34 +90,31 @@ class ImageEditor(gtk.VBox): contrast_scale.set_draw_value(False) contrast_scale.show() eventbox.add(contrast_scale) - eventbox.set_size_request(500, -1) + eventbox.set_size_request(300, -1) contrast_palette.set_content(eventbox) - contrast_palette.set_size_request(300, -1) contrast_item.connect('clicked', lambda w: contrast_palette.popup(immediate=True, state=1)) contrast_item.show() eventbox.show() self.toolbar.insert(contrast_item, -1) - brightness_box = gtk.HBox() - slow_brightness_image = gtk.image_new_from_icon_name("brightness-slow", - gtk.ICON_SIZE_LARGE_TOOLBAR) - slow_brightness_image.show() - brightness_box.pack_start(slow_brightness_image, False, False) + brightness_button = ToolButton('brightness-high') + brightness_button.set_tooltip('Brightness') + eventbox = gtk.EventBox() brightness_scale = gtk.HScale(gtk.Adjustment(0, -1, 1, 0.1)) brightness_scale.set_draw_value(False) brightness_scale.show() - brightness_box.pack_start(brightness_scale, True, True) - high_brightness_image = gtk.image_new_from_icon_name("brightness-high", - gtk.ICON_SIZE_LARGE_TOOLBAR) - high_brightness_image.show() - brightness_box.pack_start(high_brightness_image, False, False) - brightness_box.show() - brightness_item = gtk.ToolItem() - brightness_item.add(brightness_box) - brightness_item.set_expand(True) - brightness_item.show() - self.toolbar.insert(brightness_item, -1) + eventbox.add(brightness_scale) + eventbox.set_size_request(300, -1) + eventbox.show() + brightness_palette = brightness_button.get_palette() + brightness_palette.set_content(eventbox) + brightness_button.connect('clicked', + lambda w: brightness_palette.popup( + immediate=True, + state=1)) + self.toolbar.insert(brightness_button, -1) + brightness_button.show() self.toolbar.set_sensitive(False) self.toolbar.show() self.pack_start(self.toolbar, False, True) |