Merge pull request #1169 from chaosphere2112/mac_control_click

Mac control click fixes

Author: doutriaux1

Packages/vcs/Lib/editors/marker.py

@@ -5,6 +5,7 @@
 import vtk
 import vcs.vcs2vtk
 import priority
+import sys
 
 class MarkerEditor(behaviors.ClickableMixin, behaviors.DraggableMixin, priority.PriorityEditor):
     """
@@ -61,7 +62,8 @@ def __init__(self, interactor, marker, index, display, configurator):
         prop.SetBackgroundColor(.87, .79, .55)
         prop.SetBackgroundOpacity(1)
         prop.SetColor(0, 0, 0)
-        self.tooltip = vtk_ui.Label(self.interactor, "Ctrl + Click to place new markers.", textproperty=prop)
+
+        self.tooltip = vtk_ui.Label(self.interactor, "%s + Click to place new markers." % ("Cmd" if sys.platform == "darwin" else "Ctrl"), textproperty=prop)
         self.tooltip.left = 0
         self.tooltip.top = self.interactor.GetRenderWindow().GetSize()[1] - self.tooltip.get_dimensions()[1]
         self.tooltip.show()
@@ -73,7 +75,7 @@ def get_object(self):
 
     def handle_click(self, point):
         x, y = point
-        # Alt drops a new instance
+        # Control drops a new instance
         return self.in_bounds(x, y) or self.toolbar.in_toolbar(x, y) or self.current_modifiers()["control"]
 
     def is_object(self, marker):
@@ -136,7 +138,6 @@ def cancel_color(self):
 
     def click_release(self):
         x, y = self.event_position()
-
         if self.current_modifiers()["control"]:
             h = vtk_ui.Handle(self.interactor, (x, y), dragged=self.adjust, color=(0,0,0), normalize=True)
             h.show()

Packages/vcs/Lib/editors/text.py

@@ -7,6 +7,7 @@
 import vcs
 from vcs.vcs2vtk import genTextActor
 from font import FontEditor
+import sys
 
 __valign_map__ = {
     0: 0,
@@ -58,7 +59,7 @@ def __init__(self, interactor, text, index, dp, configurator):
         prop.SetBackgroundColor(.87, .79, .55)
         prop.SetBackgroundOpacity(1)
         prop.SetColor(0, 0, 0)
-        self.tooltip = Label(self.interactor, "Ctrl + Click to place new text.", textproperty=prop)
+        self.tooltip = Label(self.interactor, "%s + Click to place new text." % ("Cmd" if sys.platform == "darwin" else "Ctrl"), textproperty=prop)
         self.tooltip.left = 0
         self.tooltip.top = self.interactor.GetRenderWindow().GetSize()[1] - self.tooltip.get_dimensions()[1]
         self.tooltip.show()