X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fconfigscreen.py;fp=sface%2Fscreens%2Fconfigscreen.py;h=dc646208b115d96b0d848074d872652279a410e8;hp=1197a9f0813152b4d5259f512bd09a90aaee7e96;hb=dea293b69063b10026b56072ef3d1006df177d20;hpb=a13717ab1e87ac098acbbb6750f1fef967b03df1

diff --git a/sface/screens/configscreen.py b/sface/screens/configscreen.py
index 1197a9f..dc64620 100644
--- a/sface/screens/configscreen.py
+++ b/sface/screens/configscreen.py
@@ -20,24 +20,48 @@ static_labels = {
 class ConfigWidget(QWidget):
     def __init__(self, parent):
         QWidget.__init__(self, parent)
+        # init can be called several times for when the config dir is changed
+        self.inited=False
+        self.init ()
+
+    def store_local (self, name, value):
+        setattr (self, 'widget_'+name, value)
+    def retrieve_local (self, name):
+        return getattr (self, 'widget_'+name, None)
+
+    def init (self):
+        # if already inited we just need to set the values
+        if self.inited:
+            for (field,msg) in config.field_labels():
+                edit = self.retrieve_local(field)
+                if isinstance (edit,QCheckBox):
+                    if config.is_true(config.get(field)): edit.setCheckState (Qt.Checked)
+                    else: edit.setCheckState (Qt.Unchecked)
+                else:
+                    edit.setText (config.get(field) or "")
+            return
 
+        # otherwise we need to build the whole thing up
         glayout = QGridLayout()
         row = 0
         for (field,msg) in config.field_labels():
-            # edit : text or checkbox
-            default=config.field_default(field)
+            
             if static_labels.has_key(field):
                 labels=static_labels[field]
                 if not isinstance(labels,list): labels = [ labels, ]
                 for label in labels:
                     glayout.addWidget(QLabel(label),row,1)
                     row+=1
+            # edit : text or checkbox
+            default=config.field_default(field)
             if isinstance(default,bool):
                 edit=QCheckBox(msg)
+                self.store_local (field, edit)
                 if config.is_true(config.get(field)):
                     edit.setCheckState(Qt.Checked)
             else:
                 edit=QLineEdit(config.get(field) or "", self)
+                self.store_local (field, edit)
                 edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
             setattr(self,field,edit)
 
@@ -48,22 +72,37 @@ class ConfigWidget(QWidget):
 
         hlayout = QHBoxLayout()
         hlayout.addStretch()
-        for (action,label) in [('apply','Apply'),
-                               ('save','Apply && Save')]:
+        def conf_button (action,label):
             button=QPushButton(label, self)
             button.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
-            hlayout.addWidget(button, 0, Qt.AlignRight)
+            hlayout.addWidget(button)
             hlayout.addSpacing(10)
             self.connect(button, SIGNAL('clicked()'), getattr(self,action))
 
+        conf_button ('load','Load Conf. Dir')
+        
+        # the config dir edit dialog
+        edit=QLineEdit (config.get_dirname(),self)
+        self.store_local('config_dirname',edit)
+        edit.setAttribute(Qt.WA_MacShowFocusRect, 0)
+        edit.setSizePolicy(QSizePolicy.Expanding,QSizePolicy.Maximum)
+        self.connect(edit,SIGNAL ('returnPressed()'), self.load)
+        hlayout.addWidget (edit)
+        hlayout.addSpacing(10)
+
+        conf_button ('apply','Apply Only'),
+        conf_button ('save','Apply && Save')
+
         layout = QVBoxLayout()
         layout.addLayout(glayout)
         layout.addLayout(hlayout)
         layout.addStretch()
         self.setLayout(layout)
+        self.inited=True
 
 
     def apply(self):
+        print 'applying'
         for field in config.fields():
             widget=getattr(self,field)
             if isinstance(widget,QCheckBox):
@@ -83,7 +122,20 @@ class ConfigWidget(QWidget):
     def save(self):
         self.apply()
         config.save_config()
-        self.parent().setStatus("<font color='green'>Configuration saved in %s !</font>"%config.filename(), timeout=5000)
+        self.parent().setStatus("<font color='green'>Configuration saved in %s !</font>"%config.config_file(), timeout=5000)
+
+    # switch to another config dir
+    def load(self):
+        # obtain new dor somehow
+        
+        edit=self.retrieve_local('config_dirname')
+        newdir=str(edit.text())
+        newdir+='/'
+        print 'installing',newdir
+        config.set_dirname (newdir)
+        self.init()
+        self.parent().signalAll('configurationChanged')
+
 
 class ConfigScreen(SfaScreen):
     def __init__(self, parent):