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 /ground.py | |
parent | d5e508b32ecb3fca87f653dc05e7bcb43e6f5b79 (diff) | |
parent | 94fa1ed47477f1c4b2bc4bd96325ce388e0bdad0 (diff) |
Fix merge
Diffstat (limited to 'ground.py')
-rw-r--r-- | ground.py | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -28,6 +28,7 @@ def load(): if Document.ground and Document.ground.custom(): THEMES.append(Document.ground) + class Ground: def __init__(self, name, id): self.name = name @@ -51,6 +52,7 @@ class Ground: def select(self): return self + class PreinstalledGround(Ground): def __init__(self, name, filename): Ground.__init__(self, name, filename) @@ -59,6 +61,7 @@ class PreinstalledGround(Ground): def custom(self): return False + class CustomGround(Ground): def __init__(self, name, filename): Ground.__init__(self, name, None) @@ -71,11 +74,13 @@ class CustomGround(Ground): except: return None + class RestoredGround(Ground): def __init__(self, name, id, data): Ground.__init__(self, name, id) self._orig = pixbuf.from_str(data) + class JournalGround(Ground): def __init__(self, jobject): Ground.__init__(self, jobject.metadata['title'], jobject.object_id) |