From 3a41c9064edb3a286fb614536d5bdfcce197e4fa Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Wed, 28 Mar 2012 19:42:55 +0000
Subject: Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index bb9aecb..a6a3ae5 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -982,13 +982,12 @@ Plugin section of plugin.info file.')
                              os.path.join(plugin_path, plugin_name) + '/'])
             _logger.debug('Plugin installed successfully.')
             if self.has_toolbarbox:
-                palette_name_list = []
+                create_palette = []
                 if file_info.has_option('Plugin', 'palette'):
                     palette_name_list = file_info.get(
                         'Plugin', 'palette').split(',')
-                    create_palette = []
                     for palette_name in palette_name_list:
-                        if not palette_name.strip() in palette_names:
+                        if not palette_name.rstrip() in palette_names:
                             create_palette.append(True)
                         else:
                             create_palette.append(False)
@@ -999,27 +998,27 @@ Plugin section of plugin.info file.')
                 for i, palette_name in enumerate(palette_name_list):
                     if create_palette[i]:
                         _logger.debug('Creating plugin palette %s...' % (
-                                palette_name.strip()))
-                        j = len(self.palette_buttons)
+                                palette_name))
+                        j = palette_names.index('trash')
                         self.palette_buttons.insert(j - 1,
                             self._radio_button_factory(
-                                palette_name.strip() + 'off',
+                                palette_name + 'off',
                                 self._palette_toolbar,
                                 self.do_palette_buttons_cb,
                                 j - 1,
-                                help_strings[palette_name.strip()],
+                                help_strings[palette_name.rstrip()],
                                 self.palette_buttons[0],
                                 position=j - 1))
                         self.tw.palettes.insert(j - 1, [])
                         self.tw.palette_sprs.insert(j - 1, [None, None])
+                        # We need to change the index associated with the
+                        # Trash Palette Button.
+                        j = palette_names.index('trash')
+                        self.palette_buttons[j].connect(
+                            'clicked', self.do_palette_buttons_cb, j)
                     else:
                         _logger.debug('Palette already exists... \
 skipping insert')
-                # We need to change the index associated with the
-                # Trash Palette Button.
-                j = len(palette_names)
-                self.palette_buttons[j - 1].connect(
-                    'clicked', self.do_palette_buttons_cb, j - 1)
             else:
                 self.tw.showlabel('status',
                                   label=_('Please restart Turtle Art \
@@ -1078,7 +1077,7 @@ in order to use the plugin.'))
 
                 tmp_dir = tempfile.mkdtemp()
 
-                if True: # try:
+                try:
                     tar_fd.extractall(tmp_dir)
                     if not plugin:
                         # Looking for a .ta file
@@ -1089,10 +1088,10 @@ in order to use the plugin.'))
                             self.tw.load_files(turtle_code, run_it)
                     else:
                         self._load_a_plugin(tmp_dir)
-                else: # except:
+                except:
                     _logger.debug('Could not extract files from %s.' % (
                             file_path))
-                if True: # finally:
+                finally:
                     if not plugin:
                         shutil.rmtree(tmp_dir)
                     tar_fd.close()
--
cgit v0.9.1