finish the vault merge :: use it

1 files changed, 14 insertions, 12 deletions

diff --git a/src/sugar/activity/widgets.py b/src/sugar/activity/widgets.py
index 1cc3935..79f0a4c 100644
--- a/src/sugar/activity/widgets.py
+++ b/src/sugar/activity/widgets.py
@@ -34,7 +34,7 @@ from sugar.bundle.activitybundle import ActivityBundle
 
 from sugar.tutorius.creator import Creator
 from sugar.tutorius.service import ServiceProxy
-from sugar.tutorius.bundler import TutorialStore
+from sugar.tutorius.vault import Vault
 
 _ = lambda msg: gettext.dgettext('sugar-toolkit', msg)
 
@@ -195,6 +195,8 @@ class TutorButton(ToolButton):
 
 class TutorialsCombo(ToolComboBox):
     #FIXME class should be moved to the frame
+    # This will require: Replacing the os.environ calls
+    # Attaching to the shell model's activity_changed
     def __init__(self, activity, combo=None, **kwargs):
         ToolComboBox.__init__(self, combo, **kwargs)
         self.props.label_text = _("Tutorials:")
@@ -203,14 +205,14 @@ class TutorialsCombo(ToolComboBox):
 
         # Get tutorial list by file
         self._service = ServiceProxy()
-        store = TutorialStore()
         
-        tutorials = activity.get_tutorials()
         if getattr(activity,"_tutorials",None) is None:
-            tutorials = store.list_available_tutorials(
+            tutorials = Vault.list_available_tutorials(
                     os.environ["SUGAR_BUNDLE_NAME"],
                     os.environ['SUGAR_BUNDLE_VERSION'])
-        
+        else:
+            tutorials = activity._tutorials
+
         activity._current_tutorial = None
         if tutorials:
             for key, tutorial in tutorials.items():
@@ -309,14 +311,14 @@ class ActivityToolbar(gtk.Toolbar):
         self.insert(self.stop, -1)
         self.stop.show()
 
-        if hasattr(activity, "get_tutorials"):
-            self.tutor = TutorButton(activity)
-            self.insert(self.tutor, -1)
-            self.tutor.show()
+        self.tutor = TutorButton(activity)
+        self.insert(self.tutor, -1)
+        self.tutor.show()
+
+        self.tutorials = TutorialsCombo(activity)
+        self.insert(self.tutorials, -1)
+        self.tutorials.show()
 
-            self.tutorials = TutorialsCombo(activity)
-            self.insert(self.tutorials, -1)
-            self.tutorials.show()
 class EditToolbar(gtk.Toolbar):
     """Provides the standard edit toolbar for Activities.