# HG changeset patch
# User dmcc
# Date 2003-07-10 07:39:55
# Node ID ce362534d133327d9353bb66b239c8ac8bf24910
# Parent  e9c06be9b26b2374169823176fd10a306de283e1

- maybe more fixes to CueFaders
- maybe more fixes to CueFaders
- no interesting changes to cues/dolly, just stupid id changes

diff --git a/flax/CueFaders.py b/flax/CueFaders.py
--- a/flax/CueFaders.py
+++ b/flax/CueFaders.py
@@ -95,6 +95,8 @@ class TimedGoButton(Tk.Frame):
         self.start_time = 0
         self.fading = 0
         self.last_after_key = 0
+    def manual_override(self, *args):
+        self.end_fade()
     def wheelscroll(self, event):
         """Mouse wheel increments or decrements timer."""
         if event.num == 4: # scroll up
@@ -108,14 +110,13 @@ class TimedGoButton(Tk.Frame):
         self.end_level = end_level
 
         if self.fading == 1: # if we're already fading
-            print "already fading!"
-            # fade_time = old_fade_length - 
             self.fading = 'paused'
-            self.fade_length = time.time() - self.last_start_time
-            print "fade_length", self.fade_length
-            self.end_fade()
+            # new fade should be as long as however much was left
+            self.fade_length = self.fade_length - \
+                (time.time() - self.last_start_time)
+            self.button['text'] = 'Unpause'
+            self.after_cancel(self.last_after_key)
         else:
-            print "not already fading or continuing a fade"
             try:
                 fade_time = float(self.timer_var.get())
             except ValueError:
@@ -124,10 +125,10 @@ class TimedGoButton(Tk.Frame):
                 print ">>> Can't fade -- bad time", self.timer_var.get()
                 return
 
-            # TODO fix
+            # if we're not already fading, we get our time from the entry
             if self.fading != 'paused':
                 self.fade_length = fade_time
-            print "fade_length", self.fade_length
+
             self.button['text'] = 'Pause'
             self.fading = 1
             self.do_fade()
@@ -339,6 +340,7 @@ class CueFader(Tk.Frame):
         for scale_name, scale in self.scales.items():
             # print "shift: setting scale to 0", scale_name
             scale.scale.set(0)
+            self.go_buttons[scale_name].manual_override()
         self.update_cue_cache(compute_dmx_levels=1)
 
         if self.auto_load_times.get():
diff --git a/flax/cues/dolly b/flax/cues/dolly
--- a/flax/cues/dolly
+++ b/flax/cues/dolly
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
 <PyObject family="obj" type="builtin_wrapper"  class="_EmptyClass">
-<attr name="__toplevel__" family="map" type="__compound__" extra="None TreeDict" id="138476260" >
+<attr name="__toplevel__" family="map" type="__compound__" extra="None TreeDict" id="138476812" >
   <entry>
     <key type="string" value="cues" />
-    <val type="list" id="139904700" >
-      <item type="PyObject" id="139916852" class="Cue">
+    <val type="list" id="139904124" >
+      <item type="PyObject" id="139924844" class="Cue">
         <attr name="name" type="string" value="curtain warmers" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="-7" />
@@ -13,7 +13,7 @@
         <attr name="sub_levels" type="string" value="curtain_warmers : 1" />
         <attr name="desc" type="string" value="preshow" />
       </item>
-      <item type="PyObject" id="139923804" class="Cue">
+      <item type="PyObject" id="139846908" class="Cue">
         <attr name="name" type="string" value="cast frozen" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-1" />
@@ -21,7 +21,7 @@
         <attr name="sub_levels" type="string" value="1-1_sill : .8" />
         <attr name="desc" type="string" value="curtain opens" />
       </item>
-      <item type="PyObject" id="139957772" class="Cue">
+      <item type="PyObject" id="141773276" class="Cue">
         <attr name="name" type="string" value="cast wakes up" />
         <attr name="time" type="string" value=".75" />
         <attr name="page" type="string" value="1-1-1" />
@@ -29,7 +29,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .8" />
         <attr name="desc" type="string" value="music cue" />
       </item>
