diff options
| author | Walter Bender <walter.bender@gmail.com> | 2011-07-26 16:24:53 (GMT) |
|---|---|---|
| committer | Walter Bender <walter.bender@gmail.com> | 2011-07-26 16:24:53 (GMT) |
| commit | ae91c9c6f47a00c5c37a92a035e09649f502af3c (patch) | |
| tree | 07beb6f88e5b7dd80efc4ae7ce7c00098ced180f /TurtleArt | |
| parent | 361c3302e5545e691f3a3e7d6111b2dcf1ef8025 (diff) | |
move block skins to plugins directory
Diffstat (limited to 'TurtleArt')
| -rw-r--r-- | TurtleArt/taconstants.py | 1 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py index 80d505c..e40b3ca 100644 --- a/TurtleArt/taconstants.py +++ b/TurtleArt/taconstants.py @@ -131,6 +131,7 @@ PREFIX_DICTIONARY = {'journal': '#smedia_', 'description': '#sdescr_', # # Status blocks # +SKIN_PATHS = ['images'] MEDIA_SHAPES = [] diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 07d7488..692fb4e 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -53,7 +53,7 @@ except ImportError: from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \ MEDIA_SHAPES, STATUS_SHAPES, OVERLAY_SHAPES, STRING_OR_NUMBER_ARGS, \ TOOLBAR_SHAPES, TAB_LAYER, RETURN, OVERLAY_LAYER, CATEGORY_LAYER, \ - BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, \ + BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, SKIN_PATHS, \ MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \ CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \ TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \ @@ -365,8 +365,13 @@ class TurtleArtWindow(): filename = 'file' + name[7:] else: filename = name - self.media_shapes[name] = svg_str_to_pixbuf(svg_from_file( - "%s/images/%s.svg" % (self.path, filename))) + # Try both images/ and plugins/*/images/ + for path in SKIN_PATHS: + if os.path.exists(os.path.join(self.path, path, + filename + '.svg')): + self.media_shapes[name] = svg_str_to_pixbuf(svg_from_file( + os.path.join(self.path, path, filename + '.svg'))) + break for i, name in enumerate(STATUS_SHAPES): self.status_shapes[name] = svg_str_to_pixbuf(svg_from_file( |