stage_director

@@ -1,6 +1,7 @@

 #! /usr/bin/env python

 import re

+import pango

 import time_fmt

@@ -40,11 +41,11 @@ class Playlist:

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

                              "name":     name,

                              "duration": duration})

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

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

+        #print("DEBUG playlist entry normal %s %f" %

+        #      (self.entries[-1]["name"], self.entries[-1]["duration"]))

       else:

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

-        print("entry stop")

+        #print("DEBUG playlist entry stop")

     f.close()

   def update(self, store):

@@ -59,6 +60,6 @@ class Playlist:

       else:

         name = ""

         duration = "STOP"

-      store.append([idx, name, duration])

+      store.append([idx, pango.WEIGHT_NORMAL, name, duration])

       idx = idx + 1

@@ -24,10 +24,35 @@

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

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

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

-                <signal name="cursor-changed" handler="onPlaylistClick" swapped="no"/>

                 <signal name="row-activated" handler="onPlaylistDblClick" swapped="no"/>

                 <child internal-child="selection">

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

+                  <object class="GtkTreeSelection" id="PlaylistViewSelection"/>

+                </child>

+                <child>

+                  <object class="GtkTreeViewColumn" id="PlaylistColumnName">

+                    <property name="title" translatable="yes">Name</property>

+                    <property name="sort_order">descending</property>

+                    <child>

+                      <object class="GtkCellRendererText" id="PlaylistCellRendererTextName"/>

+                      <attributes>

+                        <attribute name="text">2</attribute>

+                        <attribute name="weight">1</attribute>

+                      </attributes>

+                    </child>

+                  </object>

+                </child>

+                <child>

+                  <object class="GtkTreeViewColumn" id="PlaylistColumnDuration">

+                    <property name="title" translatable="yes">Duration</property>

+                    <child>

+                      <object class="GtkCellRendererText" id="PlaylistCellRendererTextDuration"/>

+                      <attributes>

+                        <attribute name="text">3</attribute>

+                        <attribute name="weight">1</attribute>

+                        <attribute name="foreground-rgba">0</attribute>

+                      </attributes>

+                    </child>

+                  </object>

                 </child>

               </object>

             </child>

@@ -285,28 +310,13 @@

     <columns>

       <!-- column-name EntryIdx -->

       <column type="guint"/>

+      <!-- column-name FontWeight -->

+      <column type="gint"/>

       <!-- column-name Name -->

       <column type="gchararray"/>

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

+      <!-- column-name Duration -->

       <column type="gchararray"/>

     </columns>

-    <data>

-      <row>

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

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

-        <col id="2" translatable="yes">1:00:00</col>

-      </row>

-      <row>

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

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

-        <col id="2" translatable="yes">23:42</col>

-      </row>

-      <row>

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

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

-        <col id="2" translatable="yes">0.5</col>

-      </row>

-    </data>

   </object>

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

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

@@ -3,6 +3,7 @@

 import os

 from gi.repository import Gtk

 import gobject

+import pango

 import time

 import playlist

@@ -25,10 +26,8 @@ class SyncGui:

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

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

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

