beremiz: comparison Beremiz.py

equal deleted inserted replaced

-:434aed8dc58d
+:9810689febb0
 __version__ = "$Revision$"
 import wx
 import wx.lib.buttons
+import wx.lib.statbmp
 import types
 import time
 from wxPopen import wxPopen3
 SCROLLBAR_UNIT = 10
 WINDOW_COLOUR = wx.Colour(240,240,240)
+TITLE_COLOUR = wx.Colour(200,200,220)
 if wx.Platform == '__WXMSW__':
 faces = { 'times': 'Times New Roman',
 'mono' : 'Courier New',
 'helv' : 'Arial',
 'size' : 18,
 }
 CWD = os.path.split(os.path.realpath(__file__))[0]
-gen_mini_GetBackgroundBrush = lambda obj:lambda dc: wx.Brush(obj.faceDnClr, wx.SOLID)
+gen_mini_GetBackgroundBrush = lambda obj:lambda dc: wx.Brush(obj.GetParent().GetBackgroundColour(), wx.SOLID)
 gen_mini_GetLabelSize = lambda obj:lambda:(wx.lib.buttons.GenBitmapTextButton._GetLabelSize(obj)[:-1] + (False,))
 gen_textbutton_GetLabelSize = lambda obj:lambda:(wx.lib.buttons.GenButton._GetLabelSize(obj)[:-1] + (False,))
-def GenerateEmptyBitmap(width, height):
+def make_genbitmaptogglebutton_flat(button):
-bitmap = wx.EmptyBitmap(width, height)
+button.GetBackgroundBrush = gen_mini_GetBackgroundBrush(button)
-dc = wx.MemoryDC(bitmap)
+button.labelDelta = 0
-dc.SetPen(wx.Pen(WINDOW_COLOUR))
+button.SetBezelWidth(0)
-dc.SetBrush(wx.Brush(WINDOW_COLOUR))
+button.SetUseFocusIndicator(False)
-dc.DrawRectangle(0, 0, width, height)
-return bitmap
+def GenerateEmptyBitmap(width, height, color):
+#    bitmap = wx.EmptyBitmap(width, height)
+#    dc = wx.MemoryDC(bitmap)
+#    dc.SetPen(wx.Pen(color))
+#    dc.SetBrush(wx.Brush(color))
+#    dc.DrawRectangle(0, 0, width, height)
+#    return bitmap
+return wx.Bitmap(os.path.join(CWD, "images", "empty.png"))
+class GenStaticBitmap(wx.lib.statbmp.GenStaticBitmap):
+def __init__(self, parent, ID, bitmapname,
+pos = wx.DefaultPosition, size = wx.DefaultSize,
+style = 0,
+name = "genstatbmp"):
+bitmappath = os.path.join(CWD, "images", bitmapname)
+if os.path.isfile(bitmappath):
+bitmap = wx.Bitmap(bitmappath)
+else:
+bitmap = None
+wx.lib.statbmp.GenStaticBitmap.__init__(self, parent, ID, bitmap,
+pos, size,
+style,
+name)
+def OnPaint(self, event):
+dc = wx.PaintDC(self)
+colour = self.GetParent().GetBackgroundColour()
+dc.SetPen(wx.Pen(colour))
+dc.SetBrush(wx.Brush(colour ))
+dc.DrawRectangle(0, 0, *dc.GetSizeTuple())
+if self._bitmap:
+dc.DrawBitmap(self._bitmap, 0, 0, True)
 class LogPseudoFile:
 """ Base class for file like objects to facilitate StdOut for the Shell."""
 def __init__(self, output = None):
 self.red_white = wx.TextAttr("RED", "WHITE")
 parent.AddGrowableCol(1)
 def _init_sizers(self):
 self.PLCConfigMainSizer = wx.FlexGridSizer(cols=1, hgap=2, rows=2, vgap=2)
 self.PLCParamsSizer = wx.BoxSizer(wx.VERTICAL)
