Fix missing menu icons in Linux (#2485)

* Fix menu icons in Linux (finally)!

Author: HelioGuilherme66

CHANGELOG.adoc

@@ -72,6 +72,7 @@ and this project adheres to http://semver.org/spec/v2.0.0.html[Semantic Versioni
 
 === Fixed
 
+- Fixed missing menu icons on Linux (was working on Windows)
 - Fixed removal of animation in Project tree when test run is interrupted
 - Fixed console log width to fit visible area, depending on font size
 - Fixed not possible to use filenames/paths with spaces in TestRunner arguments. Use double quotes for space separated values,

src/robotide/ui/actiontriggers.py

@@ -135,10 +135,10 @@ def _create_menu_item(self, action):
         name_with_accelerator = self._get_name(action, build_new=True)
         menu_item = MenuItem(self._frame, self, name_with_accelerator)
         pos = action.get_insertion_index(self.wx_menu)
-        wx_menu_item = self.wx_menu.Insert(pos, menu_item.id,
-                                           menu_item.name, action.doc)
+        wx_menu_item = wx.MenuItem(self.wx_menu, menu_item.id, menu_item.name, action.doc)
         if action.icon:
             wx_menu_item.SetBitmap(action.icon)
+        wx_menu_item = self.wx_menu.Insert(pos, wx_menu_item)
         menu_item.set_wx_menu_item(wx_menu_item)
         return menu_item
 

src/robotide/ui/treeplugin.py

@@ -231,6 +231,7 @@ def __init__(self, parent, action_registerer, settings=None):
         self._editor = None
         self._execution_results = None
         self._resources = []
+        self._right_click = False
         """
         self.SetBackgroundColour('white')  # TODO get background color from def
         """
@@ -264,12 +265,18 @@ def _bind_tree_events(self):
         self.Bind(wx.EVT_LEFT_DCLICK, self.OnDoubleClick)
         self.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
         self.Bind(wx.EVT_TREE_ITEM_EXPANDING, self.OnTreeItemExpanding)
-        self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnRightClick)
+        self.Bind(wx.EVT_RIGHT_DOWN, self.OnRightClick)
+        self.Bind(wx.EVT_TREE_SEL_CHANGING, self.OnSelection)
+        # self.Bind(wx.EVT_TREE_ITEM_RIGHT_CLICK, self.OnRightClick)
         self.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnItemActivated)
         self.Bind(customtreectrl.EVT_TREE_ITEM_CHECKED, self.OnTreeItemChecked)
         self.Bind(wx.EVT_TREE_ITEM_COLLAPSING, self.OnTreeItemCollapsing)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
 
+    def OnSelection(self, event):
+        if self._right_click:
+            event.Skip()
+
     def OnDoubleClick(self, event):
         item, pos = self.HitTest(self.ScreenToClient(wx.GetMousePosition()))
         if item:
@@ -1031,14 +1038,20 @@ def OnLeftArrow(self, event):
             event.Skip()
 
     def OnRightClick(self, event):
+        if not self._right_click:
+            self._right_click = True
         handler = None
-        if hasattr(event, 'GetItem'):
-            handler = self._controller.get_handler(event.GetItem())
-
+        # if hasattr(event, 'GetItem'):
+            # handler = self._controller.get_handler(event.GetItem())
+        item, pos = self.HitTest(self.ScreenToClient(wx.GetMousePosition()), wx.TREE_HITTEST_ONITEMLABEL)
+        if item:
+            print(f"DEBUG: tree mouse RightClick pos={pos}")
+            handler = self.GetItemData(item)
         if handler:
             # if not self.IsExpanded(handler.node):
             #     self.Expand(handler.node)
             handler.show_popup()
+            self._right_click = False
 
     def OnNewTestCase(self, event):
         handler = self._controller.get_handler()

src/robotide/version.py

@@ -14,4 +14,4 @@
 #  limitations under the License.
 #
 # Automatically generated by `tasks.py`.
-VERSION = 'v2.0b2.dev23'
+VERSION = 'v2.0b2.dev24'