X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_input.c;h=c8ba7c4fd4483defb98d124de8ddbc88c736cf74;hp=2f2c1c01cc53efe717542899f90baff1b60f56d6;hb=402c9d84fe00cc341e02db9b6e3db5b617301ed6;hpb=e0b3d3d38bf74702d68f12d8d385a3cf42da29d4

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c
index 2f2c1c01cc..c8ba7c4fd4 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@ -3,7 +3,7 @@ CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
 	METHOD(XonoticInputSettingsTab, fill, void(entity))
 	ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
 	ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticInputSettingsTab, rows, float, 14.5)
+	ATTRIB(XonoticInputSettingsTab, rows, float, 17)
 	ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space
 ENDCLASS(XonoticInputSettingsTab)
 entity makeXonoticInputSettingsTab();
@@ -20,15 +20,16 @@ entity makeXonoticInputSettingsTab()
 void XonoticInputSettingsTab_fill(entity me)
 {
 	entity e;
-	entity kb;
+	entity kb = makeXonoticKeyBinder();
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Key Bindings")));
-			e.isBold = TRUE;
-			e.alpha = 0.5;
+		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Key bindings:")));
+		me.TD(me, 1, 1, e = makeXonoticButton(_("Reset all"), '0 0 0'));
+			e.onClick = KeyBinder_Bind_Reset_All;
+			e.onClickEntity = kb;
 	me.TR(me);
-		me.TD(me, me.rows - 2.5, 3, kb = makeXonoticKeyBinder());
-	me.gotoRC(me, me.rows - 1.5, 0);
+		me.TD(me, me.rows - 4, 3, kb);
+	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;
@@ -44,59 +45,51 @@ void XonoticInputSettingsTab_fill(entity me)
 			e.onClickEntity = kb;
 			kb.clearButton = e;
 
-	// todo:
-	// add menu_mouse_absolute and hud_cursormode here
-
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Mouse")));
-			e.isBold = TRUE;
-			e.alpha = 0.5;
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Sensitivity:")));
-		me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", _("Smooth aiming")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert aiming")));
 	me.TR(me);
-		if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_dgamouse", _("Disable system mouse acceleration")));
-		else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Disable system mouse acceleration")));
+		if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
+			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")));
 		else
 		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Disable system mouse acceleration")));
+			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input")));
 			e.disabled = 1; // the option is never available in this case, just there for show
 		}
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration")));
-
 	me.TR(me);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Other")));
-			e.isBold = TRUE;
-			e.alpha = 0.5;
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Mouse:")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Sensitivity:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));
-			e.sendCvars = TRUE;
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "m_filter", _("Smooth aiming")));
 	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert aiming")));
 	me.TR(me);
-		if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
-		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input")));
-			setDependent(e, "joy_detected", 1, 10000000);
-		}
-		else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
-		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input")));
-			setDependent(e, "joy_detected", 1, 10000000);
-		}
+		me.TDempty(me, 0.2);
+		if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
+			me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "vid_dgamouse", _("Disable system mouse acceleration")));
+		else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
+			me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Disable system mouse acceleration")));
 		else
 		{
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input")));
+			me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, string_null, _("Disable system mouse acceleration")));
 			e.disabled = 1; // the option is never available in this case, just there for show
 		}
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration")));
+
+
+	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