diff options
| author | Pootle Translation <pootle@dev.laptop.org> | 2008-08-25 14:05:14 (GMT) |
|---|---|---|
| committer | Pootle Translation <pootle@dev.laptop.org> | 2008-08-25 14:05:14 (GMT) |
| commit | a41016fe14ea10d6a01f48cde847ce7431f2b547 (patch) | |
| tree | 5016ef1822c6728933a70ba75a161eaace37ea9e | |
| parent | f4dbbf76a9b13dfe5b5865ef26a3c12f427f7431 (diff) | |
| parent | e2067b00c5f5f3b2e63774aa00a1006b85415feb (diff) | |
Merge branch 'sucrose-0.82' of git+ssh://dev.laptop.org/git/sugar-toolkit into sucrose-0.82
| -rw-r--r-- | src/sugar/graphics/alert.py | 3 | ||||
| -rw-r--r-- | src/sugar/graphics/toolbutton.py | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/src/sugar/graphics/alert.py b/src/sugar/graphics/alert.py index a4d2a5a..39c373c 100644 --- a/src/sugar/graphics/alert.py +++ b/src/sugar/graphics/alert.py @@ -105,9 +105,6 @@ class Alert(gtk.EventBox): if self._msg != value: self._msg = value self._msg_label.set_markup(self._msg) - width, height_ = self._msg_label.size_request() - self._msg_label.set_size_request(width-style.DEFAULT_SPACING, - -1) self._msg_label.set_line_wrap(True) elif pspec.name == 'icon': if self._icon != value: diff --git a/src/sugar/graphics/toolbutton.py b/src/sugar/graphics/toolbutton.py index bf392c8..715e7a9 100644 --- a/src/sugar/graphics/toolbutton.py +++ b/src/sugar/graphics/toolbutton.py @@ -65,6 +65,12 @@ class ToolButton(gtk.ToolButton): self.set_icon(icon_name) self.connect('clicked', self.__button_clicked_cb) + self.get_child().connect('can-activate-accel', + self.__button_can_activate_accel_cb) + + def __button_can_activate_accel_cb(self, button, signal_id): + # Accept activation via accelerators regardless of this widget's state + return True def set_tooltip(self, tooltip): """ Set a simple palette with just a single label. |