[gui/wx] added options save/restore for history widget

IPython/gui/wx/ipython_history.py

@@ -28,10 +28,30 b' class IPythonHistoryPanel(wx.Panel):'
         self.filter_cmd   = wx.CheckBox(self, -1, "!: Sys commands")
         self.filter_magic = wx.CheckBox(self, -1, "%: Magic keys")
 
-        self.filter_empty.SetValue(flt_empty)
-        self.filter_doc.SetValue(flt_doc)
-        self.filter_cmd.SetValue(flt_cmd)
-        self.filter_magic.SetValue(flt_magic)
+        self.options={'filter_empty':{'value':'True',
+                                      'checkbox':self.filter_empty,'True':True,'False':False,
+                                      'setfunc':lambda x:None},
+                      'filter_doc':{'value':'True',
+                                    'checkbox':self.filter_doc,'True':True,'False':False,
+                                    'setfunc':lambda x:None},
+                      'filter_cmd':{'value':'True',
+                                    'checkbox':self.filter_cmd,'True':True,'False':False,
+                                    'setfunc':lambda x:None},
+                      'filter_magic':{'value':'True',
+                                      'checkbox':self.filter_magic,'True':True,'False':False,
+                                      'setfunc':lambda x:None},
+                     }
+        self.reloadOptions(self.options)
+
+        self.filter_empty.Bind(wx.EVT_CHECKBOX, self.evtCheckEmptyFilter)
+        self.filter_doc.Bind(wx.EVT_CHECKBOX, self.evtCheckDocFilter)
+        self.filter_cmd.Bind(wx.EVT_CHECKBOX, self.evtCheckCmdFilter)
+        self.filter_magic.Bind(wx.EVT_CHECKBOX, self.evtCheckMagicFilter)
+        
+        #self.filter_empty.SetValue(flt_empty)
+        #self.filter_doc.SetValue(flt_doc)
+        #self.filter_cmd.SetValue(flt_cmd)
+        #self.filter_magic.SetValue(flt_magic)
         
         sizer = wx.BoxSizer(wx.VERTICAL)
 
@@ -73,6 +93,50 b' class IPythonHistoryPanel(wx.Panel):'
         if add:
                 self.text_ctrl.AppendText(history_line+'\n')
 
+#------------------------ Option Section -----------------------------------
+    def processOptionCheckedEvt(self, event, name):
+        if event.IsChecked():
+            self.options[name]['value']='True'
+        else:
+            self.options[name]['value']='False'
+        self.updateOptionTracker(name,
+                                 self.options[name]['value'])
+        
+    def evtCheckEmptyFilter(self, event):
+        self.processOptionCheckedEvt(event, 'filter_empty')
+        
+    def evtCheckDocFilter(self, event):
+        self.processOptionCheckedEvt(event, 'filter_doc')
+
+    def evtCheckCmdFilter(self, event):
+        self.processOptionCheckedEvt(event, 'filter_cmd')
+
+    def evtCheckMagicFilter(self, event):
+        self.processOptionCheckedEvt(event, 'filter_magic')
+        
+    def getOptions(self):
+        return self.options
+    
+    def reloadOptions(self,options):
+        self.options = options
+        for key in self.options.keys():
+            value = self.options[key]['value']
+            self.options[key]['checkbox'].SetValue(self.options[key][value])
+            self.options[key]['setfunc'](value)
+
+#------------------------ Hook Section -----------------------------------
+    def updateOptionTracker(self,name,value):
+        '''
+        Default history tracker (does nothing)
+        '''
+        pass
+    
+    def setOptionTrackerHook(self,func):
+        '''
+        Define a new history tracker
+        '''
+        self.updateOptionTracker = func
+
 
 #----------------------------------------------------------------------
 # Font definition for Styled Text Control

IPython/gui/wx/options.conf

@@ -1,2 +1,6 b''
 completion=IPYTHON
 background_color=BLACK
+filter_empty=True
+filter_magic=True
+filter_doc=True
+filter_cmd=True

IPython/gui/wx/wxIPython.py

@@ -34,16 +34,17 b' class MyFrame(wx.Frame):'
         #create differents panels and make them persistant 
         self.history_panel    = IPythonHistoryPanel(self)
         
-        self.ipython_panel    = IPShellWidget(self,background_color = "BLACK")
+        self.history_panel.setOptionTrackerHook(self.optionSave)
         
+        self.ipython_panel    = IPShellWidget(self,background_color = "BLACK")
         #self.ipython_panel    = IPShellWidget(self,background_color = "WHITE")
 
         self.ipython_panel.setHistoryTrackerHook(self.history_panel.write)
         self.ipython_panel.setStatusTrackerHook(self.updateStatus)
         self.ipython_panel.setAskExitHandler(self.OnExitDlg)
         self.ipython_panel.setOptionTrackerHook(self.optionSave)
-        self.optionLoad()
 
+        self.optionLoad()
         
         self.statusbar = self.createStatus()
         self.createMenu()
@@ -84,9 +85,16 b' class MyFrame(wx.Frame):'
 
     def optionSave(self, name, value):
         opt = open('options.conf','w')
-        options = self.ipython_panel.getOptions()
-        for key in options.keys():
-            opt.write(key + '=' + options[key]['value']+'\n')
+
+        try:
+            options_ipython_panel = self.ipython_panel.getOptions()
+            options_history_panel = self.history_panel.getOptions()
+
+            for key in options_ipython_panel.keys():
+                opt.write(key + '=' + options_ipython_panel[key]['value']+'\n')
+            for key in options_history_panel.keys():
+                opt.write(key + '=' + options_history_panel[key]['value']+'\n')
+        finally:    
         opt.close()
         
     def optionLoad(self):
@@ -94,13 +102,20 b' class MyFrame(wx.Frame):'
         lines = opt.readlines()
         opt.close()
                       
-        options = self.ipython_panel.getOptions()
+        options_ipython_panel = self.ipython_panel.getOptions()
+        options_history_panel = self.history_panel.getOptions()
         
         for line in lines:
             key = line.split('=')[0]
             value = line.split('=')[1].replace('\n','').replace('\r','')
-            options[key]['value'] = value
-        self.ipython_panel.reloadOptions(options)
+            if key in options_ipython_panel.keys():
+                options_ipython_panel[key]['value'] = value
+            elif key in options_history_panel.keys():
+                options_history_panel[key]['value'] = value
+            else:
+                print >>sys.__stdout__,"Warning: key ",key,"not found in widget options. Check Options.conf"
+        self.ipython_panel.reloadOptions(options_ipython_panel)
+        self.history_panel.reloadOptions(options_history_panel)
         
     def createMenu(self):
         """local method used to create one menu bar"""