-      <item type="PyObject" id="140864020" class="Cue">
+      <item type="PyObject" id="139876388" class="Cue">
         <attr name="name" type="string" value="cast freezes, dolly walks RC to LC" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-1" />
@@ -37,7 +37,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .6, front_rc : 1" />
         <attr name="desc" type="string" value="dolly at right" />
       </item>
-      <item type="PyObject" id="139873820" class="Cue">
+      <item type="PyObject" id="140861612" class="Cue">
         <attr name="name" type="string" value="cast freezes, dolly walks RC to LC" />
         <attr name="time" type="string" value="5" />
         <attr name="page" type="string" value="1-1-1" />
@@ -45,7 +45,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .6, front_lc : 1, front_c : 0.6" />
         <attr name="desc" type="string" value="dolly at left, &quot;financial consultation&quot;" />
       </item>
-      <item type="PyObject" id="139854796" class="Cue">
+      <item type="PyObject" id="141767524" class="Cue">
         <attr name="name" type="string" value="unfreeze" />
         <attr name="time" type="string" value="1.5" />
         <attr name="page" type="string" value="1-1-2" />
@@ -53,7 +53,7 @@
         <attr name="sub_levels" type="string" value="1-1 : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="141770052" class="Cue">
+      <item type="PyObject" id="141766484" class="Cue">
         <attr name="name" type="string" value="freeze, scene is RC and C" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-2" />
@@ -61,7 +61,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .8, front_c : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140863828" class="Cue">
+      <item type="PyObject" id="140861292" class="Cue">
         <attr name="name" type="string" value="unfreeze" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-3" />
@@ -69,7 +69,7 @@
         <attr name="sub_levels" type="string" value="1-1 : 1" />
         <attr name="desc" type="string" value="&quot;mrs levi!&quot;" />
       </item>
-      <item type="PyObject" id="140864796" class="Cue">
+      <item type="PyObject" id="140862260" class="Cue">
         <attr name="name" type="string" value="freeze, scene RC" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-4" />
@@ -77,7 +77,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .8, front_rc : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="141769532" class="Cue">
+      <item type="PyObject" id="139855580" class="Cue">
         <attr name="name" type="string" value="dolly at stairs" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="1-1-4" />
@@ -85,7 +85,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .2,  dolly_stairs_right : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="139852828" class="Cue">
+      <item type="PyObject" id="139852148" class="Cue">
         <attr name="name" type="string" value="dolly walks to her R runway corner" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="1-1-4" />
@@ -93,7 +93,7 @@
         <attr name="sub_levels" type="string" value="1-1 : .2, dolly_runway_right : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140879348" class="Cue">
+      <item type="PyObject" id="141766980" class="Cue">
         <attr name="name" type="string" value="unfreeze" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-5" />
@@ -101,7 +101,7 @@
         <attr name="sub_levels" type="string" value="1-1 : 1" />
         <attr name="desc" type="string" value="&quot;i&apos;m waiting for that sign&quot;" />
       </item>
-      <item type="PyObject" id="140879388" class="Cue">
+      <item type="PyObject" id="140877028" class="Cue">
         <attr name="name" type="string" value="stage clears, band walks runway" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-1-5" />
@@ -109,7 +109,7 @@
         <attr name="sub_levels" type="string" value="worklights : 1, runway : .45" />
         <attr name="desc" type="string" value="set change" />
       </item>
-      <item type="PyObject" id="140854084" class="Cue">
+      <item type="PyObject" id="140876300" class="Cue">
         <attr name="name" type="string" value="scene opens outside store L" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-2-6" />
@@ -117,7 +117,7 @@
         <attr name="sub_levels" type="string" value="1-2_outside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="139844268" class="Cue">
+      <item type="PyObject" id="140874516" class="Cue">
         <attr name="name" type="string" value="enters store" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-2-6" />
@@ -125,7 +125,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, trap :0.2, upstairs : 0.2" />
         <attr name="desc" type="string" value="&quot;i can&apos;t help it...&quot;" />
       </item>
-      <item type="PyObject" id="140877308" class="Cue">
+      <item type="PyObject" id="141766684" class="Cue">
         <attr name="name" type="string" value="trapdoor area" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="1-2-7" />
