diff options
| -rwxr-xr-x | sprite_factory.py | 12 | ||||
| -rw-r--r-- | tawindow.py | 20 |
2 files changed, 17 insertions, 15 deletions
diff --git a/sprite_factory.py b/sprite_factory.py index 7710429..6b46d5a 100755 --- a/sprite_factory.py +++ b/sprite_factory.py @@ -247,12 +247,20 @@ class SVG: return self._header() + svg def palette(self, width, height): - self._fill, self._stroke = "#282828", "none" self._width, self._height = width, height - svg = self._rect(width, height, 0, 0) + self._fill, self._stroke = "#282828", "none" + svg = self._rect(width, 55, 0, 0) + self._fill, self._stroke = "#FFD000", "none" + svg += self._rect(width, height-55, 0, 55) svg += self._footer() return self._header() + svg + def from_file(self, pathname): + f = file(pathname, 'r') + svg = f.read() + f.close() + return(svg) + # # Utility methods # diff --git a/tawindow.py b/tawindow.py index d61dd6e..28ca9cd 100644 --- a/tawindow.py +++ b/tawindow.py @@ -262,24 +262,18 @@ class TurtleArtWindow(): # TODO: make graphical selector buttons if self.selectors == []: svg = sprite_factory.SVG() - svg.set_scale(2.0) - svg.set_gradiant(True) - svg.set_innie([False]) - svg.set_outie(False) - svg.set_tab(False) - svg.set_slot(False) - svg.expand(25) - x, y = 5, 5 + x, y = 5, 0 for i, name in enumerate(PALETTE_NAMES): svg.set_stroke_width(STANDARD_STROKE_WIDTH) svg.set_colors(COLORS[i]) - a = sprite_factory.svg_str_to_pixbuf(svg.basic_block()) - svg.set_stroke_width(SELECTED_STROKE_WIDTH) - svg.set_stroke_color(SELECTED_COLOR) - b = sprite_factory.svg_str_to_pixbuf(svg.basic_block()) + svg_path = "%s/palette/%soff.svg" % (self.path, + PALETTE_NAMES[i]) + a = sprite_factory.svg_str_to_pixbuf(svg.from_file(svg_path)) + svg_path = "%s/palette/%son.svg" % (self.path, + PALETTE_NAMES[i]) + b = sprite_factory.svg_str_to_pixbuf(svg.from_file(svg_path)) self.selector_shapes.append([a,b]) self.selectors.append(sprites.Sprite(self.sprite_list, x, y, a)) - self.selectors[i].set_label(name) self.selectors[i].type = 'selector' self.selectors[i].set_layer(TAB_LAYER) w, h = self.selectors[i].get_dimensions() |