X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_input.qc;h=b025c3aff7c7c2c5927dd9605f9704a815cefc95;hb=af2f0cb624aaf967708b22e1303d113668af5114;hp=0c454d3bc525de0cba701a058e704cd05850bf4c;hpb=6dc9591eba337374f2b4348a6a6deaa1cb6887d0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_input.qc b/qcsrc/menu/xonotic/dialog_settings_input.qc
index 0c454d3bc..b025c3aff 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@ -1,19 +1,20 @@
-#ifdef INTERFACE
-CLASS(XonoticInputSettingsTab) EXTENDS(XonoticTab)
-	METHOD(XonoticInputSettingsTab, fill, void(entity))
-	ATTRIB(XonoticInputSettingsTab, title, string, _("Input"))
-	ATTRIB(XonoticInputSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticInputSettingsTab, rows, float, 15.5)
-	ATTRIB(XonoticInputSettingsTab, columns, float, 6.2) // added extra .2 for center space
-ENDCLASS(XonoticInputSettingsTab)
-entity makeXonoticInputSettingsTab();
-#endif
+#include "dialog_settings_input.qh"
+
+#include "dialog_settings_input_userbind.qh"
+#include "dialog_settings_bindings_reset.qh"
+#include "skinlist.qh"
+#include "slider_resolution.qh"
+#include "../item/checkbox.qh"
+#include "keybinder.qh"
+#include "textlabel.qh"
+#include "button.qh"
+#include "slider.qh"
+#include "checkbox.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticInputSettingsTab()
 {
 	entity me;
-	me = spawnXonoticInputSettingsTab();
+	me = NEW(XonoticInputSettingsTab);
 	me.configureDialog(me);
 	return me;
 }
@@ -50,20 +51,23 @@ void XonoticInputSettingsTab_fill(entity me)
 			kb.clearButton = e;
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticButton(_("Reset all"), '0 0 0'));
-			e.onClick = KeyBinder_Bind_Reset_All;
-			e.onClickEntity = kb;
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.bindingsResetDialog;
 
 	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Mouse")));
 	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, 2, e = makeXonoticSlider_T(1, 32, 0.2, "sensitivity",
+			_("Mouse speed multiplier")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", _("Smooth aiming")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "m_filter", _("Smooth aiming"),
+			_("Smoothes the mouse movement, but makes aiming slightly less responsive")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert aiming")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(1.022, "m_pitch", _("Invert aiming"),
+			_("Invert mouse movement on the Y-axis")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "menu_mouse_absolute", _("Use system mouse positioning")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "menu_mouse_absolute", _("Use system mouse positioning"), "-"));
 			makeMulti(e, "hud_cursormode");
 			e.onClick = CheckBox_Click_Redisplay;
 			e.onClickEntity = e;
@@ -71,7 +75,10 @@ void XonoticInputSettingsTab_fill(entity me)
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration")));
 	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")));
+		{
+			me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "vid_dgamouse", _("Disable system mouse acceleration"),
+				_("Make use of DGA mouse input")));
+		}
 		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")));
 		else
@@ -84,16 +91,17 @@ void XonoticInputSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Other")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it"),
+			_("Allow the console toggling bind to also close the console")));
 	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.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Jetpack on jump:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_jetpack_jump"));
-			e.addValue(e, _("Disabled"), "0");
+			e.addValue(e, ZCTX(_("JPJUMP^Disabled")), "0");
 			e.addValue(e, _("Air only"), "1");
-			e.addValue(e, _("All"), "2");
+			e.addValue(e, ZCTX(_("JPJUMP^All")), "2");
 			e.configureXonoticTextSliderValues(e);
 			e.sendCvars = true;
 	me.TR(me);
@@ -113,4 +121,3 @@ void XonoticInputSettingsTab_fill(entity me)
 			e.disabled = 1; // the option is never available in this case, just there for show
 		}
 }
-#endif