# HG changeset patch
# User drewp@bigasterisk.com
# Date 1339782839 0
# Node ID 62f99e2a00acaa54459b743a7d31d28a902b1842
# Parent  812be8482388b8dd6e23fee13c77bee04abc58c4
updates for screen size
Ignore-this: 88a81b44e30b3cb9033fe86bc7672846

diff -r 812be8482388 -r 62f99e2a00ac bin/curvecalc
--- a/bin/curvecalc	Fri Jun 15 16:38:08 2012 +0000
+++ b/bin/curvecalc	Fri Jun 15 17:53:59 2012 +0000
@@ -63,11 +63,11 @@
 
         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 -r 812be8482388 -r 62f99e2a00ac bin/keyboardcomposer
--- a/bin/keyboardcomposer	Fri Jun 15 16:38:08 2012 +0000
+++ b/bin/keyboardcomposer	Fri Jun 15 17:53:59 2012 +0000
@@ -411,7 +411,7 @@
 
 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 -r 812be8482388 -r 62f99e2a00ac light9/curvecalc/curveview.py
--- a/light9/curvecalc/curveview.py	Fri Jun 15 16:38:08 2012 +0000
+++ b/light9/curvecalc/curveview.py	Fri Jun 15 17:53:59 2012 +0000
@@ -353,8 +353,11 @@
         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 -r 812be8482388 -r 62f99e2a00ac light9/curvecalc/zoomcontrol.py
--- a/light9/curvecalc/zoomcontrol.py	Fri Jun 15 16:38:08 2012 +0000
+++ b/light9/curvecalc/zoomcontrol.py	Fri Jun 15 17:53:59 2012 +0000
@@ -55,6 +55,7 @@
         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 -r 812be8482388 -r 62f99e2a00ac show/dance2012/makefile
--- a/show/dance2012/makefile	Fri Jun 15 16:38:08 2012 +0000
+++ b/show/dance2012/makefile	Fri Jun 15 17:53:59 2012 +0000
@@ -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