stage_director

@@ -4,12 +4,12 @@ cd "$(dirname "$0")"

 DATE="$(date "+%Y%m%d")"

-mkdir -p zips/sync_gui_$DATE

+mkdir -p zips/stage_director_$DATE

-cp *.glade *.png *.py *.txt zips/sync_gui_$DATE

+cp *.glade *.png *.py *.txt zips/stage_director_$DATE

 cd zips

-zip -r sync_gui_$DATE.zip sync_gui_$DATE

+zip -r stage_director_$DATE.zip stage_director_$DATE

-rm -rf sync_gui_$DATE

+rm -rf stage_director_$DATE

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

 #! /usr/bin/env python

-# BlinkenArea Sync GUI

-# version 0.1.0 date 2013-11-23

+# BlinkenArea Stage Director

 # Copyright 2013 Stefan Schuermans <stefan@blinkenarea.org>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project - https://www.blinkenarea.org/

@@ -1,10 +1,46 @@

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

 <interface>

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

+  <object class="GtkAboutDialog" id="DialogAbout">

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

+    <property name="border_width">5</property>

+    <property name="title" translatable="yes">About BlinkenArea Stage Director</property>

+    <property name="type_hint">dialog</property>

+    <property name="program_name">BlinkenArea Stage Director</property>

+    <property name="version">0.1.1</property>

+    <property name="copyright" translatable="yes">Copyright 2013 Stefan Schuermans &lt;stefan@blinkenarea.org&gt;

+Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

+a blinkenarea.org project - https://www.blinkenarea.org/</property>

+    <property name="website">https://www.blinkenarea.org</property>

+    <property name="website_label" translatable="yes">BlinkenArea Homepage</property>

+    <property name="logo">logo.png</property>

+    <child internal-child="vbox">

+      <object class="GtkBox" id="DiaAboutVBox">

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

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

+        <property name="spacing">2</property>

+        <child internal-child="action_area">

+          <object class="GtkButtonBox" id="DiaAboutAction">

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

+            <property name="layout_style">end</property>

+          </object>

+          <packing>

+            <property name="expand">False</property>

+            <property name="fill">True</property>

+            <property name="pack_type">end</property>

+            <property name="position">0</property>

+          </packing>

+        </child>

+        <child>

+          <placeholder/>

+        </child>

+      </object>

+    </child>

+  </object>

   <object class="GtkDialog" id="DialogDestination">

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

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

-    <property name="title" translatable="yes">BlinkenArea Sync GUI - Extras Destination Address...</property>

+    <property name="title" translatable="yes">BlinkenArea Stage Director - Extras Destination Address...</property>

     <property name="type_hint">dialog</property>

     <child internal-child="vbox">

       <object class="GtkBox" id="DiaDestVBox">

@@ -173,7 +209,7 @@

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

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

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

-    <property name="title" translatable="yes">BlinkenArea Sync GUI</property>

+    <property name="title" translatable="yes">BlinkenArea Stage Director</property>

     <signal name="destroy" handler="onDestroy" swapped="no"/>

     <child>

       <object class="GtkBox" id="MainVbox">

@@ -249,6 +285,16 @@

                         <signal name="activate" handler="onExtrasDestination" swapped="no"/>

                       </object>

                     </child>

+                    <child>

+                      <object class="GtkMenuItem" id="MiExtrasAbout">

+                        <property name="use_action_appearance">False</property>

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

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

+                        <property name="label" translatable="yes">_About</property>

+                        <property name="use_underline">True</property>

+                        <signal name="activate" handler="onExtrasAbout" swapped="no"/>

+                      </object>

+                    </child>

                   </object>

                 </child>

               </object>

@@ -392,11 +438,7 @@

               <object class="GtkImage" id="LogoStop">

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

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

-                <property name="tooltip_text" translatable="yes">BlinkenArea Sync GUI

-version 0.1.0 date 2013-11-23

-Copyright 2013 Stefan Schuermans <stefan@blinkenarea.org>

-Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

-a blinkenarea.org project - https://www.blinkenarea.org/</property>

+                <property name="tooltip_text" translatable="yes">stopped</property>

                 <property name="pixbuf">logo_o.png</property>

               </object>

               <packing>

