beremiz

Fixed bug when drag'n dropping POU from project tree, POU editor is selected if open

2013-06-10, Laurent Bessard
ceaf9b4c0f86
Parents d1f6ea56555d
Children 368f8516706c
Fixed bug when drag'n dropping POU from project tree, POU editor is selected if open
2 files changed, 10 insertions(+), 25 deletions(-)
  • +1 -4
    Beremiz.py
  • +9 -21
    IDEFrame.py
    • --- a/Beremiz.py Mon Jun 10 11:22:05 2013 +0200
    +++ b/Beremiz.py Mon Jun 10 11:54:18 2013 +0200
    @@ -999,10 +999,7 @@
    IDEFrame.OnProjectTreeItemBeginEdit(self, event)
    def OnProjectTreeRightUp(self, event):
    - if wx.Platform == '__WXMSW__':
    - item = event.GetItem()
    - else:
    - item, flags = self.ProjectTree.HitTest(wx.Point(event.GetX(), event.GetY()))
    + item = event.GetItem()
    item_infos = self.ProjectTree.GetPyData(item)
    if item_infos["type"] == ITEM_CONFNODE:
    --- a/IDEFrame.py Mon Jun 10 11:22:05 2013 +0200
    +++ b/IDEFrame.py Mon Jun 10 11:54:18 2013 +0200
    @@ -529,16 +529,11 @@
    add_menu = wx.Menu()
    self._init_coll_AddMenu_Items(add_menu)
    self.ProjectTree.SetAddMenu(add_menu)
    - if wx.Platform == '__WXMSW__':
    - self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnProjectTreeRightUp,
    - id=ID_PLCOPENEDITORPROJECTTREE)
    - self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnProjectTreeItemSelected,
    - id=ID_PLCOPENEDITORPROJECTTREE)
    - else:
    - self.ProjectTree.Bind(wx.EVT_RIGHT_UP, self.OnProjectTreeRightUp)
    - self.ProjectTree.Bind(wx.EVT_LEFT_UP, self.OnProjectTreeLeftUp)
    - self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnProjectTreeItemChanging,
    - id=ID_PLCOPENEDITORPROJECTTREE)
    + self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnProjectTreeRightUp,
    + id=ID_PLCOPENEDITORPROJECTTREE)
    + self.ProjectTree.Bind(wx.EVT_LEFT_UP, self.OnProjectTreeLeftUp)
    + self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnProjectTreeItemChanging,
    + id=ID_PLCOPENEDITORPROJECTTREE)
    self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.OnProjectTreeBeginDrag,
    id=ID_PLCOPENEDITORPROJECTTREE)
    self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.OnProjectTreeItemBeginEdit,
    @@ -1531,8 +1526,6 @@
    return found
    def OnProjectTreeBeginDrag(self, event):
    - if wx.Platform == '__WXMSW__':
    - self.SelectedItem = event.GetItem()
    if self.SelectedItem is not None and self.ProjectTree.GetPyData(self.SelectedItem)["type"] == ITEM_POU:
    block_name = self.ProjectTree.GetItemText(self.SelectedItem)
    block_type = self.Controler.GetPouType(block_name)
    @@ -1689,7 +1682,7 @@
    if self.SelectedItem is not None:
    self.ProjectTree.SelectItem(self.SelectedItem)
    self.ProjectTreeItemSelect(self.SelectedItem)
    - wx.CallAfter(self.ResetSelectedItem)
    + self.ResetSelectedItem()
    event.Skip()
    def OnProjectTreeMotion(self, event):
    @@ -1724,10 +1717,6 @@
    self.LastToolTipItem = None
    event.Skip()
    - def OnProjectTreeItemSelected(self, event):
    - self.ProjectTreeItemSelect(event.GetItem())
    - event.Skip()
    -
    def OnProjectTreeItemChanging(self, event):
    if self.ProjectTree.GetPyData(event.GetItem())["type"] not in ITEMS_UNEDITABLE and self.SelectedItem is None:
    self.SelectedItem = event.GetItem()
    @@ -1804,10 +1793,7 @@
    return new_window
    def OnProjectTreeRightUp(self, event):
    - if wx.Platform == '__WXMSW__':
    - item = event.GetItem()
    - else:
    - item, flags = self.ProjectTree.HitTest(wx.Point(event.GetX(), event.GetY()))
    + item = event.GetItem()
    self.ProjectTree.SelectItem(item)
    self.ProjectTreeItemSelect(item)
    name = self.ProjectTree.GetItemText(item)
    @@ -1936,6 +1922,8 @@
    self.PopupMenu(menu)
    menu.Destroy()
    + self.ResetSelectedItem()
    +
    event.Skip()