-self.PluginTreeSizer = wx.FlexGridSizer(cols=3, hgap=0, rows=0, vgap=2)
+#self.PluginTreeSizer = wx.FlexGridSizer(cols=3, hgap=0, rows=0, vgap=2)
+self.PluginTreeSizer = wx.FlexGridSizer(cols=2, hgap=0, rows=0, vgap=2)
 self._init_coll_PLCConfigMainSizer_Items(self.PLCConfigMainSizer)
 self._init_coll_PLCConfigMainSizer_Growables(self.PLCConfigMainSizer)
 self._init_coll_PluginTreeSizer_Growables(self.PluginTreeSizer)
 def RefreshPLCParams(self):
 self.ClearSizer(self.PLCParamsSizer)
 if self.PluginRoot.HasProjectOpened():
 plcwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-plcwindow.SetBackgroundColour(WINDOW_COLOUR)
+plcwindow.SetBackgroundColour(TITLE_COLOUR)
 self.PLCParamsSizer.AddWindow(plcwindow, 0, border=0, flag=wx.GROW)
 plcwindowsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindow.SetSizer(plcwindowsizer)
 st = wx.StaticText(plcwindow, -1)
 st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
 st.SetLabel(self.PluginRoot.GetProjectName())
 plcwindowsizer.AddWindow(st, 0, border=5, flag=wx.ALL|wx.ALIGN_CENTER)
+addbutton_id = wx.NewId()
+addbutton = wx.lib.buttons.GenBitmapButton(id=addbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Add16x16.png')),
+name='AddBusButton', parent=plcwindow, pos=wx.Point(0, 0),
+size=wx.Size(16, 16), style=wx.NO_BORDER)
+addbutton.SetToolTipString("Add a sub plugin")
+addbutton.Bind(wx.EVT_BUTTON, self.Gen_AddPluginMenu(self.PluginRoot), id=addbutton_id)
+plcwindowsizer.AddWindow(addbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
 plcwindowmainsizer = wx.BoxSizer(wx.VERTICAL)
 plcwindowsizer.AddSizer(plcwindowmainsizer, 0, border=5, flag=wx.ALL)
 plcwindowbuttonsizer = wx.BoxSizer(wx.HORIZONTAL)
 plcwindowmainsizer.AddSizer(plcwindowbuttonsizer, 0, border=0, flag=wx.ALIGN_CENTER)
 msizer = self.GenerateMethodButtonSizer(self.PluginRoot, plcwindow)
 plcwindowbuttonsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
 paramswindow = wx.Panel(plcwindow, -1, size=wx.Size(-1, -1))
-paramswindow.SetBackgroundColour(WINDOW_COLOUR)
+paramswindow.SetBackgroundColour(TITLE_COLOUR)
 plcwindowbuttonsizer.AddWindow(paramswindow, 0, border=0, flag=0)
 psizer = wx.BoxSizer(wx.HORIZONTAL)
 paramswindow.SetSizer(psizer)
 minimizebutton_id = wx.NewId()
 minimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=minimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
 name='MinimizeButton', parent=plcwindow, pos=wx.Point(0, 0),
 size=wx.Size(24, 24), style=wx.NO_BORDER)
-minimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(minimizebutton)
+make_genbitmaptogglebutton_flat(minimizebutton)
-minimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
-minimizebutton.labelDelta = 0
-minimizebutton.SetBezelWidth(0)
-minimizebutton.SetUseFocusIndicator(False)
 minimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
 plcwindowbuttonsizer.AddWindow(minimizebutton, 0, border=5, flag=wx.ALL)
-if len(self.PluginRoot.PlugChildsTypes) > 0:
+#            if len(self.PluginRoot.PlugChildsTypes) > 0:
-addsizer = self.GenerateAddButtonSizer(self.PluginRoot, plcwindow)
+#                addsizer = self.GenerateAddButtonSizer(self.PluginRoot, plcwindow)
-plcwindowbuttonsizer.AddSizer(addsizer, 0, border=0, flag=0)
+#                plcwindowbuttonsizer.AddSizer(addsizer, 0, border=0, flag=0)
-else:
+#            else:
-addsizer = None
+#                addsizer = None
 def togglewindow(event):
 if minimizebutton.GetToggle():
 paramswindow.Show()
 msizer.SetCols(1)
-if addsizer is not None:
+#                    if addsizer is not None:
-addsizer.SetCols(1)
+#                        addsizer.SetCols(1)
 else:
 paramswindow.Hide()
 msizer.SetCols(len(self.PluginRoot.PluginMethods))
