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

[flumotion-commit at lists.fluendo.com]

Author: jdahlin
Date: Wed Jan  9 14:10:14 2008
New Revision: 6078

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/ui/wizard.py
   flumotion/trunk/flumotion/wizard/configurationwizard.py
Log:
2008-01-09  Johan Dahlin  <johan at gnome.org>

	* flumotion/ui/wizard.py (SectionWizard.run): 
	* flumotion/wizard/configurationwizard.py:
	Rename show_next_step to prepare_next_step.
	Split it into two parts, add support for returning a deferred
	instead of a wizard step instance.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Wed Jan  9 14:10:14 2008
@@ -1,3 +1,11 @@
+2008-01-09  Johan Dahlin  <johan at gnome.org>
+
+	* flumotion/ui/wizard.py (SectionWizard.run): 
+	* flumotion/wizard/configurationwizard.py:
+	Rename show_next_step to prepare_next_step.
+	Split it into two parts, add support for returning a deferred
+	instead of a wizard step instance.
+
 2008-01-08  Johan Dahlin  <johan at gnome.org>
 
 	* Makefile.am (PYCHECKER_BLACKLIST): Put kiwipatches here.

Modified: flumotion/trunk/flumotion/ui/wizard.py
==============================================================================
--- flumotion/trunk/flumotion/ui/wizard.py	(original)
+++ flumotion/trunk/flumotion/ui/wizard.py	Wed Jan  9 14:10:14 2008
@@ -27,6 +27,7 @@
 import gobject
 import gtk
 from kiwi.interfaces import IProxyWidget
+from twisted.internet.defer import Deferred
 
 from flumotion.configure import configure
 from flumotion.common import log, messages
@@ -262,10 +263,16 @@
         except KeyboardInterrupt:
             pass
 
-    def show_next_step(self, step):
+    def prepare_next_step(self, step):
         next = step.get_next()
         if isinstance(next, WizardStep):
             next_step = next
+        elif isinstance(next, Deferred):
+            d = next
+            def get_step(step):
+                self._show_next_step(step)
+            d.addCallback(get_step)
+            return
         elif next is None:
             if self._current_section + 1 == len(self.sections):
                 self._finish(completed=True)
@@ -276,24 +283,7 @@
         else:
             raise AssertionError(next)
 
-        self._steps[next_step.name] = next_step
-
-        while not self._stack.push(next_step):
-            s = self._stack.pop()
-            s.visited = False
-            self.sidebar.pop()
-
-        if not next_step.visited:
-            self.sidebar.push(next_step.section, next_step.name,
-                              next_step.sidebar_name)
-        else:
-            self.sidebar.show_step(next_step.section)
-
-        next_step.visited = True
-        self._set_step(next_step)
-
-        has_next = not hasattr(next_step, 'last_step')
-        self._update_buttons(has_next)
+        self._show_next_step(next_step)
 
     # Private
 
@@ -337,6 +327,26 @@
             except RuntimeError:
                 pass
 
+    def _show_next_step(self, step):
+        self._steps[step.name] = step
+
+        while not self._stack.push(step):
+            s = self._stack.pop()
+            s.visited = False
+            self.sidebar.pop()
+
+        if not step.visited:
+            self.sidebar.push(step.section, step.name,
+                              step.sidebar_name)
+        else:
+            self.sidebar.show_step(step.section)
+
+        step.visited = True
+        self._set_step(step)
+
+        has_next = not hasattr(step, 'last_step')
+        self._update_buttons(has_next)
+
     def _set_step(self, step):
         self._pack_step(step)
         self._set_step_icon(step.icon)
@@ -368,7 +378,7 @@
         self._set_step(step)
 
     def _show_next_step(self):
-        self.show_next_step(self._current_step)
+        self.prepare_next_step(self._current_step)
 
     def _show_previous_step(self):
         step = self._stack.back()

Modified: flumotion/trunk/flumotion/wizard/configurationwizard.py
==============================================================================
--- flumotion/trunk/flumotion/wizard/configurationwizard.py	(original)
+++ flumotion/trunk/flumotion/wizard/configurationwizard.py	Wed Jan  9 14:10:14 2008
@@ -165,9 +165,9 @@
 
         self._setup_worker(step, self._worker_list.get_worker())
 
-    def show_next_step(self, step):
+    def prepare_next_step(self, step):
         self._setup_worker(step, self._worker_list.get_worker())
-        SectionWizard.show_next_step(self, step)
+        SectionWizard.prepare_next_step(self, step)
 
     # Public API