thomasvs - in flumotion/trunk: . flumotion/component/base flumotion/component/producers/audiotest

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Wed Jan 17 21:35:15 2007
New Revision: 4388

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/base/admin_gtk.py
   flumotion/trunk/flumotion/component/producers/audiotest/admin_gtk.py
Log:
	reviewed by: <delete if not using a buddy>
	* flumotion/component/producers/audiotest/admin_gtk.py:
	  Respect the component protocol, return the .setup deferred
	* flumotion/component/base/admin_gtk.py:
	  Clean up F0.2 TODO's.
	  Add _instanceSetup method so that we properly handle errors in
	  components in both cases.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jan 17 21:35:15 2007
@@ -1,3 +1,14 @@
+2007-01-17  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	reviewed by: <delete if not using a buddy>
+
+	* flumotion/component/producers/audiotest/admin_gtk.py:
+	  Respect the component protocol, return the .setup deferred
+	* flumotion/component/base/admin_gtk.py:
+	  Clean up F0.2 TODO's.
+	  Add _instanceSetup method so that we properly handle errors in
+	  components in both cases.
+
 2007-01-11  Andy Wingo  <wingo at pobox.com>
 
 	* flumotion/job/job.py (JobMedium.shutdownHandler): Wait for both

Modified: flumotion/trunk/flumotion/component/base/admin_gtk.py
==============================================================================
--- flumotion/trunk/flumotion/component/base/admin_gtk.py	(original)
+++ flumotion/trunk/flumotion/component/base/admin_gtk.py	Wed Jan 17 21:35:15 2007
@@ -36,6 +36,8 @@
 from flumotion.twisted.defer import defer_generator_method
 from flumotion.twisted.compat import implements
 
+from gettext import gettext as _
+
 class BaseAdminGtk(log.Loggable):
     """
     I am a base class for all GTK+-based Admin views.
@@ -119,10 +121,9 @@
         self.debug('BaseAdminGtk.setup()')
 
         config = self.state.get('config') 
-        if config['feed'] or config.get('source', None):
-            self.debug("Let us show a plumbing node")
-            self.nodes['Plumbing'] = PlumbingAdminGtkNode(self.state,
-                                                          self.admin)
+        if config['feed']:
+            self.debug("Component has feeders, show Feeders node")
+            self.nodes['Feeders'] = FeedersAdminGtkNode(self.state, self.admin)
 
         # set up translations
         if not hasattr(self, 'gettext_domain'):
@@ -412,12 +413,12 @@
             self.state.removeListener(self)
             self.state = None
 
-class PlumbingAdminGtkNode(BaseAdminGtkNode):
+class FeedersAdminGtkNode(BaseAdminGtkNode):
     glade_file = os.path.join('flumotion', 'component', 'base',
                               'plumbing.glade')
 
     def __init__(self, state, admin):
-        BaseAdminGtkNode.__init__(self, state, admin, 'Plumbing')
+        BaseAdminGtkNode.__init__(self, state, admin, title=_("Feeders"))
         self.treemodel = None
         self.treeview = None
         self.selected = None

Modified: flumotion/trunk/flumotion/component/producers/audiotest/admin_gtk.py
==============================================================================
--- flumotion/trunk/flumotion/component/producers/audiotest/admin_gtk.py	(original)
+++ flumotion/trunk/flumotion/component/producers/audiotest/admin_gtk.py	Wed Jan 17 21:35:15 2007
@@ -90,4 +90,4 @@
         audiotest = AudioTestAdminGtkNode(self.state, self.admin,
                                           title=_("Audio Test"))
         self.nodes['Audio Test'] = audiotest
-        admin_gtk.BaseAdminGtk.setup(self)
+        return admin_gtk.BaseAdminGtk.setup(self)