@@ -133,7 +133,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 0.5, trap : 1, upstairs : 0.2" />
         <attr name="desc" type="string" value="walking to trap, &quot;cornelius!&quot;" />
       </item>
-      <item type="PyObject" id="140863524" class="Cue">
+      <item type="PyObject" id="140877108" class="Cue">
         <attr name="name" type="string" value="monologue and &quot;it takes a woman&apos;" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="16" />
@@ -141,7 +141,7 @@
         <attr name="sub_levels" type="string" value="1-2_song_downstairs : 1, upstairs : 0.2, 1-2 : 0.6, trap :0.2" />
         <attr name="desc" type="string" value="sheep something" />
       </item>
-      <item type="PyObject" id="140854820" class="Cue">
+      <item type="PyObject" id="140876916" class="Cue">
         <attr name="name" type="string" value="&quot;restore&quot; after song finishes" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="17" />
@@ -149,7 +149,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, upstairs : 0.2, trap :0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140865540" class="Cue">
+      <item type="PyObject" id="141771332" class="Cue">
         <attr name="name" type="string" value="dolly alone" />
         <attr name="time" type="string" value="1" />
         <attr name="cuenum" type="string" value="18" />
@@ -157,7 +157,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, upstairs : 0.2, trap : 0.2" />
         <attr name="desc" type="string" value="dolly sings takes a woman (no-op)" />
       </item>
-      <item type="PyObject" id="140866060" class="Cue">
+      <item type="PyObject" id="140875740" class="Cue">
         <attr name="name" type="string" value="dolly upstairs" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="19" />
@@ -165,7 +165,7 @@
         <attr name="sub_levels" type="string" value="upstairs : .9,  1-2 : 0.5, trap : 0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140856580" class="Cue">
+      <item type="PyObject" id="141776244" class="Cue">
         <attr name="name" type="string" value="cross to trapdoor" />
         <attr name="time" type="string" value="1" />
         <attr name="cuenum" type="string" value="20" />
@@ -173,7 +173,7 @@
         <attr name="sub_levels" type="string" value="upstairs : 0.2,  1-2 : 0.5, trap : 1, 1-2_register : 0.7" />
         <attr name="desc" type="string" value="plans to make (?)" />
       </item>
-      <item type="PyObject" id="140873844" class="Cue">
+      <item type="PyObject" id="140875252" class="Cue">
         <attr name="name" type="string" value="cross to upstairs" />
         <attr name="time" type="string" value="1" />
         <attr name="cuenum" type="string" value="21" />
@@ -181,7 +181,7 @@
         <attr name="sub_levels" type="string" value="upstairs : .9,  1-2 : 0.5, trap : 0.2" />
         <attr name="desc" type="string" value="&quot;yes, corn, yes!&quot;" />
       </item>
-      <item type="PyObject" id="140878092" class="Cue">
+      <item type="PyObject" id="140852300" class="Cue">
         <attr name="name" type="string" value="cross to trapdoor and register area" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="22" />
@@ -189,7 +189,7 @@
         <attr name="sub_levels" type="string" value="upstairs : 0.2,  1-2 :0.5 ,trap : 1, 1-2_register : 1" />
         <attr name="desc" type="string" value="chicken at 8" />
       </item>
-      <item type="PyObject" id="140874188" class="Cue">
+      <item type="PyObject" id="139853588" class="Cue">
         <attr name="name" type="string" value="cross to upstairs" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="23" />
@@ -197,7 +197,7 @@
         <attr name="sub_levels" type="string" value="upstairs : 1.0,  1-2 :.5, trap : 0.2" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="140865260" class="Cue">
+      <item type="PyObject" id="140852460" class="Cue">
         <attr name="name" type="string" value="whole scene" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="24" />
@@ -205,7 +205,7 @@
         <attr name="sub_levels" type="string" value="upstairs : 1.0,  1-2 : 1, trap : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140875948" class="Cue">
+      <item type="PyObject" id="140872332" class="Cue">
         <attr name="name" type="string" value="follow the guys" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="25" />
@@ -213,7 +213,7 @@
         <attr name="sub_levels" type="string" value="runway : .6, 1-2 : 0.5" />
         <attr name="desc" type="string" value="set breaks apart as they sing" />
       </item>
