diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-06-12 23:44:58 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2011-06-12 23:44:58 (GMT) |
| commit | f08ecff6049386527ac3f630764683b56dc26d6f (patch) | |
| tree | b4053a58a8eec86b01f3455ca652c0eb412b45ba | |
| parent | b02f54700fd4d1a89c9737490165fc9329b78205 (diff) | |
fixed problem with toolbars impacting pre-0.86 design
| -rw-r--r-- | TurtleConfusionActivity.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/TurtleConfusionActivity.py b/TurtleConfusionActivity.py index 8bc80e0..3385c2f 100644 --- a/TurtleConfusionActivity.py +++ b/TurtleConfusionActivity.py @@ -609,12 +609,6 @@ class TurtleConfusionActivity(activity.Activity): def _setup_palette_toolbar(self): # The palette toolbar must be setup *after* plugins are loaded. - self._levels = self._get_levels(activity.get_bundle_path()) - self._levels_combo = self._combo_factory(self._levels, - _('Select a challenge'), - self._palette_toolbar_button, - self._levels_cb) - self._add_separator(self._palette_toolbar, True) if self.has_toolbarbox: self.palette_buttons = [] @@ -635,6 +629,11 @@ class TurtleConfusionActivity(activity.Activity): def _make_palette_buttons(self, toolbar, palette_button=False): ''' Creates the palette and block buttons for both toolbar types''' + self._levels = self._get_levels(activity.get_bundle_path()) + self._levels_combo = self._combo_factory(self._levels, + _('Select a challenge'), + toolbar, self._levels_cb) + self._add_separator(toolbar, True) if palette_button: # old-style toolbars need this button self.palette_button = self._add_button( 'paletteoff', _('Hide palette'), self.do_palette_cb, @@ -827,7 +826,10 @@ class TurtleConfusionActivity(activity.Activity): separator = gtk.SeparatorToolItem() separator.props.draw = True separator.set_expand(expand) - toolbar.insert(separator, -1) + if hasattr(toolbar, 'insert'): + toolbar.insert(separator, -1) + else: + toolbar.props.page.insert(separator, -1) separator.show() def _add_button(self, name, tooltip, callback, toolbar, accelerator=None, |