X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sface%2Fscreens%2Fconfigscreen.py;h=ef732f52502efc19844995950d5c55575e9a9be4;hb=0c8751587f38c9b3976233bdebce34dbd548085f;hp=fd2babcd570fcd9116717c16eafc996a0c89ba81;hpb=69b247b9b7075f35257193dbb7df919ce6befa9e;p=sface.git
diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index fd2babc..ef732f5 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -1,42 +1,90 @@
-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
+from sfa.util.version import version_core
+
+static_labels = {
+ 'slice' : "local SFA version : %s" % version_core()['code_tag'],
+ 'registry': "usual port for registry: 12345",
+ 'slicemgr': ["usual port for slice manager: 12347","usual port for aggregate: 12346"],
+}
+
class ConfigWidget(QWidget):
def __init__(self, parent):
QWidget.__init__(self, parent)
- label1 = QLabel("User HRN:", self)
- self.user = QLineEdit(config.getUser(), self)
- label2 = QLabel("Slice HRN:", self)
- self.slice = QLineEdit(config.getSlice(), self)
- apply = QPushButton("Apply", self)
- apply.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
-
+ glayout = QGridLayout()
+ row = 0
+ for (field,msg) in config.field_labels():
+ # edit : text or checkbox
+ default=config.field_default(field)
+ if static_labels.has_key(field):
+ labels=static_labels[field]
+ if not isinstance(labels,list): labels = [ labels, ]
+ for label in labels:
+ glayout.addWidget(QLabel(label),row,1)
+ row+=1
+ if isinstance(default,bool):
+ edit=QCheckBox(msg)
+ if config.is_true(config.get(field)):
+ edit.setCheckState(Qt.Checked)
+ else:
+ edit=QLineEdit(config.get(field) or "", self)
+ edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
+ setattr(self,field,edit)
+
+ glayout.addWidget(QLabel(msg+":",self), row, 0)
+ glayout.addWidget(edit, row, 1)
+
+ row += 1
+
+ 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 = QVBoxLayout()
- layout.addWidget(label1)
- layout.addWidget(self.user)
- layout.addWidget(label2)
- layout.addWidget(self.slice)
- layout.addWidget(apply, 0, Qt.AlignRight)
+ layout.addLayout(glayout)
+ layout.addLayout(hlayout)
layout.addStretch()
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")
+
+ self.parent().signalAll('configurationChanged')
+
+
+ def save(self):
+ self.apply()
config.save_config()
- self.parent().setStatus("Configuration saved!")
-
+ 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 SFA crawler")
+