X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_input.c;h=3bfbdd2a77371f926b48f282357b3b64c7377c95;hb=aaf469db06d1b2613c3b9698164db5f53655ca4e;hp=705c570d15a89c36b70b291270cb5db299899db7;hpb=81fd06082f4878a126140befaa404427b264724b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 705c570d1..3bfbdd2a7 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -1,10 +1,10 @@
 #ifdef INTERFACE
 CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
 	METHOD(XonoticInputSettingsTab, fill, void(entity))
-	ATTRIB(XonoticInputSettingsTab, title, string, "Input")
+	ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
 	ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
 	ATTRIB(XonoticInputSettingsTab, rows, float, 17)
-	ATTRIB(XonoticInputSettingsTab, columns, float, 6.5)
+	ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space 
 ENDCLASS(XonoticInputSettingsTab)
 entity makeXonoticInputSettingsTab();
 #endif
@@ -23,53 +23,53 @@ void XonoticInputSettingsTab_fill(entity me)
 	entity kb;
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, "Key bindings:"));
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Key bindings:")));
 	me.TR(me);
-		me.TD(me, me.rows - 2, 3.3, kb = makeXonoticKeyBinder());
-	me.gotoRC(me, me.rows - 1, 0);
-	me.TR(me);
-		me.TD(me, 1, 1.1, e = makeXonoticButton("Change key...", '0 0 0'));
+		me.TD(me, me.rows - 4, 3, kb = makeXonoticKeyBinder());
+	me.gotoRC(me, me.rows - 3, 0);
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Change key..."), '0 0 0'));
 			e.onClick = KeyBinder_Bind_Change;
 			e.onClickEntity = kb;
 			kb.keyGrabButton = e;
-		me.TD(me, 1, 1.1, e = makeXonoticButton("Edit...", '0 0 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Edit..."), '0 0 0'));
 			e.onClick = KeyBinder_Bind_Edit;
 			e.onClickEntity = kb;
 			kb.userbindEditButton = e;
 			kb.userbindEditDialog = main.userbindEditDialog;
 			main.userbindEditDialog.keybindBox = kb;
-		me.TD(me, 1, 1.1, e = makeXonoticButton("Clear", '0 0 0'));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Clear"), '0 0 0'));
 			e.onClick = KeyBinder_Bind_Clear;
 			e.onClickEntity = kb;
 
-	me.gotoRC(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Sensitivity:"));
+	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Sensitivity:")));
 		me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "UI mouse speed:"));
-		me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 4.0, 0.1, "menu_mouse_speed"));
+		if(cvar("menu_mouse_absolute") == 0) // TODO remove this entirely later
+		{
+			me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("UI mouse speed:")));
+			me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 4.0, 0.1, "menu_mouse_speed"));
+		}
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", "Mouse filter"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", _("Mouse filter")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1.022, "m_pitch", "Invert mouse"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert mouse")));
 	me.TR(me);
 		if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", "Use joystick input"));
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input")));
 		else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", "Use joystick input"));
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input")));
 	me.TR(me);
 		if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_dgamouse", "Turn off OS mouse acceleration"));
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_dgamouse", _("Turn off OS mouse acceleration")));
 		else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", "Turn off OS mouse acceleration"));
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Turn off OS mouse acceleration")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", "\"enter console\" also closes"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("\"enter console\" also closes")));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Show binds:"));
-		me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_showbinds"));
-			e.addValue(e, "Commands", "0");
-			e.addValue(e, "Bound keys", "1");
-			e.addValue(e, "Both", "2");
-			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Holding jump key keeps jumping")));
+	me.gotoRC(me, me.rows - 1, 0);
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_movement_track_canjump", COMMANDBUTTON_APPLY));
 }
 #endif