X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fconfigscreen.py;h=56391f1c277132fcf0ac5c473054482e6d5c91b4;hp=b9185737c8598d596f0ba600967f83b8aef0acb1;hb=af944fe917c3f4236a162b318d466f3948543019;hpb=a276ef99d41c4bf3fedf1f2a4e1729666b6f3e4d

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index b918573..56391f1 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -2,7 +2,7 @@
 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):
@@ -17,7 +17,7 @@ class ConfigWidget(QWidget):
             default=config.field_default(field)
             if isinstance(default,bool):
                 edit=QCheckBox(msg)
-                if config.get(field) is True or config.get(field) == 'True':
+                if config.is_true(config.get(field)):
                     edit.setCheckState(Qt.Checked)
             else:
                 edit=QLineEdit(config.get(field), self)
@@ -25,13 +25,15 @@ class ConfigWidget(QWidget):
             setattr(self,field,edit)
             layout.addWidget (edit)
 
+        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)
             self.connect(button, SIGNAL('clicked()'), getattr(self,action))
+        layout.addLayout(hlayout)
         self.setLayout(layout)
 
 
@@ -52,8 +54,7 @@ class ConfigWidget(QWidget):
     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):