[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3657] contrib/py/scripts/addons/ space_view3d_enhanced_3d_cursor.py: The confirm/ cancel mouse buttons are now based on the mouse button that invokes the operator

[dima glib]

Revision: 3657
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3657
Author:   dairin0d
Date:     2012-07-29 20:53:31 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
The confirm/cancel mouse buttons are now based on the mouse button that invokes the operator

Modified Paths:
--------------
    contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py

Modified: contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py
===================================================================
--- contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-07-29 12:06:18 UTC (rev 3656)
+++ contrib/py/scripts/addons/space_view3d_enhanced_3d_cursor.py	2012-07-29 20:53:31 UTC (rev 3657)
@@ -262,7 +262,7 @@
         
         settings_scene = context.scene.cursor_3d_tools_settings
         
-        self.setup_keymaps(context)
+        self.setup_keymaps(context, event)
         
         # Coordinate System Utility
         self.particles, self.csu = gather_particles(context=context)
@@ -353,18 +353,28 @@
         CursorDynamicSettings.active_transform_operator = None
     
     # ====== USER INPUT PROCESSING ====== #
-    def setup_keymaps(self, context):
+    def setup_keymaps(self, context, event=None):
         self.key_map = self.key_map.copy()
         
         # There is no such event as 'ACTIONMOUSE',
         # it's always 'LEFTMOUSE' or 'RIGHTMOUSE'
-        select_mouse = context.user_preferences.inputs.select_mouse
-        if select_mouse == 'RIGHT':
-            self.key_map["confirm"] = {'LEFTMOUSE'}
-            self.key_map["cancel"] = {'RIGHTMOUSE', 'ESC'}
-        else:
-            self.key_map["confirm"] = {'RIGHTMOUSE'}
-            self.key_map["cancel"] = {'LEFTMOUSE', 'ESC'}
+        if event:
+            if event.type == 'LEFTMOUSE':
+                self.key_map["confirm"] = {'LEFTMOUSE'}
+                self.key_map["cancel"] = {'RIGHTMOUSE', 'ESC'}
+            elif event.type == 'RIGHTMOUSE':
+                self.key_map["confirm"] = {'RIGHTMOUSE'}
+                self.key_map["cancel"] = {'LEFTMOUSE', 'ESC'}
+            else:
+                event = None
+        if event is None:
+            select_mouse = context.user_preferences.inputs.select_mouse
+            if select_mouse == 'RIGHT':
+                self.key_map["confirm"] = {'LEFTMOUSE'}
+                self.key_map["cancel"] = {'RIGHTMOUSE', 'ESC'}
+            else:
+                self.key_map["confirm"] = {'RIGHTMOUSE'}
+                self.key_map["cancel"] = {'LEFTMOUSE', 'ESC'}
         
         # Use user-defined "free mouse" key, if it exists
         wm = context.window_manager