-    self.configPlaylistColumns()

     handlers = {

       "onDestroy":          self.onDestroy,

-      "onPlaylistClick":    self.onPlaylistClick,

       "onPlaylistDblClick": self.onPlaylistDblClick,

       "onNewPosition":      self.onNewPosition,

       "onPrevious":         self.onPrevious,

@@ -50,20 +49,9 @@ class SyncGui:

     self.stPosition = 0 # at begin of current entry

     self.stPlaying = False # not playing

     gobject.timeout_add(10, self.onTimer10ms)

-    self.updateDuration()

+    self.updateEntry()

     self.updateButtonVisibility()

-  def configPlaylistColumns(self):

-    """configure the columns of the playlist widget at program start"""

-    i = 1 # first column is index (not shown)

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

-      column = Gtk.TreeViewColumn(title)

-      self.widPlaylistView.append_column(column)

-      cell = Gtk.CellRendererText()

-      column.pack_start(cell, False)

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

-      i = i + 1

-

   def showPosition(self):

     """update the position texts next to the position slider"""

     # format current time and remaining time

@@ -104,6 +92,24 @@ class SyncGui:

     # update position of slider

     self.updatePosition()

+  def updateEntry(self):

+    """update current entry of playlist and duration, position, ..."""

+    # sanity check for entry index

+    if self.stEntryIdx < -1 or self.stEntryIdx >= len(self.playlist.entries):

+      self.stEntryIdx = -1

+    # make current entry bold, all others non-bold

+    def update(model, path, it, user_data):

+      (idx,) = model.get(it, 0)

+      if idx == self.stEntryIdx:

+        weight = pango.WEIGHT_BOLD

+      else:

+        weight = pango.WEIGHT_NORMAL

+      print("DEBUG sync_gui idx=%d weight=%d" % (idx, weight))

+      model.set(it, 1, weight)

+    self.widPlaylistStore.foreach(update, None)

+    # update duration, position, ...

+    self.updateDuration()

+

   def updateButtonVisibility(self):

     """update the visibility of the buttons based on if playing or not"""

     self.widBtnPause.set_visible(self.stPlaying)

@@ -113,21 +119,6 @@ class SyncGui:

     """window will be destroyed"""

     Gtk.main_quit()

-  def onPlaylistClick(self, widget):

-    """playlist entry has been clicked or selected"""

-    # get index of selected entry

-    idx = -1

-    sel = self.widPlaylistView.get_selection()

-    if sel is not None:

-      (model, it) = sel.get_selected()

-      if it is not None:

-        (idx, ) = model.get(it, 0)

-    print("DEBUG: playlist click idx=%d" % (idx))

-    # update playlist entry

-    self.stEntryIdx = idx

-    # update duration

-    self.updateDuration()

-

   def onPlaylistDblClick(self, widget, row, col):

     """playlist entry has been double-clicked"""

     # get index of selected entry

@@ -137,17 +128,17 @@ class SyncGui:

       (model, it) = sel.get_selected()

       if it is not None:

         (idx,) = model.get(it, 0)

-    print("DEBUG: playlist double-click idx=%d" % (idx))

+    print("DEBUG sync_gui playlist double-click idx=%d" % (idx))

     # update playlist entry

     self.stEntryIdx = idx

-    # update duration

-    self.updateDuration()

+    # update entry

+    self.updateEntry()

     # start playing

     # TODO

   def onNewPosition(self, widget, scroll, value):

     """slider has been moved to a new position"""

-    print("DEBUG: new position " + str(value));

+    print("DEBUG sync_gui new position " + str(value));

     # clamp position to valid range

     if value < 0:

       value = 0

@@ -160,15 +151,15 @@ class SyncGui:

   def onPrevious(self, widget):

     """previous button as been pressed"""

-    print("DEBUG: previous")

+    print("DEBUG sync_gui previous")

   def onBackward(self, widget):

     """backward button has been pressed"""

-    print("DEBUG: backward")

+    print("DEBUG sync_gui backward")

   def onStop(self, widget):

     """stop button has been pressed"""

-    print("DEBUG: stop")

+    print("DEBUG sync_gui stop")

     self.stPlaying = False

     self.stPosition = 0 # stop goes back to begin

     self.updatePosition()

@@ -176,24 +167,24 @@ class SyncGui:

   def onPause(self, widget):

     """pause button has been pressed"""

-    print("DEBUG: pause")

+    print("DEBUG sync_gui pause")

     self.stPlaying = False

     self.updateButtonVisibility()

   def onPlay(self, widget):

     """play button has been pressed"""

-    print("DEBUG: play")

+    print("DEBUG sync_gui play")

     self.stPlaying = True

     self.updatePosition()

     self.updateButtonVisibility()

   def onForward(self, widget):

     """forward button has been pressed"""

-    print("DEBUG: forward")

+    print("DEBUG sync_gui forward")

   def onNext(self, widget):

     """next button has been pressed"""

-    print("DEBUG: next")

+    print("DEBUG sync_gui next")

   def onTimer10ms(self):

     """timer callback, every 10ms"""