-if addsizer is not None:
+#                    if addsizer is not None:
-addsizer.SetCols(len(self.PluginRoot.PlugChildsTypes))
+#                        addsizer.SetCols(len(self.PluginRoot.PlugChildsTypes))
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 event.Skip()
 minimizebutton.Bind(wx.EVT_BUTTON, togglewindow, id=minimizebutton_id)
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
-def GenerateAddButtonSizer(self, plugin, parent, horizontal = True):
+#    def GenerateAddButtonSizer(self, plugin, parent, horizontal = True):
-if horizontal:
+#        if horizontal:
-addsizer = wx.FlexGridSizer(cols=len(plugin.PluginMethods))
+#            addsizer = wx.FlexGridSizer(cols=len(plugin.PluginMethods))
-else:
+#        else:
-addsizer = wx.FlexGridSizer(cols=1)
+#            addsizer = wx.FlexGridSizer(cols=1)
-for name, XSDClass in plugin.PlugChildsTypes:
+#        for name, XSDClass, help in plugin.PlugChildsTypes:
-addbutton_id = wx.NewId()
+#            addbutton_id = wx.NewId()
-addbutton = wx.lib.buttons.GenButton(id=addbutton_id, label="Add %s"%name,
+#            addbutton = wx.lib.buttons.GenButton(id=addbutton_id, label="Add %s"%help,
-name='AddBusButton', parent=parent, pos=wx.Point(0, 0),
+#                  name='AddBusButton', parent=parent, pos=wx.Point(0, 0),
-style=wx.NO_BORDER)
+#                  style=wx.NO_BORDER)
-font = addbutton.GetFont()
+#            font = addbutton.GetFont()
-font.SetUnderlined(True)
+#            font.SetUnderlined(True)
-addbutton.SetFont(font)
+#            addbutton.SetFont(font)
-addbutton._GetLabelSize = gen_textbutton_GetLabelSize(addbutton)
+#            addbutton._GetLabelSize = gen_textbutton_GetLabelSize(addbutton)
-addbutton.SetForegroundColour(wx.BLUE)
+#            addbutton.SetForegroundColour(wx.BLUE)
-addbutton.SetToolTipString("Add a %s plugin to this one"%name)
+#            addbutton.SetToolTipString("Add a \"%s\" plugin to this one"%name)
-addbutton.Bind(wx.EVT_BUTTON, self._GetAddPluginFunction(name, plugin), id=addbutton_id)
+#            addbutton.Bind(wx.EVT_BUTTON, self._GetAddPluginFunction(name, plugin), id=addbutton_id)
-addsizer.AddWindow(addbutton, 0, border=0, flag=0)
+#            addsizer.AddWindow(addbutton, 0, border=0, flag=0)
-return addsizer
+#        return addsizer
 def GenerateMethodButtonSizer(self, plugin, parent, horizontal = True):
 if horizontal:
 msizer = wx.FlexGridSizer(cols=len(plugin.PluginMethods))
 else:
 def ExpandPlugin(self, plugin, force = False):
 for child in self.PluginInfos[plugin]["children"]:
 self.PluginTreeSizer.Show(self.PluginInfos[child]["left"])
 self.PluginTreeSizer.Show(self.PluginInfos[child]["middle"])
-self.PluginTreeSizer.Show(self.PluginInfos[child]["right"])
+#            self.PluginTreeSizer.Show(self.PluginInfos[child]["right"])
 if force or not self.PluginInfos[child]["expanded"]:
 self.ExpandPlugin(child, force)
 if force:
 self.PluginInfos[child]["expanded"] = True
 def CollapsePlugin(self, plugin, force = False):
 for child in self.PluginInfos[plugin]["children"]:
 self.PluginTreeSizer.Hide(self.PluginInfos[child]["left"])
 self.PluginTreeSizer.Hide(self.PluginInfos[child]["middle"])
-self.PluginTreeSizer.Hide(self.PluginInfos[child]["right"])
+#            self.PluginTreeSizer.Hide(self.PluginInfos[child]["right"])
 if force or self.PluginInfos[child]["expanded"]:
 self.CollapsePlugin(child, force)
 if force:
 self.PluginInfos[child]["expanded"] = False
 self.PluginInfos[plugin]["children"] = plugin.IECSortedChilds()
 self.PluginTreeSizer.AddWindow(leftwindow, 0, border=0, flag=wx.GROW)
