diff options
| -rw-r--r-- | TurtleArt/taexportpython.py | 1 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 11 | ||||
| -rw-r--r-- | plugins/rfid/rfid.py | 4 | ||||
| -rw-r--r-- | plugins/rfid/rfidutils.py | 10 |
4 files changed, 16 insertions, 10 deletions
diff --git a/TurtleArt/taexportpython.py b/TurtleArt/taexportpython.py index 435bd06..9135302 100644 --- a/TurtleArt/taexportpython.py +++ b/TurtleArt/taexportpython.py @@ -38,6 +38,7 @@ from tawindow import plugins_in_use _SETUP_CODE_START = """\ #!/usr/bin/env python +# -*- coding: utf-8 -*- _INSTALL_PATH = '/usr/share/sugar/activities/TurtleArt.activity' _ALTERNATIVE_INSTALL_PATH = \ diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 81b1251..5b9a1c6 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -2205,7 +2205,8 @@ before making changes to your program')) if self.running_sugar: self.activity.empty_trash_alert(title, msg) else: - dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, gtk.BUTTONS_OK_CANCEL, msg) + dialog = gtk.MessageDialog(None, 0, gtk.MESSAGE_WARNING, + gtk.BUTTONS_OK_CANCEL, msg) dialog.set_title(title) res = dialog.run() dialog.destroy() @@ -2213,13 +2214,13 @@ before making changes to your program')) self._empty_trash() def _empty_trash(self): + remove_list = [] for blk in self.block_list.list: if blk.type == 'trash': - blk.type = 'deleted' blk.spr.hide() - for blk in self.block_list.list: - if blk.type == 'deleted': - self.block_list.list.remove(blk) + remove_list.append(blk) + for blk in remove_list: + self.block_list.list.remove(blk) self.trash_stack = [] if 'trash' in palette_names: self.show_toolbar_palette(palette_names.index('trash'), diff --git a/plugins/rfid/rfid.py b/plugins/rfid/rfid.py index c8742ff..5355646 100644 --- a/plugins/rfid/rfid.py +++ b/plugins/rfid/rfid.py @@ -61,7 +61,7 @@ class Rfid(Plugin): """ self.rfid_connected = False - self.rfid_device = find_device() + self.rfid_device = find_device(path=parent.path) self.rfid_idn = '' if self.rfid_device is not None: @@ -118,7 +118,7 @@ class Rfid(Plugin): Called from hal connection when a new device is plugged. """ if not self.rfid_connected: - self.rfid_device = find_device() + self.rfid_device = find_device(path=parent.path) _logger.debug("DEVICE_ADDED: %s" % self.rfid_device) if self.rfid_device is not None: _logger.debug("DEVICE_ADDED: RFID device is not None!") diff --git a/plugins/rfid/rfidutils.py b/plugins/rfid/rfidutils.py index 4e02619..a00e518 100644 --- a/plugins/rfid/rfidutils.py +++ b/plugins/rfid/rfidutils.py @@ -17,14 +17,18 @@ import os import logging -def find_device(): +def find_device(path=None): """ Search for devices. Return a device instance or None. """ device = None - for i in os.listdir(os.path.join('.', 'plugins/rfid')): - if not os.path.isdir(os.path.join('.', 'plugins/rfid', i)): + if path is not None: + path = os.path.join(path, 'plugins/rfid') + else: + path = os.path.join('.', 'plugins/rfid') + for i in os.listdir(path): + if not os.path.isdir(os.path.join(path, i)): try: _tempmod = __import__('rfid.%s'%i.split('.')[0], globals(), locals(), ['RFIDReader'], -1) |