-      <item type="PyObject" id="140879644" class="Cue">
+      <item type="PyObject" id="140875004" class="Cue">
         <attr name="name" type="string" value="chorus fills DL then whole stage" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="26" />
@@ -221,7 +221,7 @@
         <attr name="sub_levels" type="string" value="allstage : .9, sky : .75" />
         <attr name="desc" type="string" value="sunday clothes outside" />
       </item>
-      <item type="PyObject" id="140857204" class="Cue">
+      <item type="PyObject" id="140855812" class="Cue">
         <attr name="name" type="string" value="fadeout" />
         <attr name="time" type="string" value="2" />
         <attr name="cuenum" type="string" value="27" />
@@ -229,7 +229,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="140858468" class="Cue">
+      <item type="PyObject" id="140858244" class="Cue">
         <attr name="name" type="string" value="blueout to worklights" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="1-2-18" />
@@ -237,7 +237,7 @@
         <attr name="sub_levels" type="string" value="worklights : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140875068" class="Cue">
+      <item type="PyObject" id="140857244" class="Cue">
         <attr name="name" type="string" value="outside hatshop, DL" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-19" />
@@ -245,7 +245,7 @@
         <attr name="sub_levels" type="string" value="1-3_outside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140858708" class="Cue">
+      <item type="PyObject" id="140860404" class="Cue">
         <attr name="name" type="string" value="inside and outside" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="1-3-19" />
@@ -253,7 +253,7 @@
         <attr name="sub_levels" type="string" value="1-3_inside : 1, 1-3_outside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140875364" class="Cue">
+      <item type="PyObject" id="140855652" class="Cue">
         <attr name="name" type="string" value="enter hatshop" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-20" />
@@ -261,7 +261,7 @@
         <attr name="sub_levels" type="string" value="1-3_inside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140856340" class="Cue">
+      <item type="PyObject" id="140875388" class="Cue">
         <attr name="name" type="string" value="SPOT alone for song, walks R then LC" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-21" />
@@ -269,7 +269,7 @@
         <attr name="sub_levels" type="string" value="nsi_cue_1 : .3" />
         <attr name="desc" type="string" value="ribbons" />
       </item>
-      <item type="PyObject" id="140873292" class="Cue">
+      <item type="PyObject" id="140866868" class="Cue">
         <attr name="name" type="string" value="SPOT OFF return to scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-22" />
@@ -277,7 +277,7 @@
         <attr name="sub_levels" type="string" value="1-3_inside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140867356" class="Cue">
+      <item type="PyObject" id="140858140" class="Cue">
         <attr name="name" type="string" value="song again" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-23" />
@@ -285,7 +285,7 @@
         <attr name="sub_levels" type="string" value="nsi_cue_1 : 1" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="140863420" class="Cue">
+      <item type="PyObject" id="140857100" class="Cue">
         <attr name="name" type="string" value="return to scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-23" />
@@ -293,7 +293,7 @@
         <attr name="sub_levels" type="string" value="1-3_inside : 1" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="140860724" class="Cue">
+      <item type="PyObject" id="140865676" class="Cue">
         <attr name="name" type="string" value="actors are DL to runway" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="1-3-36" />
@@ -301,7 +301,7 @@
         <attr name="sub_levels" type="string" value="runway_stairs : .5, worklights : 1" />
         <attr name="desc" type="string" value="set breaks apart" />
       </item>
-      <item type="PyObject" id="140869052" class="Cue">
+      <item type="PyObject" id="140860644" class="Cue">
         <attr name="name" type="string" value="stage fills with dancers" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-36" />
@@ -309,7 +309,7 @@
         <attr name="sub_levels" type="string" value="1-3-36_dance : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140868804" class="Cue">
+      <item type="PyObject" id="140857972" class="Cue">
         <attr name="name" type="string" value="front center mini" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-36" />
@@ -317,7 +317,7 @@
         <attr name="sub_levels" type="string" value="1-3-36_dance : 0.5, front_lc : 0.5" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140859516" class="Cue">
+      <item type="PyObject" id="140860900" class="Cue">
         <attr name="name" type="string" value="dolly alone in L runway corner stairs" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-37" />
