git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
renamed sficonfig into just config
[sface.git]
/
sface
/
screens
/
configscreen.py
diff --git
a/sface/screens/configscreen.py
b/sface/screens/configscreen.py
index
6b8e86b
..
077ee1b
100644
(file)
--- a/
sface/screens/configscreen.py
+++ b/
sface/screens/configscreen.py
@@
-1,8
+1,8
@@
-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.
sfi
config import config
+from sface.config import config
from sface.screens.sfascreen import SfaScreen
class ConfigWidget(QWidget):
from sface.screens.sfascreen import SfaScreen
class ConfigWidget(QWidget):
@@
-17,7
+17,8
@@
class ConfigWidget(QWidget):
default=config.field_default(field)
if isinstance(default,bool):
edit=QCheckBox(msg)
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:
edit=QLineEdit(config.get(field), self)
edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
else:
edit=QLineEdit(config.get(field), self)
edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
@@
-25,7
+26,7
@@
class ConfigWidget(QWidget):
layout.addWidget (edit)
for (action,label) in [('apply','Apply'),
layout.addWidget (edit)
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)
button=QPushButton(label, self)
button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
layout.addWidget(button, 0, Qt.AlignRight)
@@
-38,17
+39,20
@@
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")
def save(self):
self.apply()
config.save_config()
config.display("after apply")
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):