diff options
| author | Walter Bender <walter.bender@gmail.com> | 2012-03-26 18:56:52 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2012-03-26 18:56:52 (GMT) |
| commit | 7a23a4111041e7c6e80445b5540bc7203fa360d3 (patch) | |
| tree | 6d956b62796fd8f6afe1dd54d2d5a07de42788f2 /TurtleArtActivity.py | |
| parent | 0e8cd72c86ae3e2a767764424b1c11e7bef43ee1 (diff) | |
fix problem with trash palette after dynamic plugin loading
Diffstat (limited to 'TurtleArtActivity.py')
| -rw-r--r-- | TurtleArtActivity.py | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index e9d9e34..943eb4a 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -655,9 +655,11 @@ class TurtleArtActivity(activity.Activity): self.load_ta_project = self._add_button_and_label( 'load-from-journal', _('Load project'), self.do_load_ta_project_cb, button_box) - self.load_ta_plugin = self._add_button_and_label( - 'load-from-journal', _('Install plugin'), - self.do_load_ta_plugin_cb, button_box) + # Only enable plugin loading if installed in /home + if activity.get_bundle_path()[0:5] == '/home': + self.load_ta_plugin = self._add_button_and_label( + 'load-from-journal', _('Install plugin'), + self.do_load_ta_plugin_cb, button_box) self.load_python = self._add_button_and_label( 'pippy-openoff', _('Load Python block'), self.do_load_python_cb, button_box) @@ -678,9 +680,11 @@ class TurtleArtActivity(activity.Activity): self.load_ta_project = self._add_button( 'load-from-journal', _('Load project'), self.do_load_ta_project_cb, toolbar) - self.load_ta_plugin = self._add_button( - 'load-from-journal', _('Install plugin'), - self.do_load_ta_plugin_cb, toolbar) + # Only enable plugin loading if installed in /home + if activity.get_bundle_path()[0:5] == '/home': + self.load_ta_plugin = self._add_button( + 'load-from-journal', _('Install plugin'), + self.do_load_ta_plugin_cb, toolbar) self.load_python = self._add_button( 'pippy-openoff', _('Load Python block'), self.do_load_python_cb, toolbar) @@ -890,17 +894,27 @@ successfully.') 'palette'): palette_name = file_info.get( 'Plugin', 'palette') + i = palette_names.index('trash') _logger.debug('%s %d' \ -% (palette_name, len(self.palette_buttons) - 1)) - self.palette_buttons.append( +% (palette_name, i - 1)) + self.palette_buttons.insert(i - 1, self._radio_button_factory( palette_name + 'off', self._palette_toolbar, self.do_palette_buttons_cb, - len(self.palette_buttons) - 1, + i - 1, help_strings[palette_name], self.palette_buttons[0], - position=len(self.palette_buttons))) + position=i - 1)) + self.tw.palettes.insert(i - 1, []) + self.tw.palette_sprs.insert( + i - 1, [None, None]) + # Finally, we need to change the index + # associated with the Trash Palette + i = palette_names.index('trash') + self.palette_buttons[i].connect( + 'clicked', + self.do_palette_buttons_cb, i) else: self.tw.showlabel('status', label=_('Please restart Turtle Art in \ |