Browse Source

change arrow names to arrow_up,etc

cxgeorge 24 years ago
parent
commit
563772fd77
2 changed files with 12 additions and 12 deletions
  1. 8 8
      direct/src/leveleditor/LevelEditor.py
  2. 4 4
      panda/src/putil/keyboardButton.cxx

+ 8 - 8
direct/src/leveleditor/LevelEditor.py

@@ -495,14 +495,14 @@ class LevelEditor(NodePath, PandaObject):
             # Hot key actions
             ('a', self.autoPositionGrid),
             ('j', self.jumpToInsertionPoint),
-            ('left', self.keyboardXformSelected, ['left', 'xlate']),
-            ('right', self.keyboardXformSelected, ['right', 'xlate']),
-            ('up', self.keyboardXformSelected, ['up','xlate']),
-            ('down', self.keyboardXformSelected, ['down','xlate']),
-            ('control-left', self.keyboardXformSelected, ['left', 'rotate']),
-            ('control-right', self.keyboardXformSelected, ['right', 'rotate']),
-            ('control-up', self.keyboardXformSelected, ['up', 'rotate']),
-            ('control-down', self.keyboardXformSelected, ['down', 'rotate']),
+            ('arrow_left', self.keyboardXformSelected, ['left', 'xlate']),
+            ('arrow_right', self.keyboardXformSelected, ['right', 'xlate']),
+            ('arrow_up', self.keyboardXformSelected, ['up','xlate']),
+            ('arrow_down', self.keyboardXformSelected, ['down','xlate']),
+            ('control-arrow_left', self.keyboardXformSelected, ['left', 'rotate']),
+            ('control-arrow_right', self.keyboardXformSelected, ['right', 'rotate']),
+            ('control-arrow_up', self.keyboardXformSelected, ['up', 'rotate']),
+            ('control-arrow_down', self.keyboardXformSelected, ['down', 'rotate']),
             ('shift-s', self.placeSuitPoint),
             ('shift-c', self.placeBattleCell),
             ('o', self.addToLandmarkBlock),

+ 4 - 4
panda/src/putil/keyboardButton.cxx

@@ -121,10 +121,10 @@ init_keyboard_buttons() {
   ButtonRegistry::ptr()->register_button(_f11, "f11");
   ButtonRegistry::ptr()->register_button(_f12, "f12");
 
-  ButtonRegistry::ptr()->register_button(_left, "left");
-  ButtonRegistry::ptr()->register_button(_right, "right");
-  ButtonRegistry::ptr()->register_button(_up, "up");
-  ButtonRegistry::ptr()->register_button(_down, "down");
+  ButtonRegistry::ptr()->register_button(_left, "arrow_left");
+  ButtonRegistry::ptr()->register_button(_right, "arrow_right");
+  ButtonRegistry::ptr()->register_button(_up, "arrow_up");  // cannot name this 'up' since it conflicts with key-release name 'up'
+  ButtonRegistry::ptr()->register_button(_down, "arrow_down");  
   ButtonRegistry::ptr()->register_button(_page_up, "page_up");
   ButtonRegistry::ptr()->register_button(_page_down, "page_down");
   ButtonRegistry::ptr()->register_button(_home, "home");