-leftwindowsizer = wx.FlexGridSizer(cols=1, rows=2)
+leftwindowsizer = wx.FlexGridSizer(cols=1, rows=3)
 leftwindowsizer.AddGrowableCol(0)
-leftwindowsizer.AddGrowableRow(1)
+leftwindowsizer.AddGrowableRow(2)
 leftwindow.SetSizer(leftwindowsizer)
 leftbuttonmainsizer = wx.FlexGridSizer(cols=3, rows=1)
 leftbuttonmainsizer.AddGrowableCol(0)
-leftwindowsizer.AddSizer(leftbuttonmainsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.TOP)
+leftwindowsizer.AddSizer(leftbuttonmainsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT) #|wx.TOP
 leftbuttonsizer = wx.BoxSizer(wx.HORIZONTAL)
-leftbuttonmainsizer.AddSizer(leftbuttonsizer, 0, border=15, flag=wx.GROW|wx.RIGHT)
+leftbuttonmainsizer.AddSizer(leftbuttonsizer, 0, border=5, flag=wx.GROW|wx.RIGHT)
-ieccsizer = wx.BoxSizer(wx.VERTICAL)
+leftsizer = wx.BoxSizer(wx.VERTICAL)
-leftbuttonsizer.AddSizer(ieccsizer, 0, border=15, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+leftbuttonsizer.AddSizer(leftsizer, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+rolesizer = wx.BoxSizer(wx.HORIZONTAL)
+leftsizer.AddSizer(rolesizer, 0, border=0, flag=wx.GROW|wx.RIGHT)
+roletext = wx.StaticText(leftwindow, -1)
+roletext.SetLabel(plugin.PlugHelp)
+rolesizer.AddWindow(roletext, 0, border=5, flag=wx.RIGHT|wx.ALIGN_LEFT)
+enablebutton_id = wx.NewId()
+enablebutton = wx.lib.buttons.GenBitmapToggleButton(id=enablebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Disabled.png')),
+name='EnableButton', parent=leftwindow, size=wx.Size(16, 16), pos=wx.Point(0, 0), style=0)#wx.NO_BORDER)
+enablebutton.SetToolTipString("Enable/Disable this plugin")
+make_genbitmaptogglebutton_flat(enablebutton)
+enablebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Enabled.png')))
+enablebutton.SetToggle(plugin.MandatoryParams[1].getEnabled())
+def toggleenablebutton(event):
+res, StructChanged = plugin.SetParamsAttribute("BaseParams.Enabled", enablebutton.GetToggle(), self.Log)
+if StructChanged: wx.CallAfter(self.RefreshPluginTree)
+enablebutton.SetToggle(res)
+event.Skip()
+enablebutton.Bind(wx.EVT_BUTTON, toggleenablebutton, id=enablebutton_id)
+rolesizer.AddWindow(enablebutton, 0, border=0, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 plugin_IECChannel = plugin.BaseParams.getIEC_Channel()
+iecsizer = wx.BoxSizer(wx.HORIZONTAL)
+leftsizer.AddSizer(iecsizer, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
+st = wx.StaticText(leftwindow, -1)
+st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
+st.SetLabel(plugin.GetFullIEC_Channel())
+iecsizer.AddWindow(st, 0, border=0, flag=0)
+updownsizer = wx.BoxSizer(wx.VERTICAL)
+iecsizer.AddSizer(updownsizer, 0, border=5, flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL)
 if plugin_IECChannel > 0:
 ieccdownbutton_id = wx.NewId()
 ieccdownbutton = wx.lib.buttons.GenBitmapButton(id=ieccdownbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'IECCDown.png')),
 name='IECCDownButton', parent=leftwindow, pos=wx.Point(0, 0),
 size=wx.Size(16, 16), style=wx.NO_BORDER)
 ieccdownbutton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(plugin, plugin_IECChannel - 1), id=ieccdownbutton_id)
-ieccsizer.AddWindow(ieccdownbutton, 0, border=0, flag=wx.ALIGN_CENTER)
+updownsizer.AddWindow(ieccdownbutton, 0, border=0, flag=wx.ALIGN_LEFT)
-else:
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(16, 16),
-name="staticBitmap", parent=leftwindow,
-pos=wx.Point(0, 0), size=wx.Size(16, 16), style=0)
-ieccsizer.AddWindow(staticbitmap, 0, border=0, flag=wx.ALIGN_CENTER)
-st = wx.StaticText(leftwindow, -1)
-st.SetFont(wx.Font(faces["size"], wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
-st.SetLabel(plugin.GetFullIEC_Channel())
-ieccsizer.AddWindow(st, 0, border=0, flag=0)
 ieccupbutton_id = wx.NewId()
 ieccupbutton = wx.lib.buttons.GenBitmapTextButton(id=ieccupbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'IECCUp.png')),
 name='IECCUpButton', parent=leftwindow, pos=wx.Point(0, 0),
 size=wx.Size(16, 16), style=wx.NO_BORDER)
 ieccupbutton.Bind(wx.EVT_BUTTON, self.GetItemChannelChangedFunction(plugin, plugin_IECChannel + 1), id=ieccupbutton_id)
