renamed sficonfig into just config

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

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index b918573..077ee1b 100644 (file)
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -2,7 +2,7 @@
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
 
 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):
 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)
             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.setCheckState(Qt.Checked)
             else:
                 edit=QLineEdit(config.get(field), self)


@@ -26,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)


@@ -52,8 +52,7 @@ class ConfigWidget(QWidget):
     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):