X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_input.qc;h=b025c3aff7c7c2c5927dd9605f9704a815cefc95;hb=af2f0cb624aaf967708b22e1303d113668af5114;hp=937fe879049cee1e57f16bdd2a8c5ab8f68acef4;hpb=cd508c593bc52d211c1675e1e52ae741cc487ab3;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 937fe8790..b025c3aff 100644
--- a/qcsrc/menu/xonotic/dialog_settings_input.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_input.qc
@@ -1,16 +1,16 @@
-#ifndef DIALOG_SETTINGS_INPUT_H
-#define DIALOG_SETTINGS_INPUT_H
-#include "tab.qc"
-CLASS(XonoticInputSettingsTab, XonoticTab)
-	METHOD(XonoticInputSettingsTab, fill, void(entity));
-	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;
@@ -51,8 +51,8 @@ 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")));
@@ -67,7 +67,7 @@ void XonoticInputSettingsTab_fill(entity me)
 		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;
@@ -121,4 +121,3 @@ void XonoticInputSettingsTab_fill(entity me)
 			e.disabled = 1; // the option is never available in this case, just there for show
 		}
 }
-#endif