diff --git a/bin/curvecalc b/bin/curvecalc --- a/bin/curvecalc +++ b/bin/curvecalc @@ -63,11 +63,11 @@ class Main(object): mainwin.connect("delete-event", lambda *args: reactor.crash()) mainwin.set_title("curvecalc - %s" % graph.label(song)) - mainwin.parse_geometry("715x930+1080+26") + mainwin.parse_geometry("715x930-0+24") # this is the only one i found that would set the size right, # but it's a minimum size, which i don't really want - mainwin.set_size_request(1000, 1000) + mainwin.set_size_request(1678, 922) wtree.get_object("subterms").connect("add", self.onSubtermChildAdded) self.add_subterms_for_song(song, curveset, subterms) diff --git a/bin/keyboardcomposer b/bin/keyboardcomposer --- a/bin/keyboardcomposer +++ b/bin/keyboardcomposer @@ -411,7 +411,7 @@ class LevelServerHttp(resource.Resource) class Sliders(BCF2000): def __init__(self, kc): - devices = ['/dev/snd/midiC1D0', '/dev/snd/midiC2D0'] + devices = ['/dev/snd/midiC1D0', '/dev/snd/midiC2D0', '/dev/snd/midiC3D0'] for dev in devices: try: BCF2000.__init__(self, dev=dev) diff --git a/light9/curvecalc/curveview.py b/light9/curvecalc/curveview.py --- a/light9/curvecalc/curveview.py +++ b/light9/curvecalc/curveview.py @@ -353,8 +353,11 @@ class Curveview(object): self.canvas = goocanvas.Canvas() box.pack_start(self.canvas) self.canvas.show() - - self.canvas.set_property("background-color", "black") + + p = self.canvas.props + p.background_color = 'black' + p.x2 = 2000 + self.size = self.canvas.get_allocation() self.root = self.canvas.get_root_item() diff --git a/light9/curvecalc/zoomcontrol.py b/light9/curvecalc/zoomcontrol.py --- a/light9/curvecalc/zoomcontrol.py +++ b/light9/curvecalc/zoomcontrol.py @@ -55,6 +55,7 @@ class ZoomControl(object): self.widget = goocanvas.Canvas(bounds_padding=5) self.widget.set_property("background-color", "gray60") self.widget.set_size_request(-1, 30) + self.widget.props.x2 = 2000 endtimes = dispatcher.send("get max time") if endtimes: diff --git a/show/dance2012/makefile b/show/dance2012/makefile --- a/show/dance2012/makefile +++ b/show/dance2012/makefile @@ -1,2 +1,2 @@ patch.n3: patch-source.n3 patch-rules.n3 - python2.6 /usr/local/bin/cwm patch-source.n3 --filter=patch-rules.n3 --n3=/ > patch.n3 + /usr/bin/cwm patch-source.n3 --filter=patch-rules.n3 --n3=/ > patch.n3