diff options
| author | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-16 05:40:36 (GMT) |
|---|---|---|
| committer | Santiago Collazo <scollazo@activitycentral.com> | 2013-02-16 05:40:36 (GMT) |
| commit | 38f938195fc8414064ca8dc36bd67a0a647d2281 (patch) | |
| tree | 040fec10a6e5686af245b525055a4b6e81ec8ec8 | |
| parent | dad0226c7eceecc7983ad8af13d246533420fd9c (diff) | |
| parent | 158d8181bb1d6bb9d4f6d6425c8fc0d1d2ded448 (diff) | |
Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/sugar3/graphics/toggletoolbutton.py | 4 | ||||
| -rw-r--r-- | tests/graphics/toolbuttons.py | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index cb221a8..51454e8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sugar-toolkit-gtk3],[0.98.3],[],[sugar-toolkit-gtk3]) +AC_INIT([sugar-toolkit-gtk3],[0.98.5],[],[sugar-toolkit-gtk3]) AC_PREREQ([2.59]) diff --git a/src/sugar3/graphics/toggletoolbutton.py b/src/sugar3/graphics/toggletoolbutton.py index dad39a4..0c4e592 100644 --- a/src/sugar3/graphics/toggletoolbutton.py +++ b/src/sugar3/graphics/toggletoolbutton.py @@ -141,4 +141,8 @@ class ToggleToolButton(Gtk.ToggleToolButton): return False + def do_clicked(self): + if self.palette: + self.palette.popdown(True) + palette = property(get_palette, set_palette) diff --git a/tests/graphics/toolbuttons.py b/tests/graphics/toolbuttons.py index 3344cba..e189406 100644 --- a/tests/graphics/toolbuttons.py +++ b/tests/graphics/toolbuttons.py @@ -37,6 +37,7 @@ toolbar_box.toolbar.insert(color_button, -1) color_button.show() favorite_button = ToggleToolButton('emblem-favorite') +favorite_button.set_tooltip('Favorite') toolbar_box.toolbar.insert(favorite_button, -1) favorite_button.show() |