fix for empty sfi_config

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

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index 6b8e86b..80105a4 100644 (file)
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -1,36 +1,47 @@
 
 

-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
 
 class ConfigWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 
 from sface.screens.sfascreen import SfaScreen
 
 class ConfigWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
 

-        layout = QVBoxLayout()
+        glayout = QGridLayout()
+        row = 0

         for (field,msg) in config.field_labels():
         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)
             # edit : text or checkbox
             default=config.field_default(field)
             if isinstance(default,bool):
                 edit=QCheckBox(msg)

-                edit.setCheckState(config.get(field))
+                if config.is_true(config.get(field)):
+                    edit.setCheckState(Qt.Checked)

             else:
             else:

-                edit=QLineEdit(config.get(field), self)
+                edit=QLineEdit(config.get(field) or "", self)

                 edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
             setattr(self,field,edit)
                 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'),
         for (action,label) in [('apply','Apply'),

-                               ('save','Apply & Save')]:
+                               ('save','Apply && Save')]:

             button=QPushButton(label, self)
             button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
             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))
             self.connect(button, SIGNAL('clicked()'), getattr(self,action))

+
+        layout = QVBoxLayout()
+        layout.addLayout(glayout)
+        layout.addLayout(hlayout)
+        layout.addStretch()

         self.setLayout(layout)
 
 
         self.setLayout(layout)
 
 


@@ -38,17 +49,23 @@ class ConfigWidget(QWidget):
         for field in config.fields():
             widget=getattr(self,field)
             if isinstance(widget,QCheckBox):
         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:
             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")
 
         config.display("after apply")
 

+        self.parent().signalAll('configurationChanged')
+
+

     def save(self):
         self.apply()
         config.save_config()
     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):
 
 class ConfigScreen(SfaScreen):
     def __init__(self, parent):


@@ -56,3 +73,4 @@ class ConfigScreen(SfaScreen):
         
         widget = ConfigWidget(self)
         self.init(widget, "Configure", "Configure the OneLab Federation GUI")
         
         widget = ConfigWidget(self)
         self.init(widget, "Configure", "Configure the OneLab Federation GUI")

+