beremiz

Fixed bug when drag'n dropping POU from project tree and POU is selected

2013-06-11, Laurent Bessard
e77c95c4c7fc
Parents ec2c415fc65e
Children 336d515096b1
Fixed bug when drag'n dropping POU from project tree and POU is selected
1 files changed, 8 insertions(+), 5 deletions(-)
  • +8 -5
    IDEFrame.py
    • --- a/IDEFrame.py Mon Jun 10 23:48:08 2013 +0200
    +++ b/IDEFrame.py Tue Jun 11 09:03:35 2013 +0200
    @@ -1446,9 +1446,6 @@
    if tagname is not None:
    self.SelectProjectTreeItem(tagname)
    - def ResetSelectedItem(self):
    - self.SelectedItem = None
    -
    def GenerateProjectTreeBranch(self, root, infos, item_alone=False):
    to_delete = []
    item_name = infos["name"]
    @@ -1525,9 +1522,15 @@
    item, root_cookie = self.ProjectTree.GetNextChild(root, root_cookie)
    return found
    + def ResetSelectedItem(self):
    + self.SelectedItem = None
    +
    def OnProjectTreeBeginDrag(self, event):
    - if self.SelectedItem is not None and self.ProjectTree.GetPyData(self.SelectedItem)["type"] == ITEM_POU:
    - block_name = self.ProjectTree.GetItemText(self.SelectedItem)
    + selected_item = (self.SelectedItem
    + if self.SelectedItem is not None
    + else event.GetItem())
    + if selected_item.IsOk() and self.ProjectTree.GetPyData(selected_item)["type"] == ITEM_POU:
    + block_name = self.ProjectTree.GetItemText(selected_item)
    block_type = self.Controler.GetPouType(block_name)
    if block_type != "program":
    data = wx.TextDataObject(str((block_name, block_type, "")))