diff options
author | Aleksey Lim <alsroot@activitycentral.org> | 2011-06-21 19:47:08 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@activitycentral.org> | 2011-06-21 19:47:08 (GMT) |
commit | 52c8b44fd8e32f0748acfbf3871f86a143d769d3 (patch) | |
tree | ae496781254672a44f2f3298cb003915a199714d /char.py | |
parent | d5e508b32ecb3fca87f653dc05e7bcb43e6f5b79 (diff) | |
parent | 94fa1ed47477f1c4b2bc4bd96325ce388e0bdad0 (diff) |
Fix merge
Diffstat (limited to 'char.py')
-rw-r--r-- | char.py | 12 |
1 files changed, 9 insertions, 3 deletions
@@ -31,6 +31,7 @@ def load(): [i for i in set(Document.tape) if not i.empty() and i.custom()]): custom.frames[i] = f + class Frame: def __init__(self, id): self.id = id @@ -59,7 +60,8 @@ class Frame: return self._orig def select(self): - return True; + return True + class PreinstalledFrame(Frame): def __init__(self, filename): @@ -74,6 +76,7 @@ class PreinstalledFrame(Frame): self._orig = theme.pixbuf(self._filename) return self._orig + class EmptyFrame(Frame): def __init__(self): Frame.__init__(self, None) @@ -84,13 +87,15 @@ class EmptyFrame(Frame): return False def empty(self): - return True + return True; + class RestoredFrame(Frame): def __init__(self, id, data): Frame.__init__(self, id) self._orig = pixbuf.from_str(data) + class CustomFrame(Frame): def __init__(self): Frame.__init__(self, None) @@ -114,6 +119,7 @@ class CustomFrame(Frame): else: return False + class Char: def __init__(self, name, thumbfile, dir): self.name = name @@ -126,7 +132,7 @@ class Char: self._thumb = theme.pixbuf(thumbfile, theme.THUMB_SIZE) self._custom = False else: - for i in range(0, theme.FRAME_ROWS*theme.FRAME_COLS): + for i in range(0, theme.FRAME_ROWS * theme.FRAME_COLS): self.frames.append(CustomFrame()) self._thumb = theme.CUSTOM_FRAME_THUMB self._custom = True |