X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fconfigscreen.py;h=3f2440e7964a4bc57462b58e032cde8eb5cc5f42;hp=56391f1c277132fcf0ac5c473054482e6d5c91b4;hb=875c4f3aa289cba9ed73de07e4e1fab1770ae9ec;hpb=af944fe917c3f4236a162b318d466f3948543019 diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py index 56391f1..3f2440e 100644 --- a/sface/screens/configscreen.py +++ b/sface/screens/configscreen.py @@ -9,10 +9,9 @@ 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): @@ -23,7 +22,11 @@ class ConfigWidget(QWidget): edit=QLineEdit(config.get(field), 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() @@ -32,8 +35,13 @@ class ConfigWidget(QWidget): 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.addLayout(glayout) layout.addLayout(hlayout) + layout.addStretch() self.setLayout(layout) @@ -51,6 +59,9 @@ 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() @@ -62,3 +73,4 @@ class ConfigScreen(SfaScreen): widget = ConfigWidget(self) self.init(widget, "Configure", "Configure the OneLab Federation GUI") +