[gui/wx/ipython]

- added alt+c to break loop for editra compatibility
- added option bar
- added option 'completion_mode':
	'IPYTHON' is default ipython behavior, displaying all completion available in console
	'STC' is scintilla autocompletion mode that pop up an autocompletion list widget

IPython/gui/wx/ipython_view.py

@@ -109,7 +109,7 b' class WxConsoleView(stc.StyledTextCtrl):'
 
     def __init__(self,parent,prompt,intro="",background_color="BLACK",
                  pos=wx.DefaultPosition, ID = -1, size=wx.DefaultSize,
-                 style=0):
+                 style=0, autocomplete_mode = 'IPYTHON'):
         '''
         Initialize console view.
 
@@ -121,6 +121,9 b' class WxConsoleView(stc.StyledTextCtrl):'
         @param background_color: Can be BLACK or WHITE
         @type background_color: string
         @param other: init param of styledTextControl (can be used as-is)
+        @param autocomplete_mode: Can be 'IPYTHON' or 'STC'
+            'IPYTHON' show autocompletion the ipython way
+            'STC" show it scintilla text control way
         '''
         stc.StyledTextCtrl.__init__(self, parent, ID, pos, size, style)
 
@@ -213,6 +216,8 b' class WxConsoleView(stc.StyledTextCtrl):'
         self.setPrompt(prompt)
         self.showPrompt()
         
+        self.autocomplete_mode = autocomplete_mode
+        
         self.Bind(wx.EVT_KEY_DOWN, self._onKeypress, self)
 
     def asyncWrite(self, text):
@@ -354,7 +359,17 b' class WxConsoleView(stc.StyledTextCtrl):'
         self.removeFromTo(self.getCurrentPromptStart(),self.getCurrentLineEnd())
         self.changeLine(history)
         
+    def setCompletionMethod(self, completion):
+        if completion in ['IPYTHON','STC']:
+            self.autocomplete_mode = completion
+        else:
+            raise AttributeError
+
+    def getCompletionMethod(self, completion):
+        return self.autocomplete_mode
+        
     def writeCompletion(self, possibilities):
+        if self.autocomplete_mode == 'IPYTHON':
         max_len = len(max(possibilities,key=len))
         max_symbol =' '*max_len
         
@@ -379,6 +394,15 b' class WxConsoleView(stc.StyledTextCtrl):'
                 buf+=symbol+'\n'
                 pos = 1
         self.write(buf)
+        else:
+            possibilities.sort()  # Python sorts are case sensitive
+            self.AutoCompSetIgnoreCase(False)
+            #let compute the length ot last word
+            splitter = [' ','(','[','{']
+            last_word = self.getCurrentLine()
+            for breaker in splitter:
+                last_word = last_word.split(breaker)[-1]
+            self.AutoCompShow(len(last_word), " ".join(possibilities))
                              
     def _onKeypress(self, event, skip=True):
         '''
@@ -394,6 +418,8 b' class WxConsoleView(stc.StyledTextCtrl):'
         @return: Return True if event as been catched.
         @rtype: boolean
         '''
+
+        if not self.AutoCompActive():
         if event.GetKeyCode() == wx.WXK_HOME:
             if event.Modifiers == wx.MOD_NONE:
                 self.moveCursorOnNewValidKey()
@@ -428,6 +454,8 b' class WxConsoleView(stc.StyledTextCtrl):'
             event.Skip()
             return True
         return False
+        else:
+            event.Skip()
 
     def OnUpdateUI(self, evt):
         # check for matching braces
@@ -516,11 +544,23 b' class IPShellWidget(wx.Panel):'
 
         self.cout.write = self.text_ctrl.asyncWrite
         
+        self.completion_option = wx.CheckBox(self, -1, "Scintilla completion")
+        self.completion_option.SetValue(False)
+        option_text = wx.StaticText(self,-1,'Options:')
+        
         self.text_ctrl.Bind(wx.EVT_KEY_DOWN, self.keyPress)
+        self.Bind(wx.EVT_CHECKBOX, self.evtCheckOptionCompletion, self.completion_option)
     
         ### making the layout of the panel ###
         sizer = wx.BoxSizer(wx.VERTICAL)
         sizer.Add(self.text_ctrl, 1, wx.EXPAND)
+        option_sizer = wx.BoxSizer(wx.HORIZONTAL)
+        sizer.Add(option_sizer,0)
+        option_sizer.AddMany([(10,15),
+                              option_text,
+                              (20,15),
+                              self.completion_option
+                              ])
         self.SetAutoLayout(True)
         sizer.Fit(self)
         sizer.SetSizeHints(self)
@@ -630,12 +670,20 b' class IPShellWidget(wx.Panel):'
         autocompletions, etc.
         '''
         if event.GetKeyCode() == ord('C'):
-            if event.Modifiers == wx.MOD_CONTROL:
+            if event.Modifiers == wx.MOD_CONTROL or event.Modifiers == wx.MOD_ALT:
                 if self.cur_state == 'WAIT_END_OF_EXECUTION':
                     #we raise an exception inside the IPython thread container
                     self.IP.ce.raise_exc(KeyboardInterrupt)
                     return
                 
+        #let this before 'wx.WXK_RETURN' because we have to put 'IDLE'
+        #mode if AutoComp has been set as inactive
+        if self.cur_state == 'COMPLETING':
+            if not self.text_ctrl.AutoCompActive():
+                self.cur_state = 'IDLE'
+            else:
+                event.Skip()
+
         if event.KeyCode == wx.WXK_RETURN:
             if self.cur_state == 'IDLE':
                 #we change the state ot the state machine
@@ -680,6 +728,7 b' class IPShellWidget(wx.Panel):'
                     return
                 completed, possibilities = self.IP.complete(self.text_ctrl.getCurrentLine())
                 if len(possibilities) > 1:
+                    if self.text_ctrl.autocomplete_mode == 'IPYTHON':    
                     cur_slice = self.text_ctrl.getCurrentLine()
                     self.text_ctrl.write('\n')
                     self.text_ctrl.writeCompletion(possibilities)
@@ -688,10 +737,22 b' class IPShellWidget(wx.Panel):'
                     self.text_ctrl.showPrompt()
                     self.text_ctrl.write(cur_slice)
                 self.text_ctrl.changeLine(completed or cur_slice)
-                
+                    else:
+                        self.cur_state = 'COMPLETING'
+                        self.text_ctrl.writeCompletion(possibilities)
+                else:
+                    self.text_ctrl.changeLine(completed or cur_slice)
                 return
             event.Skip()
             
+    #------------------------ Option Section ---------------------------------
+    def evtCheckOptionCompletion(self, event):
+        if event.IsChecked():
+            self.text_ctrl.setCompletionMethod('STC')
+        else:
+            self.text_ctrl.setCompletionMethod('IPYTHON')
+        self.text_ctrl.SetFocus()
+            
     #------------------------ Hook Section -----------------------------------
     def updateHistoryTracker(self,command_line):
         '''