Improve modules hierarchy.

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

diff --git a/sfaconfigscreen.py b/sface/screens/configscreen.py
similarity index 65%
rename from sfaconfigscreen.py
rename to sface/screens/configscreen.py
index 3933122..7cb3ef7 100644 (file)
--- a/sfaconfigscreen.py
+++ b/sface/screens/configscreen.py
@@ -2,19 +2,17 @@
 from PyQt4.QtCore import SIGNAL, Qt
 from PyQt4.QtGui import QWidget, QLabel, QLineEdit, QPushButton, QVBoxLayout, QSizePolicy
 
-from sfadata import SfaData
-from sfascreen import SfaScreen
+from sface.sficonfig import config
+from sface.screens.sfascreen import SfaScreen
 
 class ConfigWidget(QWidget):
     def __init__(self, parent=None):
         QWidget.__init__(self, parent)
 
-        self.data = SfaData()
-
         label1 = QLabel("User HRN:", self)
-        self.user = QLineEdit(self.data.getUser(), self)
+        self.user = QLineEdit(config.getUser(), self)
         label2 = QLabel("Slice HRN:", self)
-        self.slice = QLineEdit(self.data.getSlice(), self)
+        self.slice = QLineEdit(config.getSlice(), self)
         apply = QPushButton("Apply", self)
         apply.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
         
@@ -30,14 +28,14 @@ class ConfigWidget(QWidget):
         self.connect(apply, SIGNAL('clicked()'), self.apply)
 
     def apply(self):
-        self.data.setUser("%s" % self.user.text())
-        self.data.setSlice("%s" % self.slice.text())
-        self.data.save_config()
+        config.setUser("%s" % self.user.text())
+        config.setSlice("%s" % self.slice.text())
+        config.save_config()
         
 
-class SfaConfigScreen(SfaScreen):
+class ConfigScreen(SfaScreen):
     def __init__(self, parent=None):
         SfaScreen.__init__(self, parent)
         
-        config = ConfigWidget(self)
-        self.init(config, "Configure", "Configure the PlanetLab Federation GUI")
+        widget = ConfigWidget(self)
+        self.init(widget, "Configure", "Configure the PlanetLab Federation GUI")