changeset 108:115dd48e15a9

latest changes. couldn't commit lightboard for some reason
author dmcc
date Tue, 23 Jul 2002 01:13:38 +0000
parents 47bda76f5236
children ec82e1eea3c8
files light8/Config.py light8/panels.py
diffstat 2 files changed, 18 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/light8/Config.py	Sun Jul 21 07:20:33 2002 +0000
+++ b/light8/Config.py	Tue Jul 23 01:13:38 2002 +0000
@@ -415,3 +415,19 @@
     "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,}
+subs["*2-06-0"] = { "cycright" : 100, "main 11" : 13, "main 10" : 0,
+    "upfill1" : 48, "b34" : 0, "b24" : 100, "b23" : 62, "b22" : 0,
+    "desk2" : 0, "hotbox2" : 64, "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["*cuba floor show"] = { "cycright" : 100, "main 11" : 13, "main 10" : 0,
+    "upfill1" : 48, "b34" : 0, "b24" : 100, "b23" : 62, "b22" : 0,
+    "desk2" : 0, "hotbox2" : 64, "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["*cuba floor show"] = { "cycright" : 100, "main 11" : 13,
+    "main 10" : 0, "upfill1" : 48, "b34" : 0, "b24" : 100, "b23" : 62,
+    "b22" : 0, "b32" : 0, "hotbox2" : 64, "hotbox1" : 88, "upfill4" : 48,
+    "desk2" : 0, "main 2" : 63, "main 5" : 47, "main 4" : 86, "main 7" : 66,
+    "main 9" : 52, "edge" : 0, "rock" : 0, "marry2" : 0, "marry1" : 96,
+    "hotback" : 57, "side r" : 0,}
--- a/light8/panels.py	Sun Jul 21 07:20:33 2002 +0000
+++ b/light8/panels.py	Tue Jul 23 01:13:38 2002 +0000
@@ -11,7 +11,7 @@
 
 class Controlpanel(Frame):
     def __init__(self, parent, xfader, refresh_cb, quit_cb, jostle_cb, 
-                 whatsup_cb):
+                 whatsup_cb=None):
         Frame.__init__(self,parent, bg='black')
         controlpanel = self
         for txt,cmd in (
@@ -24,7 +24,7 @@
             ('Clear Y',     lambda: xfader.clearallbuttons('y')),
             ("What's up?",     whatsup_cb)):
             Button(controlpanel, text=txt, command=cmd, bg='black', 
-                fg='white').pack(side='top', fill='x')
+                fg='white',font=stdfont, padx=0, pady=0).pack(side='top', fill='x')
         # jostle button
         Checkbutton(controlpanel, text="Jostle", bg='black', fg='white',
             command=jostle_cb).pack(side=TOP, fill=X)