@@ -325,7 +325,7 @@
         <attr name="sub_levels" type="string" value="runway_stairs_left: 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="141770564" class="Cue">
+      <item type="PyObject" id="139850732" class="Cue">
         <attr name="name" type="string" value="dolly alone in L runway corner" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-37" />
@@ -333,7 +333,7 @@
         <attr name="sub_levels" type="string" value="dolly_runway_left : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="139853188" class="Cue">
+      <item type="PyObject" id="140868692" class="Cue">
         <attr name="name" type="string" value="dance?" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="1-3-38" />
@@ -341,7 +341,7 @@
         <attr name="sub_levels" type="string" value="1-3-36_dance : 1, front_lc : .5" />
         <attr name="desc" type="string" value="guys enter from UL" />
       </item>
-      <item type="PyObject" id="140873124" class="Cue">
+      <item type="PyObject" id="140853756" class="Cue">
         <attr name="name" type="string" value="SPOT" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-38" />
@@ -349,7 +349,7 @@
         <attr name="sub_levels" type="string" value="1-3-36_dance : 0.4, sky : 0.4, runway : 0.16" />
         <attr name="desc" type="string" value="dolly alone" />
       </item>
-      <item type="PyObject" id="140857636" class="Cue">
+      <item type="PyObject" id="140866532" class="Cue">
         <attr name="name" type="string" value="crowd arrives" />
         <attr name="time" type="string" value="7" />
         <attr name="page" type="string" value="1-3-38" />
@@ -357,7 +357,7 @@
         <attr name="sub_levels" type="string" value="nsi_cue_2 : 1, patio : .5, runway: 0.6" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140861580" class="Cue">
+      <item type="PyObject" id="140871380" class="Cue">
         <attr name="name" type="string" value="add patio" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-39" />
@@ -365,7 +365,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="140861332" class="Cue">
+      <item type="PyObject" id="140871308" class="Cue">
         <attr name="name" type="string" value="center scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-39" />
@@ -373,7 +373,7 @@
         <attr name="sub_levels" type="string" value="nsi_cue_2 : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140857060" class="Cue">
+      <item type="PyObject" id="140864404" class="Cue">
         <attr name="name" type="string" value="dolly DC alone SPOT" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="1-3-40" />
@@ -381,7 +381,7 @@
         <attr name="sub_levels" type="string" value="1-3-36_dance : 0.4, sky : 0.4, runway : 0.16\n" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140866244" class="Cue">
+      <item type="PyObject" id="142424108" class="Cue">
         <attr name="name" type="string" value="fadeout" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="44" />
@@ -389,7 +389,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140871372" class="Cue">
+      <item type="PyObject" id="140863780" class="Cue">
         <attr name="name" type="string" value="warmers" />
         <attr name="time" type="string" value="5" />
         <attr name="cuenum" type="string" value="45" />
@@ -397,7 +397,7 @@
         <attr name="sub_levels" type="string" value="curtain_warmers : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140861860" class="Cue">
+      <item type="PyObject" id="142423524" class="Cue">
         <attr name="name" type="string" value="warmers out" />
         <attr name="time" type="string" value="10" />
         <attr name="cuenum" type="string" value="45.5" />
@@ -405,7 +405,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140871732" class="Cue">
+      <item type="PyObject" id="140860764" class="Cue">
         <attr name="name" type="string" value="&quot;night&quot; scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-1" />
@@ -413,7 +413,7 @@
         <attr name="sub_levels" type="string" value="2-1_outside : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140871652" class="Cue">
+      <item type="PyObject" id="140872020" class="Cue">
         <attr name="name" type="string" value="lights change scene to later at night" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-3" />
@@ -421,7 +421,7 @@
         <attr name="sub_levels" type="string" value="2-1_darker : .8" />
         <attr name="desc" type="string" value="after song" />
       </item>
-      <item type="PyObject" id="140872460" class="Cue">
+      <item type="PyObject" id="140868556" class="Cue">
         <attr name="name" type="string" value="mini scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-4" />
@@ -429,7 +429,7 @@
         <attr name="sub_levels" type="string" value="2-1_darker : .8" />
         <attr name="desc" type="string" value="no change" />
       </item>