-ieccsizer.AddWindow(ieccupbutton, 0, border=0, flag=wx.ALIGN_CENTER)
+updownsizer.AddWindow(ieccupbutton, 0, border=0, flag=wx.ALIGN_LEFT)
+adddeletesizer = wx.BoxSizer(wx.VERTICAL)
+iecsizer.AddSizer(adddeletesizer, 0, border=5, flag=wx.LEFT|wx.ALIGN_CENTER_VERTICAL)
+deletebutton_id = wx.NewId()
+deletebutton = wx.lib.buttons.GenBitmapButton(id=deletebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Delete16x16.png')),
+name='DeleteBusButton', parent=leftwindow, pos=wx.Point(0, 0),
+size=wx.Size(16, 16), style=wx.NO_BORDER)
+deletebutton.SetToolTipString("Delete this plugin")
+deletebutton.Bind(wx.EVT_BUTTON, self.GetDeleteButtonFunction(plugin), id=deletebutton_id)
+adddeletesizer.AddWindow(deletebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
+if len(plugin.PlugChildsTypes) > 0:
+addbutton_id = wx.NewId()
+addbutton = wx.lib.buttons.GenBitmapButton(id=addbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Add16x16.png')),
+name='AddBusButton', parent=leftwindow, pos=wx.Point(0, 0),
+size=wx.Size(16, 16), style=wx.NO_BORDER)
+addbutton.SetToolTipString("Add a sub plugin")
+addbutton.Bind(wx.EVT_BUTTON, self.Gen_AddPluginMenu(plugin), id=addbutton_id)
+adddeletesizer.AddWindow(addbutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
 if len(self.PluginInfos[plugin]["children"]) > 0:
 expandbutton_id = wx.NewId()
 expandbutton = wx.lib.buttons.GenBitmapToggleButton(id=expandbutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'plus.png')),
 name='ExpandButton', parent=leftwindow, pos=wx.Point(0, 0),
 tc = wx.TextCtrl(leftwindow, tc_id, size=wx.Size(150, 35), style=wx.TE_PROCESS_ENTER|wx.NO_BORDER)
 tc.SetFont(wx.Font(faces["size"] * 0.75, wx.DEFAULT, wx.NORMAL, wx.BOLD, faceName = faces["helv"]))
 tc.SetValue(plugin.MandatoryParams[1].getName())
 tc.Bind(wx.EVT_TEXT_ENTER, self.GetTextCtrlCallBackFunction(tc, plugin, "BaseParams.Name"), id=tc_id)
 leftbuttonsizer.AddWindow(tc, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
-enablebutton_id = wx.NewId()
-enablebutton = wx.lib.buttons.GenBitmapToggleButton(id=enablebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Disabled.png')),
-name='EnableButton', parent=leftwindow, pos=wx.Point(0, 0), style=wx.NO_BORDER)
-enablebutton.SetToolTipString("Enable/Disable this plugin")
-enablebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(enablebutton)
-enablebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
-enablebutton.labelDelta = 0
-enablebutton.SetBezelWidth(0)
-enablebutton.SetUseFocusIndicator(False)
-enablebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Enabled.png')))
-enablebutton.SetToggle(plugin.MandatoryParams[1].getEnabled())
-def toggleenablebutton(event):
-res, StructChanged = plugin.SetParamsAttribute("BaseParams.Enabled", enablebutton.GetToggle(), self.Log)
-if StructChanged: wx.CallAfter(self.RefreshPluginTree)
-enablebutton.SetToggle(res)
-event.Skip()
-enablebutton.Bind(wx.EVT_BUTTON, toggleenablebutton, id=enablebutton_id)
-leftbuttonsizer.AddWindow(enablebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER_VERTICAL)
 leftminimizebutton_id = wx.NewId()
-leftminimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=leftminimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
+leftminimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=leftminimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'ShowVars.png')),
 name='MinimizeButton', parent=leftwindow, pos=wx.Point(0, 0),
 size=wx.Size(24, 24), style=wx.NO_BORDER)
-leftminimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(leftminimizebutton)
+make_genbitmaptogglebutton_flat(leftminimizebutton)
-leftminimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
+leftminimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'HideVars.png')))
-leftminimizebutton.labelDelta = 0
-leftminimizebutton.SetBezelWidth(0)
-leftminimizebutton.SetUseFocusIndicator(False)
-leftminimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
 leftminimizebutton.SetToggle(self.PluginInfos[plugin]["left_visible"])
 def toggleleftwindow(event):
 if leftminimizebutton.GetToggle():
 leftwindowsizer.Show(1)
 else:
 self.RefreshScrollBars()
 event.Skip()
 leftminimizebutton.Bind(wx.EVT_BUTTON, toggleleftwindow, id=leftminimizebutton_id)
 leftbuttonmainsizer.AddWindow(leftminimizebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
-deletebutton_id = wx.NewId()
-deletebutton = wx.lib.buttons.GenBitmapButton(id=deletebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Delete24x24.png')),
-name='DeleteBusButton', parent=leftwindow, pos=wx.Point(0, 0),
-size=wx.Size(24, 24), style=wx.NO_BORDER)
-deletebutton.SetToolTipString("Delete this plugin")
-deletebutton.Bind(wx.EVT_BUTTON, self.GetDeleteButtonFunction(plugin), id=deletebutton_id)
-leftbuttonmainsizer.AddWindow(deletebutton, 0, border=5, flag=wx.RIGHT|wx.ALIGN_CENTER)
 locations = plugin.GetLocations()
 lb = wx.ListBox(leftwindow, -1, size=wx.Size(-1, max(1, min(len(locations), 4)) * 25), style=wx.NO_BORDER)
 for location in locations:
 lb.Append(location["NAME"].replace("__", "%").replace("_", "."))
 if not self.PluginInfos[plugin]["left_visible"]:
 middlewindow.SetSizer(middlewindowmainsizer)
 middlewindowsizer = wx.FlexGridSizer(cols=2, rows=1)
 middlewindowsizer.AddGrowableCol(1)
 middlewindowsizer.AddGrowableRow(0)
-middlewindowmainsizer.AddSizer(middlewindowsizer, 0, border=17, flag=wx.TOP|wx.GROW)
+middlewindowmainsizer.AddSizer(middlewindowsizer, 0, border=8, flag=wx.TOP|wx.GROW)
 msizer = self.GenerateMethodButtonSizer(plugin, middlewindow, not self.PluginInfos[plugin]["middle_visible"])
 middlewindowsizer.AddSizer(msizer, 0, border=0, flag=wx.GROW)
 middleparamssizer = wx.BoxSizer(wx.HORIZONTAL)
 middleminimizebutton_id = wx.NewId()
 middleminimizebutton = wx.lib.buttons.GenBitmapToggleButton(id=middleminimizebutton_id, bitmap=wx.Bitmap(os.path.join(CWD, 'images', 'Maximize.png')),
 name='MinimizeButton', parent=middlewindow, pos=wx.Point(0, 0),
 size=wx.Size(24, 24), style=wx.NO_BORDER)
-middleminimizebutton.GetBackgroundBrush = gen_mini_GetBackgroundBrush(middleminimizebutton)
+make_genbitmaptogglebutton_flat(middleminimizebutton)
-middleminimizebutton.SetBackgroundColour(wx.Colour(208, 208, 208))
-middleminimizebutton.labelDelta = 0
-middleminimizebutton.SetBezelWidth(0)
-middleminimizebutton.SetUseFocusIndicator(False)
 middleminimizebutton.SetBitmapSelected(wx.Bitmap(os.path.join(CWD, 'images', 'Minimize.png')))
 middleminimizebutton.SetToggle(self.PluginInfos[plugin]["middle_visible"])
 middleparamssizer.AddWindow(middleminimizebutton, 0, border=5, flag=wx.ALL)
-rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
+#        rightwindow = wx.Panel(self.PLCConfig, -1, size=wx.Size(-1, -1))
-rightwindow.SetBackgroundColour(wx.Colour(240,240,240))
+#        rightwindow.SetBackgroundColour(wx.Colour(240,240,240))
+#
-self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
+#        self.PluginTreeSizer.AddWindow(rightwindow, 0, border=0, flag=wx.GROW)
+#
-rightsizer = wx.BoxSizer(wx.VERTICAL)
+#        rightsizer = wx.BoxSizer(wx.VERTICAL)
-rightwindow.SetSizer(rightsizer)
+#        rightwindow.SetSizer(rightsizer)
+#
-rightmainsizer = wx.BoxSizer(wx.VERTICAL)
+#        rightmainsizer = wx.BoxSizer(wx.VERTICAL)
-rightsizer.AddSizer(rightmainsizer, 0, border=5, flag=wx.ALL)
+#        rightsizer.AddSizer(rightmainsizer, 0, border=5, flag=wx.ALL)
+#
-if len(plugin.PlugChildsTypes) > 0:
+#        if len(plugin.PlugChildsTypes) > 0:
-addsizer = self.GenerateAddButtonSizer(plugin, rightwindow)
+#            addsizer = self.GenerateAddButtonSizer(plugin, rightwindow)
-rightmainsizer.AddSizer(addsizer, 0, border=12, flag=wx.TOP)
+#            rightmainsizer.AddSizer(addsizer, 0, border=4, flag=wx.TOP)
-else:
+#        else:
-addsizer = None
+#            addsizer = None
 def togglemiddlerightwindow(event):
 if middleminimizebutton.GetToggle():
 middleparamssizer.Show(0)
 msizer.SetCols(1)
-if addsizer is not None:
+#                if addsizer is not None:
-addsizer.SetCols(1)
+#                    addsizer.SetCols(1)
 else:
 middleparamssizer.Hide(0)
 msizer.SetCols(len(plugin.PluginMethods))
-if addsizer is not None:
+#                if addsizer is not None:
-addsizer.SetCols(len(plugin.PlugChildsTypes))
+#                    addsizer.SetCols(len(plugin.PlugChildsTypes))
 self.PluginInfos[plugin]["middle_visible"] = middleminimizebutton.GetToggle()
 self.PLCConfigMainSizer.Layout()
 self.RefreshScrollBars()
 event.Skip()
 middleminimizebutton.Bind(wx.EVT_BUTTON, togglemiddlerightwindow, id=middleminimizebutton_id)
 self.PluginInfos[plugin]["left"] = index[0]
 self.PluginInfos[plugin]["middle"] = index[0] + 1
-self.PluginInfos[plugin]["right"] = index[0] + 2
+#        self.PluginInfos[plugin]["right"] = index[0] + 2
-index[0] += 3
+#        index[0] += 3
+index[0] += 2
 for child in self.PluginInfos[plugin]["children"]:
 self.GenerateTreeBranch(child, index)
 if not self.PluginInfos[child]["expanded"]:
 self.CollapsePlugin(child)
 def OnPluginMenu(event):
 wx.CallAfter(self.AddPlugin, name, plugin)
 event.Skip()
 return OnPluginMenu
-def OnPluginTreeRightUp(self, event):
+def Gen_AddPluginMenu(self, plugin):
-plugin = self.GetSelectedPlugin()
+def AddPluginMenu(event):
-if plugin:
 main_menu = wx.Menu(title='')
 if len(plugin.PlugChildsTypes) > 0:
-plugin_menu = wx.Menu(title='')
+for name, XSDClass, help in plugin.PlugChildsTypes:
-for name, XSDClass in plugin.PlugChildsTypes:
 new_id = wx.NewId()
-plugin_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=name)
+main_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text="Append "+help)
-self.Bind(wx.EVT_MENU, self._GetAddPluginFunction(name), id=new_id)
+self.Bind(wx.EVT_MENU, self._GetAddPluginFunction(name, plugin), id=new_id)
-main_menu.AppendMenu(-1, "Add", plugin_menu, '')
+self.PopupMenuXY(main_menu)
-new_id = wx.NewId()
+event.Skip()
-main_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text="Delete")
+return AddPluginMenu
-self.Bind(wx.EVT_MENU, self.OnDeleteButton, id=new_id)
-pos_x, pos_y = event.GetPosition()
-self.PluginTree.PopupMenuXY(main_menu, pos_x, pos_y)
-event.Skip()
 def GetButtonCallBackFunction(self, plugin, method):
 def OnButtonClick(event):
 getattr(plugin,method)(self.Log)
 self.RefreshVariableLists()
 boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 if first:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
 else:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
