jdahlin - in flumotion/trunk: . data/glade flumotion/wizard

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Fri Dec 28 17:44:20 2007
New Revision: 6054

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/data/glade/wizard_disk.glade
   flumotion/trunk/flumotion/wizard/consumptionsteps.py
Log:
2007-12-28  Johan Dahlin  <johan at gnome.org>

	* data/glade/wizard_disk.glade:
	* flumotion/wizard/consumptionsteps.py 
	(DiskStep.on_checkbutton_rotate_toggled)
	(DiskStep._update_radio): Avoid relying on __nonzero__ which is gone.
	(DiskStep.on_radiobutton_has_time_toggled)
	(DiskStep.on_radiobutton_has_size_toggled): 
	Use a separate method callback for each widget.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Fri Dec 28 17:44:20 2007
@@ -1,3 +1,13 @@
+2007-12-28  Johan Dahlin  <johan at gnome.org>
+
+	* data/glade/wizard_disk.glade:
+	* flumotion/wizard/consumptionsteps.py 
+	(DiskStep.on_checkbutton_rotate_toggled)
+	(DiskStep._update_radio): Avoid relying on __nonzero__ which is gone.
+	(DiskStep.on_radiobutton_has_time_toggled)
+	(DiskStep.on_radiobutton_has_size_toggled): 
+	Use a separate method callback for each widget.
+
 2007-12-28  Michael Smith <msmith at fluendo.com>
 
 	* flumotion/manager/component.py:

Modified: flumotion/trunk/data/glade/wizard_disk.glade
==============================================================================
--- flumotion/trunk/data/glade/wizard_disk.glade	(original)
+++ flumotion/trunk/data/glade/wizard_disk.glade	Fri Dec 28 17:44:20 2007
@@ -82,7 +82,7 @@
 		  <property name="active">True</property>
 		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
-		  <signal name="toggled" handler="on_radiobutton_rotate_toggled" last_modification_time="Thu, 30 Sep 2004 14:54:10 GMT"/>
+		  <signal name="toggled" handler="on_radiobutton_has_time_toggled" last_modification_time="Thu, 30 Sep 2004 14:54:10 GMT"/>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>
@@ -106,7 +106,7 @@
 		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
 		  <property name="group">radiobutton_has_time</property>
-		  <signal name="toggled" handler="on_radiobutton_has_time_toggled" last_modification_time="Thu, 30 Sep 2004 14:42:57 GMT"/>
+		  <signal name="toggled" handler="on_radiobutton_has_size_toggled" last_modification_time="Thu, 30 Sep 2004 14:42:57 GMT"/>
 		</widget>
 		<packing>
 		  <property name="left_attach">0</property>

Modified: flumotion/trunk/flumotion/wizard/consumptionsteps.py
==============================================================================
--- flumotion/trunk/flumotion/wizard/consumptionsteps.py	(original)
+++ flumotion/trunk/flumotion/wizard/consumptionsteps.py	Fri Dec 28 17:44:20 2007
@@ -307,12 +307,12 @@
         if not self.checkbutton_rotate.get_active():
             options['rotate-type'] = 'none'
         else:
-            if self.radiobutton_has_time:
+            if self.radiobutton_has_time.get_active():
                 options['rotate-type'] = 'time'
                 time_value = self.combobox_time_list.get_selected()
                 options['time'] = long(
                     self.spinbutton_time.get_value() * time_value.unit)
-            elif self.radiobutton_has_size:
+            elif self.radiobutton_has_size.get_active():
                 options['rotate-type'] = 'size'
                 size_value = self.combobox_size_list.get_selected()
                 options['size'] = long(
@@ -329,12 +329,12 @@
     # Private
 
     def _update_radio(self):
-        if self.radiobutton_has_size:
+        if self.radiobutton_has_size.get_active():
             self.spinbutton_size.set_sensitive(True)
             self.combobox_size_list.set_sensitive(True)
             self.spinbutton_time.set_sensitive(False)
             self.combobox_time_list.set_sensitive(False)
-        elif self.radiobutton_has_time:
+        elif self.radiobutton_has_time.get_active():
             self.spinbutton_time.set_sensitive(True)
             self.combobox_time_list.set_sensitive(True)
             self.spinbutton_size.set_sensitive(False)
@@ -342,8 +342,10 @@
 
     # Callbacks
 
-    def on_radiobutton_rotate_toggled(self, button):
-        # This is bound to both radiobutton_has_size and radiobutton_has_time
+    def on_radiobutton_has_time_toggled(self, radio):
+        self._update_radio()
+
+    def on_radiobutton_has_size_toggled(self, radio):
         self._update_radio()
 
     def on_checkbutton_rotate_toggled(self, button):