-      <item type="PyObject" id="142422468" class="Cue">
+      <item type="PyObject" id="142425500" class="Cue">
         <attr name="name" type="string" value="another mini scene" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-4" />
@@ -437,7 +437,7 @@
         <attr name="sub_levels" type="string" value="2-1_darker : .8" />
         <attr name="desc" type="string" value="no change" />
       </item>
-      <item type="PyObject" id="142422628" class="Cue">
+      <item type="PyObject" id="140866780" class="Cue">
         <attr name="name" type="string" value="fadeout" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-4" />
@@ -445,7 +445,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="142426948" class="Cue">
+      <item type="PyObject" id="142426652" class="Cue">
         <attr name="name" type="string" value="worklights" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-1-4" />
@@ -453,7 +453,7 @@
         <attr name="sub_levels" type="string" value="worklights : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140873212" class="Cue">
+      <item type="PyObject" id="142425204" class="Cue">
         <attr name="name" type="string" value="lewis at top of stairs" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="2-2-5" />
@@ -461,7 +461,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="harmonia gardens" />
       </item>
-      <item type="PyObject" id="142423708" class="Cue">
+      <item type="PyObject" id="142425540" class="Cue">
         <attr name="name" type="string" value="left table" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="2-2-5" />
@@ -469,7 +469,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 0.5, 2-2_l_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140872132" class="Cue">
+      <item type="PyObject" id="142428996" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="2-2-6" />
@@ -477,7 +477,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142427188" class="Cue">
+      <item type="PyObject" id="142428004" class="Cue">
         <attr name="name" type="string" value="right table" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-2-6" />
@@ -485,7 +485,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_r_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142428420" class="Cue">
+      <item type="PyObject" id="142428556" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-2-7" />
@@ -493,7 +493,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142429228" class="Cue">
+      <item type="PyObject" id="142427220" class="Cue">
         <attr name="name" type="string" value="left table" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="57" />
@@ -501,7 +501,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_l_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142429748" class="Cue">
+      <item type="PyObject" id="140866020" class="Cue">
         <attr name="name" type="string" value="all, when curtain closes" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="58" />
@@ -509,7 +509,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142426156" class="Cue">
+      <item type="PyObject" id="142429580" class="Cue">
         <attr name="name" type="string" value="right table, curtain opens" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="59" />
@@ -517,7 +517,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_r_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142427852" class="Cue">
+      <item type="PyObject" id="142428692" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="60" />
@@ -525,7 +525,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140871996" class="Cue">
+      <item type="PyObject" id="142427300" class="Cue">
         <attr name="name" type="string" value="right table and stairs, for mo+lewis" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="61" />
@@ -533,7 +533,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_r_table : 1" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="142429932" class="Cue">
+      <item type="PyObject" id="142433436" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="62" />
@@ -541,7 +541,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="142429500" class="Cue">
+      <item type="PyObject" id="140867348" class="Cue">
         <attr name="name" type="string" value="left table (&quot;champagne&quot;)" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="63" />
@@ -549,7 +549,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_l_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142431988" class="Cue">
+      <item type="PyObject" id="142433676" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="64" />
@@ -557,7 +557,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142428700" class="Cue">
+      <item type="PyObject" id="142434276" class="Cue">
         <attr name="name" type="string" value="right table (&quot;let&apos;s dance&quot;)" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="65" />
@@ -565,7 +565,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .5, 2-2_r_table : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142433428" class="Cue">
+      <item type="PyObject" id="142434708" class="Cue">
         <attr name="name" type="string" value="all" />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="66" />
@@ -573,7 +573,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140875308" class="Cue">
+      <item type="PyObject" id="142430524" class="Cue">
         <attr name="name" type="string" value="waiters talk about dolly at the base of stairs" />
         <attr name="time" type="string" value="4" />
         <attr name="cuenum" type="string" value="67" />
@@ -581,7 +581,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .9, bottom_of_stairs : 0.6" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142435044" class="Cue">
+      <item type="PyObject" id="142436340" class="Cue">
         <attr name="name" type="string" value="dimmer.." />
         <attr name="time" type="string" value="3" />
         <attr name="cuenum" type="string" value="68" />
