X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fconfigscreen.py;h=1197a9f0813152b4d5259f512bd09a90aaee7e96;hp=6b8e86b8e94c9618db10ac20f7a1265c22e0d168;hb=e05a4f6ac4c3e6d0e8a88ad31ec8516440cdd2b3;hpb=e5eb62ef022ab41be7f2eb0b3ac8723874d1601a

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index 6b8e86b..1197a9f 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -1,36 +1,65 @@
 
-from PyQt4.QtCore import SIGNAL, Qt
-from PyQt4.QtGui import QWidget, QLabel, QLineEdit, QPushButton, QCheckBox, 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
+from sface.version import version_dict
+
+static_labels = {
+    'slice' :  [ 
+        "Sface : %s (%s)" % (version_dict()['code_tag'], version_dict()['code_url']),
+        "with (local) SFA libs : %s (%s)" % (version_core()['code_tag'],version_core()['code_url']),
+        ] ,
+    '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)
 
-        layout = QVBoxLayout()
+        glayout = QGridLayout()
+        row = 0
         for (field,msg) in config.field_labels():
-            # label
-            layout.addWidget(QLabel(msg,self))
             # 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)
-                edit.setCheckState(config.get(field))
+                if config.is_true(config.get(field)):
+                    edit.setCheckState(Qt.Checked)
             else:
-                edit=QLineEdit(config.get(field), self)
+                edit=QLineEdit(config.get(field) or "", self)
                 edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
             setattr(self,field,edit)
-            layout.addWidget (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')]:
+                               ('save','Apply && Save')]:
             button=QPushButton(label, self)
             button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
-            layout.addWidget(button, 0, Qt.AlignRight)
-            layout.addStretch()
+            hlayout.addWidget(button, 0, Qt.AlignRight)
+            hlayout.addSpacing(10)
             self.connect(button, SIGNAL('clicked()'), getattr(self,action))
+
+        layout = QVBoxLayout()
+        layout.addLayout(glayout)
+        layout.addLayout(hlayout)
+        layout.addStretch()
         self.setLayout(layout)
 
 
@@ -38,21 +67,28 @@ class ConfigWidget(QWidget):
         for field in config.fields():
             widget=getattr(self,field)
             if isinstance(widget,QCheckBox):
-                config.set(field,widget.checkState())
+                if widget.checkState() == Qt.Checked:
+                    config.set(field, True)
+                else:
+                    config.set(field, False)
             else:
-                config.set(field,str(widget.text()))
-        self.parent().setStatus("<font color='green'>Settings loaded for current session</font>",timeout=5000)
+                config.set(field, str(widget.text()))
+
+        self.parent().setStatus("<font color='green'>Settings loaded for current session</font>", timeout=5000)
         config.display("after apply")
 
+        self.parent().signalAll('configurationChanged')
+
+
     def save(self):
         self.apply()
         config.save_config()
-        self.parent().setStatus("<font color='green'>Configuration saved!</font>", timeout=3000)
-        
+        self.parent().setStatus("<font color='green'>Configuration saved in %s !</font>"%config.filename(), timeout=5000)
 
 class ConfigScreen(SfaScreen):
     def __init__(self, parent):
         SfaScreen.__init__(self, parent)
         
         widget = ConfigWidget(self)
-        self.init(widget, "Configure", "Configure the OneLab Federation GUI")
+        self.init(widget, "Configure", "Configure the OneLab SFA crawler")
+