Specify full filename path; don't rely on default behavior of sfi.py

[sfa-gui.git] / SfaGUI.py

diff --git a/SfaGUI.py b/SfaGUI.py
index 8cd7cc1..0a3ddda 100644 (file)
--- a/SfaGUI.py
+++ b/SfaGUI.py
@@ -11,10 +11,13 @@ from pyjamas import Window
 from SinkList import SinkList
 from Configure import TopPanel
 from pyjamas import History
-import Info
+import Welcome
 import Slices
 import Identities
 import PlanetLab
+import PLE
+import PLJ
+import GpENI
 import VINI
 import OpenCirrus
 import SfaBrowser
@@ -49,6 +52,7 @@ class SfaGUI:
 
         self.description.setStyleName("ks-Info")
 
+        self.panel.add(self.tp, DockPanel.NORTH)
         self.panel.add(self.sink_list, DockPanel.WEST)
         self.panel.add(vp, DockPanel.CENTER)
 
@@ -57,7 +61,6 @@ class SfaGUI:
         self.panel.setCellHeight(vp, "100%")
 
         History.addHistoryListener(self)
-        RootPanel().add(self.tp)
         RootPanel().add(self.panel)
 
         #Show the initial screen.
@@ -89,17 +92,20 @@ class SfaGUI:
         self.curSink.onShow()
         
     def loadSinks(self):
-        self.sink_list.addSink(Info.init())
-        self.sink_list.addSink(Identities.init())
-        self.sink_list.addSink(Slices.init())
+        self.sink_list.addSink(Welcome.init())
+        #self.sink_list.addSink(Identities.init())
+        # self.sink_list.addSink(Slices.init())
         self.sink_list.addSink(PlanetLab.init())
+        self.sink_list.addSink(PLE.init())
+        self.sink_list.addSink(PLJ.init())
+        self.sink_list.addSink(GpENI.init())
         self.sink_list.addSink(VINI.init())
-        self.sink_list.addSink(OpenCirrus.init())
+        #self.sink_list.addSink(OpenCirrus.init())
         self.sink_list.addSink(SfaBrowser.init())
         self.sink_list.addSink(Configure.init())
 
     def showInfo(self):
-        self.show(self.sink_list.find("Info"), False)
+        self.show(self.sink_list.find("Welcome"), False)