@@ -589,7 +589,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : .8, bottom_of_stairs : 0.5" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142428020" class="Cue">
+      <item type="PyObject" id="142432924" class="Cue">
         <attr name="name" type="string" value="dolly arrives and walks down stairs" />
         <attr name="time" type="string" value="5" />
         <attr name="cuenum" type="string" value="69" />
@@ -597,7 +597,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 0.9, garden_stairs : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142436844" class="Cue">
+      <item type="PyObject" id="142436732" class="Cue">
         <attr name="name" type="string" value="&quot;down center&quot; dolly&apos;s scene" />
         <attr name="time" type="string" value="8" />
         <attr name="cuenum" type="string" value="70" />
@@ -605,7 +605,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1, front_c : 0.6" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142430860" class="Cue">
+      <item type="PyObject" id="142430604" class="Cue">
         <attr name="name" type="string" value="&quot;dim&quot; for polka dance" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-2-18" />
@@ -613,7 +613,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 0.7, front_rc : .7" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142437348" class="Cue">
+      <item type="PyObject" id="142429444" class="Cue">
         <attr name="name" type="string" value="&quot;light stairs&quot;" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-2-18" />
@@ -621,7 +621,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 0.8, garden_stairs : 0.5, bottom_of_stairs : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142438340" class="Cue">
+      <item type="PyObject" id="142435644" class="Cue">
         <attr name="name" type="string" value="&quot;bright&quot; during chase" />
         <attr name="time" type="string" value="1.5" />
         <attr name="page" type="string" value="2-2-19" />
@@ -629,7 +629,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1, garden_stairs : 0.5, bottom_of_stairs : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142431156" class="Cue">
+      <item type="PyObject" id="142436836" class="Cue">
         <attr name="name" type="string" value="blueout right after freeze" />
         <attr name="time" type="string" value="0" />
         <attr name="page" type="string" value="2-2-19" />
@@ -637,7 +637,7 @@
         <attr name="sub_levels" type="string" value="worklights : 1.0" />
         <attr name="desc" type="string" value="&quot;gasp!&quot;" />
       </item>
-      <item type="PyObject" id="142440156" class="Cue">
+      <item type="PyObject" id="142439444" class="Cue">
         <attr name="name" type="string" value="&quot;cold&quot; courtroom" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="2-3-20" />
@@ -645,7 +645,7 @@
         <attr name="sub_levels" type="string" value="2-3_cold : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142438036" class="Cue">
+      <item type="PyObject" id="142440884" class="Cue">
         <attr name="name" type="string" value="room warms up" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="2-3-22" />
@@ -653,7 +653,7 @@
         <attr name="sub_levels" type="string" value="2-3_brighter : .7" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142423220" class="Cue">
+      <item type="PyObject" id="142443300" class="Cue">
         <attr name="name" type="string" value="SPOT on cornelius song" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-3-22" />
@@ -661,7 +661,7 @@
         <attr name="sub_levels" type="string" value="2-3_brighter : .7" />
         <attr name="desc" type="string" value="only takes a  moment (no-op)" />
       </item>
-      <item type="PyObject" id="142433964" class="Cue">
+      <item type="PyObject" id="142443060" class="Cue">
         <attr name="name" type="string" value="SPOT OUT room is cold again" />
         <attr name="time" type="string" value="6.5" />
         <attr name="page" type="string" value="2-3-23" />
@@ -669,7 +669,7 @@
         <attr name="sub_levels" type="string" value="2-3_cold : 1" />
         <attr name="desc" type="string" value="end of song" />
       </item>
-      <item type="PyObject" id="142439732" class="Cue">
+      <item type="PyObject" id="142437620" class="Cue">
         <attr name="name" type="string" value="fadeout" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-3-25" />
@@ -677,7 +677,7 @@
         <attr name="sub_levels" type="string" value="" />
         <attr name="desc" type="string" value="DELETED" />
       </item>
-      <item type="PyObject" id="142439020" class="Cue">
+      <item type="PyObject" id="140860260" class="Cue">
         <attr name="name" type="string" value="blueout to worklights" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="2-3-25" />
@@ -685,7 +685,7 @@
         <attr name="sub_levels" type="string" value="worklights : 1" />
         <attr name="desc" type="string" value="end of scene" />
       </item>