-bitmappath = os.path.join("images", "%s.png"%element_infos["name"])
+staticbitmap = GenStaticBitmap(ID=-1, bitmapname="%s.png"%element_infos["name"],
-if os.path.isfile(bitmappath):
+name="%s_bitmap"%element_infos["name"], parent=parent,
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-name="%s_bitmap"%element_infos["name"], parent=parent,
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-else:
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(24, 24),
-name="%s_bitmap"%element_infos["name"], parent=parent,
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
 boxsizer.AddWindow(statictext, 0, border=4, flag=wx.TOP)
 id = wx.NewId()
 boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 if first:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
 else:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
-bitmappath = os.path.join("images", "%s.png"%element_infos["name"])
+staticbitmap = GenStaticBitmap(ID=-1, bitmapname="%s.png"%element_infos["name"],
-if os.path.isfile(bitmappath):
+name="%s_bitmap"%element_infos["name"], parent=parent,
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-name="%s_bitmap"%element_infos["name"], parent=parent,
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-else:
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(24, 24),
-name="%s_bitmap"%element_infos["name"], parent=parent,
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
 boxsizer.AddWindow(statictext, 0, border=4, flag=wx.TOP)
 id = wx.NewId()
 boxsizer = wx.BoxSizer(wx.HORIZONTAL)
 if first:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.ALL)
 else:
 sizer.AddSizer(boxsizer, 0, border=5, flag=wx.GROW|wx.LEFT|wx.RIGHT|wx.BOTTOM)
-bitmappath = os.path.join("images", "%s.png"%element_infos["name"])
+staticbitmap = GenStaticBitmap(ID=-1, bitmapname="%s.png"%element_infos["name"],
-if os.path.isfile(bitmappath):
+name="%s_bitmap"%element_infos["name"], parent=parent,
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=wx.Bitmap(bitmappath),
+pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-name="%s_bitmap"%element_infos["name"], parent=parent,
+boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
-else:
-staticbitmap = wx.StaticBitmap(id=-1, bitmap=GenerateEmptyBitmap(24, 24),
-name="%s_bitmap"%element_infos["name"], parent=parent,
-pos=wx.Point(0, 0), size=wx.Size(24, 24), style=0)
-boxsizer.AddWindow(staticbitmap, 0, border=5, flag=wx.RIGHT)
 statictext = wx.StaticText(id=-1, label="%s:"%element_infos["name"],
 name="%s_label"%element_infos["name"], parent=parent,
 pos=wx.Point(0, 0), size=wx.Size(100, 17), style=0)
 boxsizer.AddWindow(statictext, 0, border=4, flag=wx.TOP)
 def GetAddButtonFunction(self, plugin, window):
 def AddButtonFunction(event):
 if plugin and len(plugin.PlugChildsTypes) > 0:
 plugin_menu = wx.Menu(title='')
-for name, XSDClass in plugin.PlugChildsTypes:
+for name, XSDClass, help in plugin.PlugChildsTypes:
 new_id = wx.NewId()
-plugin_menu.Append(help='', id=new_id, kind=wx.ITEM_NORMAL, text=name)
+plugin_menu.Append(help=help, id=new_id, kind=wx.ITEM_NORMAL, text=name)
 self.Bind(wx.EVT_MENU, self._GetAddPluginFunction(name, plugin), id=new_id)
 window_pos = window.GetPosition()
 wx.CallAfter(self.PLCConfig.PopupMenu, plugin_menu)
 event.Skip()
 return AddButtonFunction

changeset 106	9810689febb0
parent 105	434aed8dc58d
child 109	f27ca37b6e7a