diff --git a/light8/Config.py b/light8/Config.py --- a/light8/Config.py +++ b/light8/Config.py @@ -396,3 +396,22 @@ subs["*2-06-0"] = { "cycright" : 100, "m "desk2" : 23, "hotbox2" : 89, "hotbox1" : 88, "upfill4" : 48, "b32" : 0, "main 2" : 63, "main 4" : 97, "main 7" : 42, "main 9" : 52, "edge" : 0, "rock" : 0, "marry2" : 0, "marry1" : 41, "side r" : 0,} +subs["*2-02-0"] = { "main 2" : 53, "main 5" : 18, "main 4" : 24, + "main 7" : 42, "main 9" : 60, "main 8" : 36, "b24" : 52, "b23" : 76, + "side r" : 34, "blue1" : 72, "marry2" : 38, "blue3" : 72, "blue2" : 72, + "blue4" : 72, "main 10" : 53,} +subs["*2-03-20-luckcover"] = { "red3" : 75, "red2" : 75, "red1" : 75, + "b24" : 20, "upfill3" : 26, "upfill2" : 31, "upfill1" : 27, "red4" : 97, + "b25" : 20, "side l" : 31, "b23" : 20, "b22" : 20, "upfill4" : 17, + "side r" : 31, "blue1" : 70, "blue3" : 70, "blue2" : 70, "blue4" : 92, + "main 7" : 100, "gree2" : 75, "gree3" : 75, "gree1" : 75, "gree4" : 75, + "hotback" : 40, "main 8" : 0, "cuba1" : 5,} +subs["*1-01-0-justback"] = { "sidefill2" : 47, "sidefill1" : 47, + "cycright" : 41, "upfill3" : 60, "main 10" : 100, "upfill1" : 56, + "b34" : 16, "b25" : 16, "side l" : 0, "b23" : 16, "b22" : 16, + "b32" : 7, "desk1" : 0, "hotbox2" : 100, "hotbox1" : 72, "upfill4" : 68, + "b24" : 16, "desk2" : 0, "main 11" : 100, "upfill2" : 91, "main 3" : 13, + "main 2" : 13, "main 5" : 13, "main 4" : 100, "main 7" : 100, + "phone" : 0, "main 9" : 14, "main 8" : 13, "cycleft" : 41, "edge" : 0, + "b13" : 16, "rock" : 0, "marry2" : 16, "marry1" : 16, "cuba1" : 16, + "cuba2" : 0, "side r" : 0,} diff --git a/light8/ExtSliderMapper.py b/light8/ExtSliderMapper.py --- a/light8/ExtSliderMapper.py +++ b/light8/ExtSliderMapper.py @@ -214,7 +214,7 @@ class ExtSliderMapper(Frame): self.current_mappings.append(SliderMapping(color)) self.draw_interface() - def load_presets(self): + def load_presets(self, *args): self.presets = {} self.file = open(self.filename, 'r') lines = self.file.readlines() @@ -223,6 +223,8 @@ class ExtSliderMapper(Frame): name = tokens.pop(0) self.presets[name] = tokens self.file.close() + if args: # called from callback + self.draw_interface() def save_presets(self): self.file = open(self.filename, 'w') self.file.seek(0) @@ -289,6 +291,12 @@ class ExtSliderMapper(Frame): self.presetcombo.entry.configure(bg='black', fg='white') self.draw_presets() self.presetcombo.pack(side=LEFT) + Button(presetframe, text="Prev", padx=0, pady=0, bg='black', + fg='white', font=stdfont, + command=self.prev_preset).pack(side=LEFT) + Button(presetframe, text="Next", padx=0, pady=0, bg='black', + fg='white', font=stdfont, + command=self.next_preset).pack(side=LEFT) Button(presetframe, text="Add", padx=0, pady=0, bg='black', fg='white', font=stdfont, command=self.add_preset).pack(side=LEFT) @@ -309,6 +317,20 @@ class ExtSliderMapper(Frame): self.disconnect_all() for subname, slidermap in zip(preset_mapping, self.current_mappings): slidermap.set_subname(subname) + def change_preset_by_index(self, delta): + preset_names = self.presets.keys() + preset_names.sort() + try: + next = preset_names[preset_names.index(self.current_preset.get()) + + delta] + self.current_preset.set(next) + self.apply_preset(next) + except (IndexError, ValueError): + print "Light 8.8: Can't go in that direction. Dig up!" + def next_preset(self, *args): + self.change_preset_by_index(1) + def prev_preset(self, *args): + self.change_preset_by_index(-1) def delete_preset(self, *args): del self.presets[self.current_preset.get()] self.presetcombo.slistbox.listbox.delete(0, END) @@ -320,6 +342,7 @@ class ExtSliderMapper(Frame): self.presetcombo.slistbox.listbox.delete(0, END) self.draw_presets() self.save_presets() + self.draw_interface() def draw_presets(self): preset_names = self.presets.keys() preset_names.sort() diff --git a/light8/slidermapping b/light8/slidermapping --- a/light8/slidermapping +++ b/light8/slidermapping @@ -17,4 +17,4 @@ 2-03 start *2-03-00-open dance *2-03-10- 2-05 *2-05-0 *2-05-1-dream *2-05-2-boat *interscene 2-06 *2-06-0 patio right patio left *interscene colors col blue col gree col oran col red -vitals house god *curtain phone booth +vitals house god *curtain *interscene