# HG changeset patch
# User dmcc
# Date 2003-07-07 07:07:22
# Node ID 7d3a0f9107a8a55886ffcc6e208368b6fdccfdd0
# Parent  224505b0c21e52bb75fe658ceaca3110d35433e5

try to resolve version conflict problems

diff --git a/flax/CueFaders.py b/flax/CueFaders.py
--- a/flax/CueFaders.py
+++ b/flax/CueFaders.py
@@ -213,11 +213,9 @@ class CueList:
                      cur, 
                      self.next_pointer or cur + 1)]
     def get_current_cues(self):
-        # print "get_current_cue_indices", self.get_current_cue_indices()
         return [self.get_cue_by_index(index) 
             for index in self.get_current_cue_indices()]
     def get_cue_by_index(self, index):
-        # print "get_cue_by_index", index
         if index:
             return self.cues[self.bound_index(index)]
         else:
@@ -228,19 +226,14 @@ class CueList:
         self.treedict.save(self.filename)
 
 if __name__ == "__main__":
-    if 0:
-        z = CueList('cues/cuelist1')
-        z.add_cue(Cue('cue %s' % time.asctime(), time=2, a=7, b=8))
-        print 'cues', z.cues
-    else:
-        cl = CueList('cues/cuelist1')
+    cl = CueList('cues/cuelist1')
 
-        # to populate cue list
-        if 0:
-            for x in range(20):
-                cl.add_cue(Cue('cue %d' % x, time=x, some_attribute=3))
+    # to populate cue list
+    if 0:
+        for x in range(20):
+            cl.add_cue(Cue('cue %d' % x, time=x, some_attribute=3))
 
-        root = Tk.Tk()
-        fader = CueFader(root, cl)
-        fader.pack(fill='both', expand=1)
-        Tk.mainloop()
+    root = Tk.Tk()
+    fader = CueFader(root, cl)
+    fader.pack(fill='both', expand=1)
+    Tk.mainloop()
diff --git a/flax/cues/cuelist1 b/flax/cues/cuelist1
--- a/flax/cues/cuelist1
+++ b/flax/cues/cuelist1
@@ -1,106 +1,106 @@
 <?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="136600876" >
+<attr name="__toplevel__" family="map" type="__compound__" extra="None TreeDict" id="135916956" >
   <entry>
     <key type="string" value="cues" />
-    <val type="list" id="138285116" >
-      <item type="PyObject" id="138619532" class="Cue">
+    <val type="list" id="138285508" >
+      <item type="PyObject" id="138620316" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 0" />
         <attr name="time" type="numeric" value="0" />
       </item>
-      <item type="PyObject" id="138231364" class="Cue">
+      <item type="PyObject" id="138232236" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 1" />
         <attr name="time" type="numeric" value="1" />
       </item>
-      <item type="PyObject" id="138597492" class="Cue">
+      <item type="PyObject" id="138598276" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 2" />
         <attr name="time" type="numeric" value="2" />
       </item>
-      <item type="PyObject" id="138228508" class="Cue">
+      <item type="PyObject" id="138229380" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 3" />
         <attr name="time" type="numeric" value="3" />
       </item>
-      <item type="PyObject" id="138308908" class="Cue">
+      <item type="PyObject" id="138309300" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 4" />
         <attr name="time" type="numeric" value="4" />
       </item>
-      <item type="PyObject" id="138228692" class="Cue">
+      <item type="PyObject" id="138229564" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 5" />
         <attr name="time" type="numeric" value="5" />
       </item>
-      <item type="PyObject" id="138295972" class="Cue">
+      <item type="PyObject" id="138296364" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 6" />
         <attr name="time" type="numeric" value="6" />
       </item>
-      <item type="PyObject" id="138255924" class="Cue">
+      <item type="PyObject" id="138256796" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 7" />
         <attr name="time" type="numeric" value="7" />
       </item>
-      <item type="PyObject" id="136392732" class="Cue">
+      <item type="PyObject" id="136370908" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 8" />
         <attr name="time" type="numeric" value="8" />
       </item>
-      <item type="PyObject" id="136982068" class="Cue">
+      <item type="PyObject" id="136982724" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 9" />
         <attr name="time" type="numeric" value="9" />
       </item>
-      <item type="PyObject" id="138256044" class="Cue">
+      <item type="PyObject" id="138256916" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 10" />
         <attr name="time" type="numeric" value="10" />
       </item>
-      <item type="PyObject" id="138232364" class="Cue">
+      <item type="PyObject" id="138233236" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 11" />
         <attr name="time" type="numeric" value="11" />
       </item>
-      <item type="PyObject" id="138232548" class="Cue">
+      <item type="PyObject" id="138233420" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 12" />
         <attr name="time" type="numeric" value="12" />
       </item>
-      <item type="PyObject" id="138232788" class="Cue">
+      <item type="PyObject" id="138233660" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 13" />
         <attr name="time" type="numeric" value="13" />
       </item>
-      <item type="PyObject" id="138296188" class="Cue">
+      <item type="PyObject" id="138296580" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 14" />
         <attr name="time" type="numeric" value="14" />
       </item>
-      <item type="PyObject" id="136857940" class="Cue">
+      <item type="PyObject" id="136859228" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 15" />
         <attr name="time" type="numeric" value="15" />
       </item>
-      <item type="PyObject" id="138232828" class="Cue">
+      <item type="PyObject" id="138233700" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 16" />
         <attr name="time" type="numeric" value="16" />
       </item>
-      <item type="PyObject" id="138232868" class="Cue">
+      <item type="PyObject" id="138233740" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 17" />
         <attr name="time" type="numeric" value="17" />
       </item>
-      <item type="PyObject" id="138608260" class="Cue">
+      <item type="PyObject" id="138609044" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 18" />
         <attr name="time" type="numeric" value="18" />
       </item>
-      <item type="PyObject" id="138229964" class="Cue">
+      <item type="PyObject" id="138230836" class="Cue">
         <attr name="some_attribute" type="numeric" value="3" />
         <attr name="name" type="string" value="cue 19" />
         <attr name="time" type="numeric" value="19" />