diff options
Diffstat (limited to 'montage.py')
| -rw-r--r-- | montage.py | 52 |
1 files changed, 29 insertions, 23 deletions
@@ -33,7 +33,7 @@ import ground import sound from document import Document, clean from screenbuil import Screen -from utils import * +from utils import ComboBox logger = logging.getLogger('cartoon-builder') @@ -179,12 +179,12 @@ class View(Gtk.EventBox): #table_scroll = VScrolledBox() table_scroll = Gtk.ScrolledWindow() table_scroll.add_with_viewport(self.table) - table_scroll.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BUTTON_BACKGROUND)) + table_scroll.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BUTTON_BACKGROUND')) yellow_frames = Gtk.EventBox() - yellow_frames.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(YELLOW)) + yellow_frames.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('YELLOW')) table_frames = Gtk.EventBox() - table_frames.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BACKGROUND)) + table_frames.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BACKGROUND')) table_frames.set_border_width(5) table_frames.add(table_scroll) yellow_frames.add(table_frames) @@ -200,7 +200,7 @@ class View(Gtk.EventBox): # screen screen_pink = Gtk.EventBox() - screen_pink.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(PINK)) + screen_pink.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('PINK')) screen_box = Gtk.EventBox() screen_box.set_border_width(5) screen_box.add(self._screen) @@ -211,11 +211,11 @@ class View(Gtk.EventBox): tape = Gtk.HBox() - for i in range(TAPE_COUNT): + for i in range(theme.TAPE_COUNT): frame_box = Gtk.VBox() filmstrip_pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( - theme.path('icons', 'filmstrip.png'), THUMB_SIZE, -1, False) + theme.path('icons', 'filmstrip.png'), theme.THUMB_SIZE, -1, False) filmstrip = Gtk.Image() filmstrip.set_from_pixbuf(filmstrip_pixbuf); @@ -224,8 +224,8 @@ class View(Gtk.EventBox): frame = Gtk.EventBox() frame.set_events(Gdk.EventMask.BUTTON_PRESS_MASK) frame.connect('button_press_event', self._tape_cb, i) - frame.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BLACK)) - frame.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse(BLACK)) + frame.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BLACK')) + frame.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse('BLACK')) frame.props.border_width = 2 frame.set_size_request(theme.THUMB_SIZE, theme.THUMB_SIZE) frame_box.pack_start(frame, True, True, 0) @@ -261,7 +261,7 @@ class View(Gtk.EventBox): screen_alignment.add(screen_pink) box = Gtk.EventBox() - box.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BACKGROUND)) + box.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BACKGROUND')) box.connect('size-allocate', self._screen_size_cb, screen_pink) box.add(screen_alignment) @@ -278,9 +278,9 @@ class View(Gtk.EventBox): arrow = Gtk.Image() arrow.set_from_file(theme.path('icons', 'pink_arrow.png')) tape_pink = Gtk.EventBox() - tape_pink.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(PINK)) + tape_pink.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('PINK')) tape_bg = Gtk.EventBox() - tape_bg.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BACKGROUND)) + tape_bg.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BACKGROUND')) tape_bg.set_border_width(5) tape_bg.add(tape) tape_pink.add(tape_bg) @@ -298,11 +298,11 @@ class View(Gtk.EventBox): desktop.pack_start(tape_box, False, False, 0) greenbox = Gtk.EventBox() - greenbox.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BACKGROUND)) + greenbox.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BACKGROUND')) greenbox.set_border_width(5) greenbox.add(desktop) - self.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(YELLOW)) + self.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('YELLOW')) self.add(greenbox) self.show_all() @@ -331,8 +331,9 @@ class View(Gtk.EventBox): for i in range(theme.TAPE_COUNT): self._play_tape_num += 1 - if self._play_tape_num == TAPE_COUNT: + if self._play_tape_num == theme.TAPE_COUNT: self._play_tape_num = 0 + if Document.tape[self._play_tape_num].empty(): continue return True @@ -352,8 +353,8 @@ class View(Gtk.EventBox): image_box = Gtk.EventBox() image_box.set_events(Gdk.EventMask.BUTTON_PRESS_MASK) image_box.connect('button_press_event', self._frame_cb, index) - image_box.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(BLACK)) - image_box.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse(BLACK)) + image_box.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('BLACK')) + image_box.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse('BLACK')) image_box.props.border_width = 2 image_box.set_size_request(theme.THUMB_SIZE, theme.THUMB_SIZE) image_box.add(image) @@ -371,25 +372,27 @@ class View(Gtk.EventBox): return tape = self._tape[index] - tape.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse(YELLOW)) - tape.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse(YELLOW)) + tape.modify_bg(Gtk.StateType.NORMAL, Gdk.color_parse('YELLOW')) + tape.modify_bg(Gtk.StateType.PRELIGHT, Gdk.color_parse('YELLOW')) if self._tape_selected != index: if self._tape_selected != -1: old_tape = self._tape[self._tape_selected] old_tape.modify_bg(Gtk.StateType.NORMAL, - Gdk.color_parse(BLACK)) + Gdk.color_parse('BLACK')) old_tape.modify_bg(Gtk.StateType.PRELIGHT, - Gdk.color_parse(BLACK)) + Gdk.color_parse('BLACK')) self._tape_selected = index self._screen.fgpixbuf = Document.tape[index].orig() self._screen.draw() def _frame_cb(self, widget, event, i): + if event.button == 3: self._char.clean(i) self._frames[i].set_from_pixbuf(self._char.frames[i].thumb()) + else: if i < len(self._char.frames): frame = self._char.frames[i] @@ -400,11 +403,14 @@ class View(Gtk.EventBox): self.set_frame((self._tape_selected, None)) def _char_cb(self, widget, closure): + self._char = widget.props.value + for i in range(len(self._frames)): if i < len(self._char.frames): self._frames[i].set_from_pixbuf(self._char.frames[i].thumb()) self._frames[i].parent.show() + else: self._frames[i].parent.hide() @@ -417,8 +423,8 @@ class View(Gtk.EventBox): if id(choice) != id(widget.props.value): widget.append_item(choice, text=choice.name, - size=(theme.THUMB_SIZE, theme.THUMB_SIZE), - pixbuf=choice.thumb()) + size=(theme.THUMB_SIZE, theme.THUMB_SIZE), + pixbuf=choice.thumb()) widget.set_active(len(widget.get_model()) - 1) self._prev_combo_selected[widget] = widget.get_active() |