...and the first bug fix of 1.80 - string conversion of numpad key settings

master
cim 2014-07-02 19:50:17 +01:00
parent 126622f2e7
commit 61718766b2
3 changed files with 39 additions and 1 deletions

View File

@ -1883,6 +1883,16 @@
"oolite-keycode-delete" = "Delete";
"oolite-keycode-pageup" = "Page Up";
"oolite-keycode-pagedown" = "Page Down";
"oolite-keycode-numpad0" = "Numpad 0";
"oolite-keycode-numpad1" = "Numpad 1";
"oolite-keycode-numpad2" = "Numpad 2";
"oolite-keycode-numpad3" = "Numpad 3";
"oolite-keycode-numpad4" = "Numpad 4";
"oolite-keycode-numpad5" = "Numpad 5";
"oolite-keycode-numpad6" = "Numpad 6";
"oolite-keycode-numpad7" = "Numpad 7";
"oolite-keycode-numpad8" = "Numpad 8";
"oolite-keycode-numpad9" = "Numpad 9";
// Mac multi-screen handling

View File

@ -16,10 +16,17 @@
key_gui_system_data = "7";
key_gui_market = "8";
key_gui_arrow_left = 253;
/* key_gui_arrow_left = 253;
key_gui_arrow_right = 252;
key_gui_arrow_up = 255;
key_gui_arrow_down = 254;
*/
// alternative settings to use numpad instead
key_gui_arrow_left = 314; //numpad 4
key_gui_arrow_right = 316; //numpad 6
key_gui_arrow_up = 318; //numpad 8
key_gui_arrow_down = 312; //numpad 2
key_increase_speed = "w";
key_decrease_speed = "s";

View File

@ -448,6 +448,27 @@ MA 02110-1301, USA.
return DESC(@"oolite-keycode-pageup");
case gvPageDownKey:
return DESC(@"oolite-keycode-pagedown");
case gvNumberPadKey0:
return DESC(@"oolite-keycode-numpad0");
case gvNumberPadKey1:
return DESC(@"oolite-keycode-numpad1");
case gvNumberPadKey2:
return DESC(@"oolite-keycode-numpad2");
case gvNumberPadKey3:
return DESC(@"oolite-keycode-numpad3");
case gvNumberPadKey4:
return DESC(@"oolite-keycode-numpad4");
case gvNumberPadKey5:
return DESC(@"oolite-keycode-numpad5");
case gvNumberPadKey6:
return DESC(@"oolite-keycode-numpad6");
case gvNumberPadKey7:
return DESC(@"oolite-keycode-numpad7");
case gvNumberPadKey8:
return DESC(@"oolite-keycode-numpad8");
case gvNumberPadKey9:
return DESC(@"oolite-keycode-numpad9");
default:
return [NSString stringWithFormat:@"%C",code];
}