jdahlin - in flumotion/trunk: . flumotion/test flumotion/wizard

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Fri Apr 18 18:59:05 2008
New Revision: 6526

Log:
2008-04-18  Johan Dahlin  <johan at gnome.org>

    * flumotion/wizard/overlaystep.py (Overlay.getProperties): show-text
    should be saved as a real property. Fixes #929

    * flumotion/test/test_wizard_save.py (TestWizardSave): 
    Update tests



Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/test/test_wizard_save.py
   flumotion/trunk/flumotion/wizard/overlaystep.py

Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Apr 18 18:59:05 2008
@@ -1,3 +1,11 @@
+2008-04-18  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/wizard/overlaystep.py (Overlay.getProperties): show-text
+	should be saved as a real property. Fixes #929
+
+	* flumotion/test/test_wizard_save.py (TestWizardSave): 
+	Update tests
+	
 2008-04-18  Johan Dahlin  <johan at flumotion.com>
 
 	reviewed by: Zaheer

Modified: flumotion/trunk/flumotion/test/test_wizard_save.py
==============================================================================
--- flumotion/trunk/flumotion/test/test_wizard_save.py	(original)
+++ flumotion/trunk/flumotion/test/test_wizard_save.py	Fri Apr 18 18:59:05 2008
@@ -275,6 +275,7 @@
              '      <property name="cc-logo">True</property>\n'
              '      <property name="fluendo-logo">True</property>\n'
              '      <property name="height">480</property>\n'
+             '      <property name="show-text">True</property>\n'
              '      <property name="text">Fluendo</property>\n'
              '      <property name="width">640</property>\n'
              '    </component>\n'
@@ -404,6 +405,7 @@
              '      \n'
              '      <property name="fluendo-logo">True</property>\n'
              '      <property name="height">240</property>\n'
+             '      <property name="show-text">True</property>\n'
              '      <property name="text">Fluendo</property>\n'
              '      <property name="width">320</property>\n'
              '      <property name="xiph-logo">True</property>\n'
@@ -549,6 +551,7 @@
              '      <property name="cc-logo">True</property>\n'
              '      <property name="fluendo-logo">True</property>\n'
              '      <property name="height">480</property>\n'
+             '      <property name="show-text">True</property>\n'
              '      <property name="text">Fluendo</property>\n'
              '      <property name="width">640</property>\n'
              '    </component>\n'
@@ -658,6 +661,7 @@
              '      <property name="cc-logo">True</property>\n'
              '      <property name="fluendo-logo">True</property>\n'
              '      <property name="height">480</property>\n'
+             '      <property name="show-text">True</property>\n'
              '      <property name="text">Fluendo</property>\n'
              '      <property name="width">640</property>\n'
              '    </component>\n'

Modified: flumotion/trunk/flumotion/wizard/overlaystep.py
==============================================================================
--- flumotion/trunk/flumotion/wizard/overlaystep.py	(original)
+++ flumotion/trunk/flumotion/wizard/overlaystep.py	Fri Apr 18 18:59:05 2008
@@ -37,8 +37,8 @@
         super(Overlay, self).__init__()
         self._video_producer = video_producer
         self.can_overlay = False
-        self.show_text = True
         self.show_logo = True
+        self.properties.show_text = True
         self.properties.text = _("Fluendo")
 
     # Public API
@@ -54,7 +54,7 @@
     def getProperties(self):
         p = super(Overlay, self).getProperties()
 
-        if not self.show_text:
+        if not self.properties.show_text:
             del p.text
 
         p.width = self._video_producer.getWidth()
@@ -85,8 +85,8 @@
     def setup(self):
         self.text.data_type = str
 
-        self.add_proxy(self.model, ['show_logo', 'show_text'])
-        self.add_proxy(self.model.properties, ['text'])
+        self.add_proxy(self.model, ['show_logo'])
+        self.add_proxy(self.model.properties, ['show_text', 'text'])
 
     def worker_changed(self, worker):
         self.model.worker = worker