@@ -408,11 +450,7 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

             <child>

               <object class="GtkImage" id="LogoPlay">

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

-                <property name="tooltip_text" translatable="yes">BlinkenArea Sync GUI

-version 0.1.0 date 2013-11-23

-Copyright 2013 Stefan Schuermans <stefan@blinkenarea.org>

-Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

-a blinkenarea.org project - https://www.blinkenarea.org/</property>

+                <property name="tooltip_text" translatable="yes">playing</property>

                 <property name="pixbuf">logo_g.png</property>

               </object>

               <packing>

@@ -448,8 +486,8 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

                   </packing>

                 </child>

                 <child>

-                  <object class="GtkButton" id="Stop">

-                    <property name="label">gtk-media-stop</property>

+                  <object class="GtkButton" id="Play">

+                    <property name="label">gtk-media-play</property>

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

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

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

@@ -458,7 +496,7 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

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

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

                     <property name="image_position">top</property>

-                    <signal name="clicked" handler="onStop" swapped="no"/>

+                    <signal name="clicked" handler="onPlay" swapped="no"/>

                   </object>

                   <packing>

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

@@ -485,8 +523,8 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

                   </packing>

                 </child>

                 <child>

-                  <object class="GtkButton" id="Play">

-                    <property name="label">gtk-media-play</property>

+                  <object class="GtkButton" id="Stop">

+                    <property name="label">gtk-media-stop</property>

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

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

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

@@ -495,7 +533,7 @@ a blinkenarea.org project - https://www.blinkenarea.org/</property>

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

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

                     <property name="image_position">top</property>

-                    <signal name="clicked" handler="onPlay" swapped="no"/>

+                    <signal name="clicked" handler="onStop" swapped="no"/>

                   </object>

                   <packing>

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

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

 #! /usr/bin/env python

-# BlinkenArea Sync GUI

-# version 0.1.0 date 2013-11-23

+# BlinkenArea Stage Director

 # Copyright 2013 Stefan Schuermans <stefan@blinkenarea.org>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project - https://www.blinkenarea.org/

@@ -24,7 +23,7 @@ class SyncGui:

   def __init__(self):

     """construct a SyncGui object"""

     self.builder = Gtk.Builder()

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

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

     self.widMainWindow = self.builder.get_object("MainWindow")

     self.widPlaylistView = self.builder.get_object("PlaylistView")

     self.widPlaylistStore = self.builder.get_object("PlaylistStore")

@@ -32,8 +31,8 @@ class SyncGui:

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

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

     self.widPositionRemaining = self.builder.get_object("PositionRemaining")

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

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

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

     self.widLogoStop = self.builder.get_object("LogoStop")

     self.widLogoPlay = self.builder.get_object("LogoPlay")

     self.widLogoUdpErr = self.builder.get_object("LogoUdpErr")

@@ -44,12 +43,13 @@ class SyncGui:

       "onFileOpen":          self.onFileOpen,

       "onFileExit":          self.onFileExit,

       "onExtrasDestination": self.onExtrasDestination,

+      "onExtrasAbout":       self.onExtrasAbout,

       "onPlaylistDblClick":  self.onPlaylistDblClick,

       "onNewPosition":       self.onNewPosition,

       "onPrevious":          self.onPrevious,

-      "onStop":              self.onStop,

-      "onPause":             self.onPause,

       "onPlay":              self.onPlay,

+      "onPause":             self.onPause,

+      "onStop":              self.onStop,

       "onNext":              self.onNext,

     }

     self.builder.connect_signals(handlers)

@@ -144,8 +144,8 @@ class SyncGui:

   def updateButtonVisibility(self):

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

-    self.widBtnPause.set_visible(self.stPlaying)

     self.widBtnPlay.set_visible(not self.stPlaying)

+    self.widBtnPause.set_visible(self.stPlaying)

     self.widLogoStop.set_visible(not self.stPlaying)

     self.widLogoPlay.set_visible(self.stPlaying)

@@ -180,10 +180,10 @@ class SyncGui:

   def onFileOpen(self, widget):

     """File Open clicked in menu"""