-      <item type="PyObject" id="142443532" class="Cue">
+      <item type="PyObject" id="142441524" class="Cue">
         <attr name="name" type="string" value="store" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-26" />
@@ -693,7 +693,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, trap : 0.2, upstairs : 0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142439508" class="Cue">
+      <item type="PyObject" id="140856772" class="Cue">
         <attr name="name" type="string" value="trapdoor up" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-26" />
@@ -701,7 +701,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, trap : 1.0, upstairs : 0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142432212" class="Cue">
+      <item type="PyObject" id="142443788" class="Cue">
         <attr name="name" type="string" value="trapdoor down" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-26" />
@@ -709,7 +709,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, trap : 0.4, upstairs : 0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142439812" class="Cue">
+      <item type="PyObject" id="142443708" class="Cue">
         <attr name="name" type="string" value="dolly alone at top of R stairs" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-28" />
@@ -717,7 +717,7 @@
         <attr name="sub_levels" type="string" value="2-4_money : 1, 1-2 : 0.35, upstairs : 0.2, 1-2_register : .8" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142439852" class="Cue">
+      <item type="PyObject" id="142445180" class="Cue">
         <attr name="name" type="string" value="restore to store" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-28" />
@@ -725,7 +725,7 @@
         <attr name="sub_levels" type="string" value="1-2 : 1, trap : 0.2, upstairs : 0.2" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="140869740" class="Cue">
+      <item type="PyObject" id="142442004" class="Cue">
         <attr name="name" type="string" value="fade to front" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-30" />
@@ -733,7 +733,7 @@
         <attr name="sub_levels" type="string" value="front_of_stage : 1, 1-2: .5" />
         <attr name="desc" type="string" value="before set breaks" />
       </item>
-      <item type="PyObject" id="142423980" class="Cue">
+      <item type="PyObject" id="142442428" class="Cue">
         <attr name="name" type="string" value="crowd arrives" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-30" />
@@ -741,7 +741,7 @@
         <attr name="sub_levels" type="string" value="2-2_all : 1, front_of_stage : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142448428" class="Cue">
+      <item type="PyObject" id="142450284" class="Cue">
         <attr name="name" type="string" value="flat splits" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-31" />
@@ -749,7 +749,7 @@
         <attr name="sub_levels" type="string" value="finale : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142450492" class="Cue">
+      <item type="PyObject" id="142449500" class="Cue">
         <attr name="name" type="string" value="dolly enters" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-31" />
@@ -757,7 +757,7 @@
         <attr name="sub_levels" type="string" value="finale_with_dolly : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142448948" class="Cue">
+      <item type="PyObject" id="142450044" class="Cue">
         <attr name="name" type="string" value="curtains close" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-31+" />
@@ -765,7 +765,7 @@
         <attr name="sub_levels" type="string" value="curtain_warmers : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142449876" class="Cue">
+      <item type="PyObject" id="142444764" class="Cue">
         <attr name="name" type="string" value="curtains reopen" />
         <attr name="time" type="string" value="2" />
         <attr name="page" type="string" value="2-4-31+" />
@@ -773,7 +773,7 @@
         <attr name="sub_levels" type="string" value="finale_with_dolly : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142447604" class="Cue">
+      <item type="PyObject" id="140870724" class="Cue">
         <attr name="name" type="string" value="curtains close again" />
         <attr name="time" type="string" value="3" />
         <attr name="page" type="string" value="2-4-31+" />
@@ -781,7 +781,7 @@
         <attr name="sub_levels" type="string" value="curtain_warmers : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142448708" class="Cue">
+      <item type="PyObject" id="142452596" class="Cue">
         <attr name="name" type="string" value="house comes up" />
         <attr name="time" type="string" value="4" />
         <attr name="page" type="string" value="2-4-31+" />
@@ -789,7 +789,7 @@
         <attr name="sub_levels" type="string" value="curtain_warmers: 1, house : 1" />
         <attr name="desc" type="string" value="" />
       </item>
-      <item type="PyObject" id="142451692" class="Cue">
+      <item type="PyObject" id="142443580" class="Cue">
         <attr name="name" type="string" value="emergency blackout" />
         <attr name="time" type="string" value="0" />
         <attr name="page" type="string" value="--" />