--- a/plugins/python/PythonEditor.py Tue Dec 20 23:37:06 2011 +0100
+++ b/plugins/python/PythonEditor.py Wed Dec 21 19:42:49 2011 +0100
@@ -2,6 +2,8 @@
+from controls import EditorPanel if wx.Platform == '__WXMSW__':
faces = { 'times': 'Times New Roman',
@@ -27,13 +29,6 @@
-def AppendMenu(parent, help, id, kind, text):- if wx.VERSION >= (2, 6, 0):- parent.Append(help=help, id=id, kind=kind, text=text)- parent.Append(helpString=help, id=id, kind=kind, item=text) ] = [wx.NewId() for _init_ctrls in range(1)]
@@ -58,203 +53,225 @@
-class PythonEditor(stc.StyledTextCtrl):+class PythonEditor(EditorPanel): - def __init__(self, parent, window, controler):- stc.StyledTextCtrl.__init__(self, parent, ID_PYTHONEDITOR, wx.DefaultPosition, + def _init_Editor(self, prnt): + self.Editor = stc.StyledTextCtrl(id=ID_PYTHONEDITOR, parent=prnt, + name="TextViewer", pos=wx.DefaultPosition, + size=wx.DefaultSize, style=0) - self.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN)- self.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT)- self.SetLexer(stc.STC_LEX_PYTHON)- self.SetKeyWords(0, " ".join(keyword.kwlist))+ self.Editor.CmdKeyAssign(ord('B'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMIN) + self.Editor.CmdKeyAssign(ord('N'), stc.STC_SCMOD_CTRL, stc.STC_CMD_ZOOMOUT) - self.SetProperty("fold", "1")- self.SetProperty("tab.timmy.whinge.level", "1")+ self.Editor.SetLexer(stc.STC_LEX_PYTHON) + self.Editor.SetKeyWords(0, " ".join(keyword.kwlist)) - self.SetViewWhiteSpace(False)- #self.SetBufferedDraw(False)- #self.SetEOLMode(stc.STC_EOL_CRLF)- #self.SetUseAntiAliasing(True)+ self.Editor.SetProperty("fold", "1") + self.Editor.SetProperty("tab.timmy.whinge.level", "1") + self.Editor.SetMargins(0,0) + self.Editor.SetViewWhiteSpace(False) - self.SetEdgeMode(stc.STC_EDGE_BACKGROUND)+ self.Editor.SetEdgeMode(stc.STC_EDGE_BACKGROUND) + self.Editor.SetEdgeColumn(78) # Set up the numbers in the margin for margin #1
- self.SetMarginType(1, wx.stc.STC_MARGIN_NUMBER)+ self.Editor.SetMarginType(1, wx.stc.STC_MARGIN_NUMBER) # Reasonable value for, say, 4-5 digits using a mono font (40 pix)
- self.SetMarginWidth(1, 40)+ self.Editor.SetMarginWidth(1, 40) # Setup a margin to hold fold markers
- self.SetMarginType(2, stc.STC_MARGIN_SYMBOL)- self.SetMarginMask(2, stc.STC_MASK_FOLDERS)- self.SetMarginSensitive(2, True)- self.SetMarginWidth(2, 12)+ self.Editor.SetMarginType(2, stc.STC_MARGIN_SYMBOL) + self.Editor.SetMarginMask(2, stc.STC_MASK_FOLDERS) + self.Editor.SetMarginSensitive(2, True) + self.Editor.SetMarginWidth(2, 12) if self.fold_symbols == 0:
# Arrow pointing right for contracted folders, arrow pointing down for expanded
- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_ARROWDOWN, "black", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_ARROW, "black", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "black", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "black", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black")+ self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_ARROWDOWN, "black", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_ARROW, "black", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "black", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "black", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black") elif self.fold_symbols == 1:
# Plus for contracted folders, minus for expanded
- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_MINUS, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_PLUS, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black")+ self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_MINUS, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_PLUS, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_EMPTY, "white", "black") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_EMPTY, "white", "black") elif self.fold_symbols == 2:
# Like a flattened tree control using circular headers and curved joins
- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_CIRCLEMINUS, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_CIRCLEPLUS, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNERCURVE, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_CIRCLEPLUSCONNECTED, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_CIRCLEMINUSCONNECTED, "white", "#404040")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNERCURVE, "white", "#404040")+ self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_CIRCLEMINUS, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_CIRCLEPLUS, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNERCURVE, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_CIRCLEPLUSCONNECTED, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_CIRCLEMINUSCONNECTED, "white", "#404040") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNERCURVE, "white", "#404040") elif self.fold_symbols == 3:
# Like a flattened tree control using square headers
- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_BOXMINUS, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_BOXPLUS, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNER, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_BOXPLUSCONNECTED, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_BOXMINUSCONNECTED, "white", "#808080")- self.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNER, "white", "#808080")+ self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPEN, stc.STC_MARK_BOXMINUS, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDER, stc.STC_MARK_BOXPLUS, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERSUB, stc.STC_MARK_VLINE, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERTAIL, stc.STC_MARK_LCORNER, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEREND, stc.STC_MARK_BOXPLUSCONNECTED, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDEROPENMID, stc.STC_MARK_BOXMINUSCONNECTED, "white", "#808080") + self.Editor.MarkerDefine(stc.STC_MARKNUM_FOLDERMIDTAIL, stc.STC_MARK_TCORNER, "white", "#808080") - self.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdateUI)- self.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick)- self.Bind(wx.EVT_KEY_DOWN, self.OnKeyPressed)+ self.Editor.Bind(stc.EVT_STC_UPDATEUI, self.OnUpdateUI) + self.Editor.Bind(stc.EVT_STC_MARGINCLICK, self.OnMarginClick) + self.Editor.Bind(wx.EVT_KEY_DOWN, self.OnKeyPressed) if wx.Platform == '__WXMSW__':
- self.StyleSetSpec(stc.STC_STYLE_DEFAULT, - 'fore:#000000,back:#FFFFFF,face:Courier New')+ self.Editor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Courier New') elif wx.Platform == '__WXMAC__':
# TODO: if this looks fine on Linux too, remove the Mac-specific case
# and use this whenever OS != MSW.
- self.StyleSetSpec(stc.STC_STYLE_DEFAULT, - 'fore:#000000,back:#FFFFFF,face:Monaco')+ self.Editor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Monaco') defsize = wx.SystemSettings.GetFont(wx.SYS_ANSI_FIXED_FONT).GetPointSize()
- self.StyleSetSpec(stc.STC_STYLE_DEFAULT, - 'fore:#000000,back:#FFFFFF,face:Courier,size:%d'%defsize)+ self.Editor.StyleSetSpec(stc.STC_STYLE_DEFAULT, 'fore:#000000,back:#FFFFFF,face:Courier,size:%d'%defsize) # Clear styles and revert to default.
+ self.Editor.StyleClearAll() # Following style specs only indicate differences from default.
# The rest remains unchanged.
- self.StyleSetSpec(wx.stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2') + self.Editor.StyleSetSpec(wx.stc.STC_STYLE_LINENUMBER,'fore:#000000,back:#99A9C2') - self.StyleSetSpec(wx.stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00')+ self.Editor.StyleSetSpec(wx.stc.STC_STYLE_BRACELIGHT,'fore:#00009D,back:#FFFF00') - self.StyleSetSpec(wx.stc.STC_STYLE_BRACEBAD,'fore:#00009D,back:#FF0000')+ self.Editor.StyleSetSpec(wx.stc.STC_STYLE_BRACEBAD,'fore:#00009D,back:#FF0000') - self.StyleSetSpec(wx.stc.STC_STYLE_INDENTGUIDE, "fore:#CDCDCD")+ self.Editor.StyleSetSpec(wx.stc.STC_STYLE_INDENTGUIDE, "fore:#CDCDCD") - self.StyleSetSpec(wx.stc.STC_P_DEFAULT, 'fore:#000000')+ self.Editor.StyleSetSpec(wx.stc.STC_P_DEFAULT, 'fore:#000000') - self.StyleSetSpec(wx.stc.STC_P_COMMENTLINE, 'fore:#008000,back:#F0FFF0')- self.StyleSetSpec(wx.stc.STC_P_COMMENTBLOCK, 'fore:#008000,back:#F0FFF0')+ self.Editor.StyleSetSpec(wx.stc.STC_P_COMMENTLINE, 'fore:#008000,back:#F0FFF0') + self.Editor.StyleSetSpec(wx.stc.STC_P_COMMENTBLOCK, 'fore:#008000,back:#F0FFF0') - self.StyleSetSpec(wx.stc.STC_P_NUMBER, 'fore:#008080')+ self.Editor.StyleSetSpec(wx.stc.STC_P_NUMBER, 'fore:#008080') - self.StyleSetSpec(wx.stc.STC_P_STRING, 'fore:#800080')- self.StyleSetSpec(wx.stc.STC_P_CHARACTER, 'fore:#800080')+ self.Editor.StyleSetSpec(wx.stc.STC_P_STRING, 'fore:#800080') + self.Editor.StyleSetSpec(wx.stc.STC_P_CHARACTER, 'fore:#800080') - self.StyleSetSpec(wx.stc.STC_P_WORD, 'fore:#000080,bold')+ self.Editor.StyleSetSpec(wx.stc.STC_P_WORD, 'fore:#000080,bold') - self.StyleSetSpec(wx.stc.STC_P_TRIPLE, 'fore:#800080,back:#FFFFEA')- self.StyleSetSpec(wx.stc.STC_P_TRIPLEDOUBLE, 'fore:#800080,back:#FFFFEA')+ self.Editor.StyleSetSpec(wx.stc.STC_P_TRIPLE, 'fore:#800080,back:#FFFFEA') + self.Editor.StyleSetSpec(wx.stc.STC_P_TRIPLEDOUBLE, 'fore:#800080,back:#FFFFEA') - self.StyleSetSpec(wx.stc.STC_P_CLASSNAME, 'fore:#0000FF,bold')+ self.Editor.StyleSetSpec(wx.stc.STC_P_CLASSNAME, 'fore:#0000FF,bold') - self.StyleSetSpec(wx.stc.STC_P_DEFNAME, 'fore:#008080,bold')+ self.Editor.StyleSetSpec(wx.stc.STC_P_DEFNAME, 'fore:#008080,bold') - self.StyleSetSpec(wx.stc.STC_P_OPERATOR, 'fore:#800000,bold')+ self.Editor.StyleSetSpec(wx.stc.STC_P_OPERATOR, 'fore:#800000,bold') # Identifiers. I leave this as not bold because everything seems
# to be an identifier if it doesn't match the above criterae
- self.StyleSetSpec(wx.stc.STC_P_IDENTIFIER, 'fore:#000000')+ self.Editor.StyleSetSpec(wx.stc.STC_P_IDENTIFIER, 'fore:#000000') - self.SetCaretForeground("BLUE")+ self.Editor.SetCaretForeground("BLUE") - self.SetSelBackground(1, '#66CCFF')+ self.Editor.SetSelBackground(1, '#66CCFF') - self.SetSelBackground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT))- self.SetSelForeground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT))+ self.Editor.SetSelBackground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHT)) + self.Editor.SetSelForeground(True, wx.SystemSettings_GetColour(wx.SYS_COLOUR_HIGHLIGHTTEXT)) # register some images for use in the AutoComplete box.
#self.RegisterImage(1, images.getSmilesBitmap())
+ self.Editor.RegisterImage(1, wx.ArtProvider.GetBitmap(wx.ART_DELETE, size=(16,16)))
+ self.Editor.RegisterImage(2, wx.ArtProvider.GetBitmap(wx.ART_NEW, size=(16,16)))
+ self.Editor.RegisterImage(3, wx.ArtProvider.GetBitmap(wx.ART_COPY, size=(16,16)))
# Indentation and tab stuff
- self.SetIndent(4) # Proscribed indent size for wx- self.SetIndentationGuides(True) # Show indent guides- self.SetBackSpaceUnIndents(True)# Backspace unindents rather than delete 1 space- self.SetTabIndents(True) # Tab key indents- self.SetTabWidth(4) # Proscribed tab size for wx- self.SetUseTabs(False) # Use spaces rather than tabs, or+ self.Editor.SetIndent(4) # Proscribed indent size for wx + self.Editor.SetIndentationGuides(True) # Show indent guides + self.Editor.SetBackSpaceUnIndents(True)# Backspace unindents rather than delete 1 space + self.Editor.SetTabIndents(True) # Tab key indents + self.Editor.SetTabWidth(4) # Proscribed tab size for wx + self.Editor.SetUseTabs(False) # Use spaces rather than tabs, or # TabTimmy will complain!
- self.SetViewWhiteSpace(False) # Don't view white space+ self.Editor.SetViewWhiteSpace(False) # Don't view white space # EOL: Since we are loading/saving ourselves, and the
# strings will always have \n's in them, set the STC to
- self.SetEOLMode(wx.stc.STC_EOL_LF)+ self.Editor.SetEOLMode(wx.stc.STC_EOL_LF) + self.Editor.SetViewEOL(False) # No right-edge mode indicator
- self.SetEdgeMode(stc.STC_EDGE_NONE)+ self.Editor.SetEdgeMode(stc.STC_EDGE_NONE) + self.Editor.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT|wx.stc.STC_MOD_BEFOREDELETE) - self.Controler = controler- self.ParentWindow = window+ self.Editor.Bind(wx.stc.EVT_STC_DO_DROP, self.OnDoDrop, id=ID_PYTHONEDITOR) + self.Editor.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus) + self.Editor.Bind(wx.stc.EVT_STC_MODIFIED, self.OnModification, id=ID_PYTHONEDITOR) + def __init__(self, parent, controler, window): + EditorPanel.__init__(self, parent, "", window, controler) - self.DisableEvents = True+ self.DisableEvents = False self.CurrentAction = None
- self.SetModEventMask(wx.stc.STC_MOD_BEFOREINSERT|wx.stc.STC_MOD_BEFOREDELETE)- self.Bind(wx.stc.EVT_STC_DO_DROP, self.OnDoDrop, id=ID_PYTHONEDITOR)- self.Bind(wx.EVT_KILL_FOCUS, self.OnKillFocus)- self.Bind(wx.stc.EVT_STC_MODIFIED, self.OnModification, id=ID_PYTHONEDITOR)+ img = wx.Bitmap(self.Controler.GetIconPath("Cfile.png"), wx.BITMAP_TYPE_PNG).ConvertToImage() + self.SetIcon(wx.BitmapFromImage(img.Rescale(16, 16))) + self.Controler.OnCloseEditor() + fullname = self.Controler.PlugFullName() + if not self.Controler.PythonIsSaved(): + return "~%s~" % fullname + def GetBufferState(self): + return self.Controler.GetBufferState() + self.Controler.LoadPrevious() + self.Controler.LoadNext() def OnModification(self, event):
if not self.DisableEvents:
mod_type = event.GetModificationType()
if not (mod_type&wx.stc.STC_PERFORMED_UNDO or mod_type&wx.stc.STC_PERFORMED_REDO):
if mod_type&wx.stc.STC_MOD_BEFOREINSERT:
- if self.CurrentAction == None:+ if self.CurrentAction is None: elif self.CurrentAction[0] != "Add" or self.CurrentAction[1] != event.GetPosition() - 1:
self.Controler.EndBuffering()
self.CurrentAction = ("Add", event.GetPosition())
+ wx.CallAfter(self.RefreshModel) elif mod_type&wx.stc.STC_MOD_BEFOREDELETE:
if self.CurrentAction == None:
@@ -262,6 +279,7 @@
self.Controler.EndBuffering()
self.CurrentAction = ("Delete", event.GetPosition())
+ wx.CallAfter(self.RefreshModel) def OnDoDrop(self, event):
@@ -269,23 +287,22 @@
wx.CallAfter(self.RefreshModel)
- def IsViewing(self, name):- return self.Name == name # Buffer the last model state
self.Controler.BufferPython()
+ if self.ParentWindow is not None: self.ParentWindow.RefreshTitle()
self.ParentWindow.RefreshFileMenu()
self.ParentWindow.RefreshEditMenu()
+ self.ParentWindow.RefreshPageTitles() def StartBuffering(self):
self.Controler.StartBuffering()
+ if self.ParentWindow is not None: self.ParentWindow.RefreshTitle()
self.ParentWindow.RefreshFileMenu()
self.ParentWindow.RefreshEditMenu()
+ self.ParentWindow.RefreshPageTitles() if self.CurrentAction != None:
@@ -295,31 +312,31 @@
self.DisableEvents = True
- old_cursor_pos = self.GetCurrentPos()- old_text = self.GetText()+ old_cursor_pos = self.Editor.GetCurrentPos() + old_text = self.Editor.GetText() new_text = self.Controler.GetPythonCode()
+ self.Editor.SetText(new_text) new_cursor_pos = GetCursorPos(old_text, new_text)
if new_cursor_pos != None:
- self.GotoPos(new_cursor_pos)+ self.Editor.GotoPos(new_cursor_pos) - self.GotoPos(old_cursor_pos)+ self.Editor.GotoPos(old_cursor_pos) + self.Editor.ScrollToColumn(0) + self.Editor.EmptyUndoBuffer() self.DisableEvents = False
+ self.Editor.Colourise(0, -1) - self.Controler.SetPythonCode(self.GetText())+ self.Controler.SetPythonCode(self.Editor.GetText()) def OnKeyPressed(self, event):
- if self.CallTipActive():+ if self.Editor.CallTipActive(): + self.Editor.CallTipCancel() if key == 32 and event.ControlDown():
- pos = self.GetCurrentPos()+ pos = self.Editor.GetCurrentPos() @@ -330,16 +347,15 @@
## 'fubar(param1, param2)')
- self.AutoCompSetIgnoreCase(False) # so this needs to match+ self.Editor.AutoCompSetIgnoreCase(False) # so this needs to match # Images are specified with a appended "?type"
- self.AutoCompShow(0, " ".join([word + "?1" for word in keyword.kwlist]))+ self.Editor.AutoCompShow(0, " ".join([word + "?1" for word in keyword.kwlist])) - wx.CallAfter(self.RefreshModel) def OnKillFocus(self, event):
+ self.Editor.AutoCompCancel() def OnUpdateUI(self, evt):
@@ -347,11 +363,11 @@
- caretPos = self.GetCurrentPos()+ caretPos = self.Editor.GetCurrentPos() - charBefore = self.GetCharAt(caretPos - 1)- styleBefore = self.GetStyleAt(caretPos - 1)+ charBefore = self.Editor.GetCharAt(caretPos - 1) + styleBefore = self.Editor.GetStyleAt(caretPos - 1) if charBefore and chr(charBefore) in "[]{}()" and styleBefore == stc.STC_P_OPERATOR:
@@ -359,23 +375,23 @@
- charAfter = self.GetCharAt(caretPos)- styleAfter = self.GetStyleAt(caretPos)+ charAfter = self.Editor.GetCharAt(caretPos) + styleAfter = self.Editor.GetStyleAt(caretPos) if charAfter and chr(charAfter) in "[]{}()" and styleAfter == stc.STC_P_OPERATOR:
- braceOpposite = self.BraceMatch(braceAtCaret)+ braceOpposite = self.Editor.BraceMatch(braceAtCaret) if braceAtCaret != -1 and braceOpposite == -1:
- self.BraceBadLight(braceAtCaret)+ self.Editor.BraceBadLight(braceAtCaret) - self.BraceHighlight(braceAtCaret, braceOpposite)- #pt = self.PointFromPosition(braceOpposite)- #self.Refresh(True, wxRect(pt.x, pt.y, 5,5))+ self.Editor.BraceHighlight(braceAtCaret, braceOpposite) + #pt = self.Editor.PointFromPosition(braceOpposite) + #self.Editor.Refresh(True, wxRect(pt.x, pt.y, 5,5))
+ #self.Editor.Refresh(False) def OnMarginClick(self, evt):
@@ -384,83 +400,83 @@
if evt.GetShift() and evt.GetControl():
- lineClicked = self.LineFromPosition(evt.GetPosition())+ lineClicked = self.Editor.LineFromPosition(evt.GetPosition()) - if self.GetFoldLevel(lineClicked) & stc.STC_FOLDLEVELHEADERFLAG:+ if self.Editor.GetFoldLevel(lineClicked) & stc.STC_FOLDLEVELHEADERFLAG: - self.SetFoldExpanded(lineClicked, True)+ self.Editor.SetFoldExpanded(lineClicked, True) self.Expand(lineClicked, True, True, 1)
- if self.GetFoldExpanded(lineClicked):- self.SetFoldExpanded(lineClicked, False)+ if self.Editor.GetFoldExpanded(lineClicked): + self.Editor.SetFoldExpanded(lineClicked, False) self.Expand(lineClicked, False, True, 0)
- self.SetFoldExpanded(lineClicked, True)+ self.Editor.SetFoldExpanded(lineClicked, True) self.Expand(lineClicked, True, True, 100)
- self.ToggleFold(lineClicked)+ self.Editor.ToggleFold(lineClicked) - lineCount = self.GetLineCount()+ lineCount = self.Editor.GetLineCount() # find out if we are folding or unfolding
for lineNum in range(lineCount):
- if self.GetFoldLevel(lineNum) & stc.STC_FOLDLEVELHEADERFLAG:- expanding = not self.GetFoldExpanded(lineNum)+ if self.Editor.GetFoldLevel(lineNum) & stc.STC_FOLDLEVELHEADERFLAG: + expanding = not self.Editor.GetFoldExpanded(lineNum) while lineNum < lineCount:
- level = self.GetFoldLevel(lineNum)+ level = self.Editor.GetFoldLevel(lineNum) if level & stc.STC_FOLDLEVELHEADERFLAG and \
(level & stc.STC_FOLDLEVELNUMBERMASK) == stc.STC_FOLDLEVELBASE:
- self.SetFoldExpanded(lineNum, True)+ self.Editor.SetFoldExpanded(lineNum, True) lineNum = self.Expand(lineNum, True)
- lastChild = self.GetLastChild(lineNum, -1)- self.SetFoldExpanded(lineNum, False)+ lastChild = self.Editor.GetLastChild(lineNum, -1) + self.Editor.SetFoldExpanded(lineNum, False) - self.HideLines(lineNum+1, lastChild)+ self.Editor.HideLines(lineNum+1, lastChild) def Expand(self, line, doExpand, force=False, visLevels=0, level=-1):
- lastChild = self.GetLastChild(line, level)+ lastChild = self.Editor.GetLastChild(line, level) - self.ShowLines(line, line)+ self.Editor.ShowLines(line, line) - self.HideLines(line, line)+ self.Editor.HideLines(line, line) - self.ShowLines(line, line)+ self.Editor.ShowLines(line, line) - level = self.GetFoldLevel(line)+ level = self.Editor.GetFoldLevel(line) if level & stc.STC_FOLDLEVELHEADERFLAG:
- self.SetFoldExpanded(line, True)+ self.Editor.SetFoldExpanded(line, True) - self.SetFoldExpanded(line, False)+ self.Editor.SetFoldExpanded(line, False) line = self.Expand(line, doExpand, force, visLevels-1)
- if doExpand and self.GetFoldExpanded(line):+ if doExpand and self.Editor.GetFoldExpanded(line): line = self.Expand(line, True, force, visLevels-1)
line = self.Expand(line, False, force, visLevels-1)
@@ -468,130 +484,22 @@
-#--------------------------------------------------------------------------------# PythonEditor Main Frame Class-#--------------------------------------------------------------------------------] = [wx.NewId() for _init_ctrls in range(1)]-class PythonEditorFrame(wx.Frame):- if wx.VERSION < (2, 6, 0):- def Bind(self, event, function, id = None):- event(self, id, function)- def _init_coll_EditMenu_Items(self, parent):- AppendMenu(parent, help='', id=wx.ID_REFRESH,- kind=wx.ITEM_NORMAL, text=_(u'Refresh\tCTRL+R'))- AppendMenu(parent, help='', id=wx.ID_UNDO,- kind=wx.ITEM_NORMAL, text=_(u'Undo\tCTRL+Z'))- AppendMenu(parent, help='', id=wx.ID_REDO,- kind=wx.ITEM_NORMAL, text=_(u'Redo\tCTRL+Y'))- self.Bind(wx.EVT_MENU, self.OnRefreshMenu, id=wx.ID_REFRESH)- self.Bind(wx.EVT_MENU, self.OnUndoMenu, id=wx.ID_UNDO)- self.Bind(wx.EVT_MENU, self.OnRedoMenu, id=wx.ID_REDO)- def _init_coll_MenuBar_Menus(self, parent):- parent.Append(menu=self.EditMenu, title=_(u'&Edit'))+ self.DisableEvents = True + self.Editor.CmdKeyExecute(wx.stc.STC_CMD_CUT) + self.DisableEvents = False
- self.MenuBar = wx.MenuBar()- self.EditMenu = wx.Menu(title='')- self._init_coll_MenuBar_Menus(self.MenuBar)- self._init_coll_EditMenu_Items(self.EditMenu)- def _init_ctrls(self, prnt):- wx.Frame.__init__(self, id=ID_PYTHONEDITORFRAME, name=u'PythonEditor',- parent=prnt, pos=wx.DefaultPosition, size=wx.Size(800, 650),- style=wx.DEFAULT_FRAME_STYLE, title=_(u'PythonEditor'))- self.SetClientSize(wx.Size(1000, 600))- self.SetMenuBar(self.MenuBar)- self.Bind(wx.EVT_CLOSE, self.OnCloseFrame)- self.Bind(wx.EVT_MENU, self.OnSaveMenu, id=wx.ID_SAVE)- accel = wx.AcceleratorTable([wx.AcceleratorEntry(wx.ACCEL_CTRL, 83, wx.ID_SAVE)])- self.SetAcceleratorTable(accel)- if wx.VERSION >= (2, 8, 0):- self.AUIManager = wx.aui.AuiManager(self)- self.AUIManager.SetDockSizeConstraint(0.5, 0.5)- self.PythonEdited = PythonEditor(self, self, self.Controler)- if wx.VERSION < (2, 8, 0):- self.MainSizer = wx.BoxSizer(wx.VERTICAL)- self.MainSizer.AddWindow(self.PythonEdited, 0, border=0, flag=wx.GROW)- self.SetSizer(self.MainSizer)- self.AUIManager.AddPane(self.PythonEdited, wx.aui.AuiPaneInfo().CentrePane())- self.StatusBar = wx.StatusBar( name='HelpBar',- parent=self, style=wx.ST_SIZEGRIP)- self.SetStatusBar(self.StatusBar)- if wx.VERSION >= (2, 8, 0):- self.AUIManager.Update()+ self.Editor.CmdKeyExecute(wx.stc.STC_CMD_COPY) - def __init__(self, parent, controler):- self.Controler = controler- self._init_ctrls(parent)- self.PythonEdited.RefreshView()- def OnCloseFrame(self, event):- if wx.VERSION >= (2, 8, 0):- self.AUIManager.UnInit()- if getattr(self, "_onclose", None) is not None:- def OnSaveMenu(self, event):- if getattr(self, "_onsave", None) != None:- def RefreshTitle(self):- title = _("PythonEditor")- self.SetTitle("%s - %s"%(title, self.Controler.GetFilename()))-#--------------------------------------------------------------------------------# Edit Project Menu Functions-#-------------------------------------------------------------------------------- def RefreshFileMenu(self):- def RefreshEditMenu(self):- undo, redo = self.Controler.GetBufferState()- self.EditMenu.Enable(wx.ID_UNDO, undo)- self.EditMenu.Enable(wx.ID_REDO, redo)- def OnRefreshMenu(self, event):- self.PythonEdited.RefreshView()- def OnUndoMenu(self, event):- self.Controler.LoadPrevious()- self.PythonEdited.RefreshView()- def OnRedoMenu(self, event):- self.Controler.LoadNext()- self.PythonEdited.RefreshView()+ self.DisableEvents = True + self.Editor.CmdKeyExecute(wx.stc.STC_CMD_PASTE) + self.DisableEvents = False --- a/plugins/python/python.py Tue Dec 20 23:37:06 2011 +0100
+++ b/plugins/python/python.py Wed Dec 21 19:42:49 2011 +0100
@@ -3,7 +3,7 @@
from plugger import PlugTemplate, opjimg
from PLCControler import UndoBuffer
-from PythonEditor import PythonEditorFrame+from PythonEditor import PythonEditor from xml.dom import minidom
@@ -13,6 +13,8 @@
class PythonCodeTemplate:
+ EditorType = PythonEditor self.PluginMethods.insert(0,
@@ -24,9 +26,7 @@
filepath = self.PythonFileName()
self.PythonCode = PythonClasses["Python"]()
- self.PythonBuffer = UndoBuffer(self.Copy(self.PythonCode), False) if os.path.isfile(filepath):
xmlfile = open(filepath, 'r')
tree = minidom.parse(xmlfile)
@@ -35,8 +35,9 @@
for child in tree.childNodes:
if child.nodeType == tree.ELEMENT_NODE and child.nodeName == "Python":
self.PythonCode.loadXMLTree(child, ["xmlns", "xmlns:xsi", "xsi:schemaLocation"])
- self.PythonBuffer = UndoBuffer(self.Copy(self.PythonCode), True)+ self.CreatePythonBuffer(True) + self.CreatePythonBuffer(False) @@ -57,31 +58,8 @@
return self.PythonCode.gettext()
- has_permissions = self.GetPlugRoot().CheckProjectPathPerm()- if not has_permissions:- dialog = wx.MessageDialog(self.GetPlugRoot().AppFrame,- _("You don't have write permissions.\nOpen PythonEditor anyway ?"),- _("Open PythonEditor"),- wx.YES_NO|wx.ICON_QUESTION)- open_pyeditor = dialog.ShowModal() == wx.ID_YES- self.GetPlugRoot().SaveProject()- self._View = PythonEditorFrame(self.GetPlugRoot().AppFrame, self)- self._View._onclose = _onclose- self._View._onsave = _onsave+ def PlugTestModified(self): + return self.ChangesToSave or not self.PythonIsSaved() filepath = self.PythonFileName()
@@ -96,7 +74,7 @@
xmlfile.write(text.encode("utf-8"))
- self.PythonBuffer.CurrentSaved()+ self.MarkPythonAsSaved() #-------------------------------------------------------------------------------
@@ -109,32 +87,37 @@
return cPickle.loads(cPickle.dumps(model))
+ def CreatePythonBuffer(self, saved): + self.PythonBuffer = UndoBuffer(cPickle.dumps(self.PythonCode), saved) - self.PythonBuffer.Buffering(self.Copy(self.PythonCode))+ self.PythonBuffer.Buffering(cPickle.dumps(self.PythonCode)) def StartBuffering(self):
- self.PythonBuffer.Buffering(self.PythonCode)- self.PythonCode = self.Copy(self.PythonCode)+ self.PythonBuffer.Buffering(cPickle.dumps(self.PythonCode)) - def PythonCodeIsSaved(self):- return self.PythonBuffer.IsCurrentSaved()+ def MarkPythonAsSaved(self): + self.PythonBuffer.CurrentSaved() + def PythonIsSaved(self): + return self.PythonBuffer.IsCurrentSaved() and not self.Buffering - self.PythonCode = self.Copy(self.PythonBuffer.Previous())+ self.PythonCode = cPickle.loads(self.PythonBuffer.Previous()) - self.PythonCode = self.Copy(self.PythonBuffer.Next())+ self.PythonCode = cPickle.loads(self.PythonBuffer.Next()) def GetBufferState(self):
- first = self.PythonBuffer.IsFirst()+ first = self.PythonBuffer.IsFirst() and not self.Buffering last = self.PythonBuffer.IsLast()
return not first, not last