-    #print("DEBUG sync_gui File Open")

+    #print("DEBUG stage_director File Open")

     # create and run file chooser dialog

     dialog = Gtk.FileChooserDialog(

-      "BlinkenArea Sync GUI - File Open...",

+      "BlinkenArea Stage Director - File Open...",

       self.widMainWindow, Gtk.FileChooserAction.OPEN,

       (Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL,

        Gtk.STOCK_OPEN, Gtk.ResponseType.OK))

@@ -207,12 +207,12 @@ class SyncGui:

   def onFileExit(self, widget):

     """File Exit clicked in menu"""

-    #print("DEBUG sync_gui File Exit")

+    #print("DEBUG stage_director File Exit")

     Gtk.main_quit()

   def onExtrasDestination(self, widget):

     """Extras Destination Address clicked in menu"""

-    #print("DEBUG sync_gui Extras Destination")

+    #print("DEBUG stage_director Extras Destination")

     # run input dialog to ask for new destination

     dialog = self.builder.get_object("DialogDestination")

     cur = self.builder.get_object("DiaDestCur")

@@ -227,6 +227,14 @@ class SyncGui:

     # re-create UDP socket

     self.setupSock()

+  def onExtrasAbout(self, widget):

+    """Extras About clicked in menu"""

+    #print("DEBUG stage_director Extras About")

+    # run about dialog

+    dialog = self.builder.get_object("DialogAbout")

+    dialog.run()

+    dialog.hide()

+

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

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

     # get index of selected entry

@@ -236,7 +244,7 @@ class SyncGui:

       (model, it) = sel.get_selected()

       if it is not None:

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

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

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

     # update playlist entry

     self.stEntryIdx = idx

     # set position to zero if playing

@@ -247,7 +255,7 @@ class SyncGui:

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

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

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

+    #print("DEBUG stage_director new position " + str(value));

     # clamp position to valid range

     if value < 0:

       value = 0

@@ -260,7 +268,7 @@ class SyncGui:

   def onPrevious(self, widget):

     """previous button as been pressed"""

-    #print("DEBUG sync_gui previous")

+    #print("DEBUG stage_director previous")

     # go to begin of previous entry (with wrap around)

     self.stPosition = 0

     self.stEntryIdx = self.stEntryIdx - 1

@@ -268,30 +276,30 @@ class SyncGui:

       self.stEntryIdx = len(self.playlist.entries) - 1

     self.updateEntry()

-  def onStop(self, widget):

-    """stop button has been pressed"""

-    #print("DEBUG sync_gui stop")

-    self.stPlaying = False

-    self.stPosition = 0 # stop goes back to begin

+  def onPlay(self, widget):

+    """play button has been pressed"""

+    #print("DEBUG stage_director play")

+    self.stPlaying = True

     self.updatePosition()

     self.updateButtonVisibility()

   def onPause(self, widget):

     """pause button has been pressed"""

-    #print("DEBUG sync_gui pause")

+    #print("DEBUG stage_director pause")

     self.stPlaying = False

     self.updateButtonVisibility()

-  def onPlay(self, widget):

-    """play button has been pressed"""

-    #print("DEBUG sync_gui play")

-    self.stPlaying = True

+  def onStop(self, widget):

+    """stop button has been pressed"""

+    #print("DEBUG stage_director stop")

+    self.stPlaying = False

+    self.stPosition = 0 # stop goes back to begin

     self.updatePosition()

     self.updateButtonVisibility()

   def onNext(self, widget):

     """next button has been pressed"""

-    #print("DEBUG sync_gui next")

+    #print("DEBUG stage_director next")

     # go to begin of next entry (with wrap around)

     self.stPosition = 0

     self.stEntryIdx = self.stEntryIdx + 1

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

 #! /usr/bin/env python

-# BlinkenArea Sync GUI

-# version 0.1.0 date 2013-11-23

+# BlinkenArea Stage Director

 # Copyright 2013 Stefan Schuermans <stefan@blinkenarea.org>

 # Copyleft: GNU public license - http://www.gnu.org/copyleft/gpl.html

 # a blinkenarea.org project - https://www.blinkenarea.org/