haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Link command IDs to window frame 

This should be compatible with both 4.0 and 4.1 of wxPython

Fixes https://gitlab.com/kicad/code/kicad/issues/9432
This commit is contained in:
Seth Hillbrand 2021-10-20 11:53:37 -07:00
parent c5e5d8e0d4
commit 70df3822b5
1 changed files with 61 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
scripting/kicad_pyshell/kicad_pyeditor.py
View File

@ -16,14 +16,6 @@ from wx.py.editor import Editor, openSingle, openMultiple, saveSingle, messageDi
from wx.py.buffer import Buffer from wx.py.buffer import Buffer
from wx import stc from wx import stc
def KiNewId():
try:
wx.NewIdRef
except ( NameError, AttributeError ):
return wx.NewId()
else:
return wx.NewIdRef()
ID_NEW = wx.ID_NEW ID_NEW = wx.ID_NEW
ID_OPEN = wx.ID_OPEN ID_OPEN = wx.ID_OPEN
ID_REVERT = wx.ID_REVERT ID_REVERT = wx.ID_REVERT
@ -39,38 +31,38 @@ ID_COPY = wx.ID_COPY
ID_PASTE = wx.ID_PASTE ID_PASTE = wx.ID_PASTE
ID_CLEAR = wx.ID_CLEAR ID_CLEAR = wx.ID_CLEAR
ID_SELECTALL = wx.ID_SELECTALL ID_SELECTALL = wx.ID_SELECTALL
ID_EMPTYBUFFER = KiNewId() ID_EMPTYBUFFER = 0
ID_ABOUT = wx.ID_ABOUT ID_ABOUT = wx.ID_ABOUT
ID_HELP = KiNewId() ID_HELP = 0
ID_AUTOCOMP_SHOW = KiNewId() ID_AUTOCOMP_SHOW = 0
ID_AUTOCOMP_MAGIC = KiNewId() ID_AUTOCOMP_MAGIC = 0
ID_AUTOCOMP_SINGLE = KiNewId() ID_AUTOCOMP_SINGLE = 0
ID_AUTOCOMP_DOUBLE = KiNewId() ID_AUTOCOMP_DOUBLE = 0
ID_CALLTIPS_SHOW = KiNewId() ID_CALLTIPS_SHOW = 0
ID_CALLTIPS_INSERT = KiNewId() ID_CALLTIPS_INSERT = 0
ID_COPY_PLUS = KiNewId() ID_COPY_PLUS = 0
ID_NAMESPACE = KiNewId() ID_NAMESPACE = 0
ID_PASTE_PLUS = KiNewId() ID_PASTE_PLUS = 0
ID_WRAP = KiNewId() ID_WRAP = 0
ID_TOGGLE_MAXIMIZE = KiNewId() ID_TOGGLE_MAXIMIZE = 0
ID_SHOW_LINENUMBERS = KiNewId() ID_SHOW_LINENUMBERS = 0
ID_ENABLESHELLMODE = KiNewId() ID_ENABLESHELLMODE = 0
ID_ENABLEAUTOSYMPY = KiNewId() ID_ENABLEAUTOSYMPY = 0
ID_AUTO_SAVESETTINGS = KiNewId() ID_AUTO_SAVESETTINGS = 0
ID_SAVEACOPY = KiNewId() ID_SAVEACOPY = 0
ID_SAVEHISTORY = KiNewId() ID_SAVEHISTORY = 0
ID_SAVEHISTORYNOW = KiNewId() ID_SAVEHISTORYNOW = 0
ID_CLEARHISTORY = KiNewId() ID_CLEARHISTORY = 0
ID_SAVESETTINGS = KiNewId() ID_SAVESETTINGS = 0
ID_DELSETTINGSFILE = KiNewId() ID_DELSETTINGSFILE = 0
ID_EDITSTARTUPSCRIPT = KiNewId() ID_EDITSTARTUPSCRIPT = 0
ID_EXECSTARTUPSCRIPT = KiNewId() ID_EXECSTARTUPSCRIPT = 0
ID_SHOWPYSLICESTUTORIAL = KiNewId() ID_SHOWPYSLICESTUTORIAL = 0
ID_FIND = wx.ID_FIND ID_FIND = wx.ID_FIND
ID_FINDNEXT = KiNewId() ID_FINDNEXT = 0
ID_FINDPREVIOUS = KiNewId() ID_FINDPREVIOUS = 0
ID_SHOWTOOLS = KiNewId() ID_SHOWTOOLS = 0
ID_HIDEFOLDINGMARGIN = KiNewId() ID_HIDEFOLDINGMARGIN = 0
INTRO = "KiCad - Python Shell" INTRO = "KiCad - Python Shell"
@ -92,6 +84,37 @@ class KiCadPyFrame():
self.parent.Bind(wx.EVT_ICONIZE, self.OnIconize) self.parent.Bind(wx.EVT_ICONIZE, self.OnIconize)
def SetIDs( self ):
ID_EMPTYBUFFER = self.parent.NewControlId()
ID_HELP = self.parent.NewControlId()
ID_AUTOCOMP_SHOW = self.parent.NewControlId()
ID_AUTOCOMP_MAGIC = self.parent.NewControlId()
ID_AUTOCOMP_SINGLE = self.parent.NewControlId()
ID_AUTOCOMP_DOUBLE = self.parent.NewControlId()
ID_CALLTIPS_SHOW = self.parent.NewControlId()
ID_CALLTIPS_INSERT = self.parent.NewControlId()
ID_COPY_PLUS = self.parent.NewControlId()
ID_NAMESPACE = self.parent.NewControlId()
ID_PASTE_PLUS = self.parent.NewControlId()
ID_WRAP = self.parent.NewControlId()
ID_TOGGLE_MAXIMIZE = self.parent.NewControlId()
ID_SHOW_LINENUMBERS = self.parent.NewControlId()
ID_ENABLESHELLMODE = self.parent.NewControlId()
ID_ENABLEAUTOSYMPY = self.parent.NewControlId()
ID_AUTO_SAVESETTINGS = self.parent.NewControlId()
ID_SAVEACOPY = self.parent.NewControlId()
ID_SAVEHISTORY = self.parent.NewControlId()
ID_SAVEHISTORYNOW = self.parent.NewControlId()
ID_CLEARHISTORY = self.parent.NewControlId()
ID_SAVESETTINGS = self.parent.NewControlId()
ID_DELSETTINGSFILE = self.parent.NewControlId()
ID_EDITSTARTUPSCRIPT = self.parent.NewControlId()
ID_EXECSTARTUPSCRIPT = self.parent.NewControlId()
ID_SHOWPYSLICESTUTORIAL = self.parent.NewControlId()
ID_FINDNEXT = self.parent.NewControlId()
ID_FINDPREVIOUS = self.parent.NewControlId()
ID_SHOWTOOLS = self.parent.NewControlId()
ID_HIDEFOLDINGMARGIN = self.parent.NewControlId()
def OnIconize(self, event): def OnIconize(self, event):
"""Event handler for Iconize.""" """Event handler for Iconize."""