X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fscreens%2Fconfigscreen.py;h=bed2ce7fdeb2e0968b0dcd4de7442d2504fe89f5;hb=be3bd7fd5181f7f98a891dab4211d0d94a64cb28;hp=3ea4cb8d639a309164453cbcac0869bcb10ca383;hpb=8cfbfbd5c19fcab179e037efacd608e3b4c64b6e;p=sface.git
diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index 3ea4cb8..bed2ce7 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -1,44 +1,65 @@
-from PyQt4.QtCore import SIGNAL, Qt
-from PyQt4.QtGui import QWidget, QLabel, QLineEdit, QPushButton, QVBoxLayout, QSizePolicy
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
-from sface.sficonfig import config
+from sface.config import config
from sface.screens.sfascreen import SfaScreen
class ConfigWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
- label1 = QLabel("User HRN:", self)
- self.user = QLineEdit(config.getUser(), self)
- self.user.setAttribute(Qt.WA_MacShowFocusRect, 0)
- label2 = QLabel("Slice HRN:", self)
- self.slice = QLineEdit(config.getSlice(), self)
- self.slice.setAttribute(Qt.WA_MacShowFocusRect, 0)
- apply = QPushButton("Apply", self)
- apply.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
-
layout = QVBoxLayout()
- layout.addWidget(label1)
- layout.addWidget(self.user)
- layout.addWidget(label2)
- layout.addWidget(self.slice)
- layout.addWidget(apply, 0, Qt.AlignRight)
- layout.addStretch()
+ for (field,msg) in config.field_labels():
+ # label
+ layout.addWidget(QLabel(msg,self))
+ # edit : text or checkbox
+ default=config.field_default(field)
+ if isinstance(default,bool):
+ edit=QCheckBox(msg)
+ if config.is_true(config.get(field)):
+ edit.setCheckState(Qt.Checked)
+ else:
+ edit=QLineEdit(config.get(field), self)
+ edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
+ setattr(self,field,edit)
+ layout.addWidget (edit)
+
+ hlayout = QHBoxLayout()
+ hlayout.addStretch()
+ for (action,label) in [('apply','Apply'),
+ ('save','Apply && Save')]:
+ button=QPushButton(label, self)
+ button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+ hlayout.addWidget(button, 0, Qt.AlignRight)
+ hlayout.addSpacing(10)
+ self.connect(button, SIGNAL('clicked()'), getattr(self,action))
+ layout.addLayout(hlayout)
self.setLayout(layout)
- self.connect(apply, SIGNAL('clicked()'), self.apply)
def apply(self):
- config.setUser("%s" % self.user.text())
- config.setSlice("%s" % self.slice.text())
+ for field in config.fields():
+ widget=getattr(self,field)
+ if isinstance(widget,QCheckBox):
+ if widget.checkState() == Qt.Checked:
+ config.set(field, True)
+ else:
+ config.set(field, False)
+ else:
+ config.set(field, str(widget.text()))
+
+ self.parent().setStatus("Settings loaded for current session", timeout=5000)
+ config.display("after apply")
+
+ def save(self):
+ self.apply()
config.save_config()
- self.parent().setStatus("Configuration saved!", timeout=3000)
-
+ self.parent().setStatus("Configuration saved in %s !"%config.filename(), timeout=5000)
class ConfigScreen(SfaScreen):
def __init__(self, parent):
SfaScreen.__init__(self, parent)
widget = ConfigWidget(self)
- self.init(widget, "Configure", "Configure the PlanetLab Federation GUI")
+ self.init(widget, "Configure", "Configure the OneLab Federation GUI")