X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sface%2Fscreens%2Fconfigscreen.py;h=80105a440b4b3f97c58e148e448a41173be4ca06;hb=4ab45a38d53566d12bc64403bf9b7c19108eb286;hp=b9185737c8598d596f0ba600967f83b8aef0acb1;hpb=a276ef99d41c4bf3fedf1f2a4e1729666b6f3e4d;p=sface.git
diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index b918573..80105a4 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -2,36 +2,46 @@
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)
- 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 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)
+ 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)
@@ -49,11 +59,13 @@ class ConfigWidget(QWidget):
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!", timeout=3000)
-
+ self.parent().setStatus("Configuration saved in %s !"%config.filename(), timeout=5000)
class ConfigScreen(SfaScreen):
def __init__(self, parent):
@@ -61,3 +73,4 @@ class ConfigScreen(SfaScreen):
widget = ConfigWidget(self)
self.init(widget, "Configure", "Configure the OneLab Federation GUI")
+