Improve modules hierarchy.

[sface.git] / sface / screens / mainscreen.py

diff --git a/sfamainscreen.py b/sface/screens/mainscreen.py
similarity index 94%
rename from sfamainscreen.py
rename to sface/screens/mainscreen.py
index 1ded231..f566b99 100644 (file)
--- a/sfamainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -4,8 +4,8 @@ from PyQt4.QtGui import QWidget, QLabel, QTreeView, QStandardItemModel, QVBoxLay
 
 from sfa.util.rspecHelper import RSpec
 
-from sfadata import SfaData
-from sfascreen import SfaScreen
+from sface.sficonfig import config
+from sface.screens.sfascreen import SfaScreen
 
 
 class SliceWidget(QWidget):
@@ -28,9 +28,7 @@ class SliceWidget(QWidget):
         label.setScaledContents(False)
         self.connect(label, SIGNAL('linkActivated(QString)'), self.refresh)
 
-        # mmhh.
-        data=SfaData()
-        slicename = QLabel ("Slice : %s"%(data.getSlice() or "None"),self)
+        slicename = QLabel ("Slice : %s"%(config.getSlice() or "None"),self)
 
         layout = QVBoxLayout()
         layout.addWidget(label)
@@ -39,7 +37,6 @@ class SliceWidget(QWidget):
         self.setLayout(layout)
         self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
         
-
     
     # TODO: use the methods from sfa-trunk
     def rspec_get_networks(self, rspec_string):
@@ -98,10 +95,10 @@ class SliceWidget(QWidget):
 
 
 
-class SfaMainScreen(SfaScreen):
+class MainScreen(SfaScreen):
     def __init__(self, parent=None):
         SfaScreen.__init__(self, parent)
 
         slice = SliceWidget(self)
         self.init(slice, "Main Window", "PlanetLab Federation GUI")
-        slice.refresh()
+#        slice.refresh()