from mac

[iramuteq] / KeyFrame.py

diff --git a/KeyFrame.py b/KeyFrame.py
index 2c40909..ddaecf2 100755 (executable)
--- a/KeyFrame.py
+++ b/KeyFrame.py
@@ -4,7 +4,7 @@
 #Lisense: GNU/GPL
 
 import wx
-from functions import sortedby
+from functions import sortedby, DoConf
 
 # begin wxGlade: extracode
 # end wxGlade
@@ -43,7 +43,7 @@ class AlcOptFrame(wx.Dialog):
         'nr' : [wx.NewId(),wx.NewId(),u"Formes non reconnues"],
         }
         self.parent=parent
-        self.KeyConf=self.parent.KeyConf
+        self.keys=self.parent.parent.keys
         self.listlabel=[]
         self.listspin=[]
         self.listbutton=[]
@@ -58,7 +58,7 @@ class AlcOptFrame(wx.Dialog):
         for line in self.listcleori:
             cle,ids,idb,label=line
             self.listlabel.append(wx.StaticText(self, -1, label))
-            self.listspin.append(wx.SpinCtrl(self, ids,self.KeyConf.get('KEYS',cle), min=0, max=2))
+            self.listspin.append(wx.SpinCtrl(self, ids,`self.keys[cle]`, min=0, max=2))
             #if cle != 'nr' and cle!= 'num' : 
             self.listbutton.append(wx.Button(self, idb, u"voir liste"))
             self.listids.append(ids)
@@ -66,14 +66,14 @@ class AlcOptFrame(wx.Dialog):
             self.listcle.append(cle)
             
 
-        self.button_val = wx.Button(self,wx.ID_APPLY)
+        self.button_val = wx.Button(self,wx.ID_OK)
         
         for button in self.listbutton :
             self.Bind(wx.EVT_BUTTON,self.OnShowList,button)
         
         self.Bind(wx.EVT_BUTTON, self.OnApply, self.button_val)
         
-        self.dico=self.parent.parent.lexique#'dictionnaires/lexique.txt')
+        self.dico=self.parent.parent.parent.lexique#'dictionnaires/lexique.txt')
 
         self.__set_properties()
         self.__do_layout()
@@ -133,8 +133,10 @@ class AlcOptFrame(wx.Dialog):
     
     def OnApply(self,evt):
         for i in range(0,len(self.listlabel)):
-            self.KeyConf.set('KEYS',self.listcle[i],`self.listspin[i].GetValue()`)
-        self.Destroy()
+            self.keys[self.listcle[i]] = self.listspin[i].GetValue()
+        DoConf().makeoptions(['KEY'], [self.keys], outfile = self.parent.parent.ira.ConfigPath['key'])
+        self.Disable()
+        return
 
 
 class ListView(wx.Dialog):