stage_director

@@ -7,7 +7,7 @@ import time_fmt

 class Playlist:

   def __init__(self):

     self.entries = []

-    self.reEntry = re.compile('^\s*([A-Za-z0-9_]+)\s+([0-9:.]+)\s*$')

+    self.reEntry = re.compile("^\s*([A-Za-z0-9_]+)\s+([0-9:.]+)\s*$")

   def read(self, filename):

     self.entries = []

@@ -17,13 +17,24 @@ class Playlist:

       if mEntry:

         name = mEntry.group(1)

         duration = time_fmt.str2sec(mEntry.group(2))

-        self.entries.append({'type':     'normal',

-                             'name':     name,

-                             'duration': duration})

-        print("entry normal %s %f" % (self.entries[-1]['name'],

-                                      self.entries[-1]['duration']))

+        self.entries.append({"type":     "normal",

+                             "name":     name,

+                             "duration": duration})

+        print("entry normal %s %f" % (self.entries[-1]["name"],

+                                      self.entries[-1]["duration"]))

       else:

-        self.entries.append({'type': 'stop'})

+        self.entries.append({"type": "stop"})

         print("entry stop")

     f.close()

+  def update(self, store):

+    store.clear()

+    for entry in self.entries:

+      if entry["type"] == "normal":

+        name = entry["name"]

+        duration = time_fmt.sec2str(entry["duration"])

+      else:

+        name = ""

+        duration = "STOP"

+      store.append([name, duration])

+

@@ -1,6 +1,28 @@

 <?xml version="1.0" encoding="UTF-8"?>

 <interface>

   <!-- interface-requires gtk+ 3.0 -->

+  <object class="GtkListStore" id="PlaylistStore">

+    <columns>

+      <!-- column-name Name -->

+      <column type="gchararray"/>

+      <!-- column-name Dauer -->

+      <column type="gchararray"/>

+    </columns>

+    <data>

+      <row>

+        <col id="0" translatable="yes">Erster Akt</col>

+        <col id="1" translatable="yes"/>

+      </row>

+      <row>

+        <col id="0" translatable="yes">Zweiter Akt</col>

+        <col id="1" translatable="yes"/>

+      </row>

+      <row>

+        <col id="0" translatable="yes">Weltuntergang</col>

+        <col id="1" translatable="yes"/>

+      </row>

+    </data>

+  </object>

   <object class="GtkWindow" id="MainWindow">

     <property name="visible">True</property>

     <property name="can_focus">False</property>

@@ -13,8 +35,8 @@

         <property name="orientation">vertical</property>

         <child>

           <object class="GtkScrolledWindow" id="PlaylistScroll">

-            <property name="width_request">100</property>

-            <property name="height_request">100</property>

+            <property name="width_request">320</property>

+            <property name="height_request">240</property>

             <property name="visible">True</property>

             <property name="can_focus">True</property>

             <property name="border_width">3</property>

@@ -23,7 +45,7 @@

               <object class="GtkTreeView" id="PlaylistView">

                 <property name="visible">True</property>

                 <property name="can_focus">True</property>

-                <property name="model">Playlist</property>

+                <property name="model">PlaylistStore</property>

                 <child internal-child="selection">

                   <object class="GtkTreeSelection" id="treeview-selection2"/>

                 </child>

@@ -279,28 +301,6 @@

       </object>

     </child>

   </object>

-  <object class="GtkListStore" id="Playlist">

-    <columns>

-      <!-- column-name Name -->

-      <column type="gchararray"/>

-      <!-- column-name Dauer -->

-      <column type="gfloat"/>

-    </columns>

-    <data>

-      <row>

-        <col id="0" translatable="yes">Erster Akt</col>

-        <col id="1">1</col>

-      </row>

-      <row>

-        <col id="0" translatable="yes">Zweiter Akt</col>

-        <col id="1">2</col>

-      </row>

-      <row>

-        <col id="0" translatable="yes">Weltuntergang</col>

-        <col id="1">99</col>

-      </row>

-    </data>

-  </object>

   <object class="GtkAdjustment" id="Position">

     <property name="upper">100</property>

     <property name="value">50</property>

@@ -12,6 +12,8 @@ class SyncGui:

   def __init__(self):

     self.builder = Gtk.Builder()

     self.builder.add_from_file(scriptdir + "/sync_gui.glade")

+    self.playlistView = self.builder.get_object("PlaylistView")

+    self.playlistStore = self.builder.get_object("PlaylistStore")

     self.position = self.builder.get_object("Position")

     self.positionScale = self.builder.get_object("PositionScale")

     self.positionAt = self.builder.get_object("PositionAt")

@@ -19,6 +21,7 @@ class SyncGui:

     self.btnPause = self.builder.get_object("Pause")

     self.btnPlay = self.builder.get_object("Play")

     self.status = self.builder.get_object("Status")

+    self.configPlaylistColumns()

     handlers = {

       "onDestroy":     self.onDestroy,

       "onNewPosition": self.onNewPosition,

@@ -33,9 +36,20 @@ class SyncGui:

     self.builder.connect_signals(handlers)

     self.playlist = playlist.Playlist()

     self.playlist.read("playlist.txt")

+    self.playlist.update(self.playlistStore)

     self.status.push(0, "TODO...")

     self.showCurrentPosition()

+  def configPlaylistColumns(self):

+    i = 0

+    for title in ["Name", "Dauer"]:

+      column = Gtk.TreeViewColumn(title)

+      self.playlistView.append_column(column)

+      cell = Gtk.CellRendererText()

+      column.pack_start(cell, False)

+      column.add_attribute(cell, "text", i)

+      i = i + 1

+

   def showPosition(self, sec):

     if sec < 0:

       sec = 0