Merge branch 'martin-t/limit'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_user.qc

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc
index 062d538bba6e7e322ac602c509110532ce8e9ee2..5e5b707faed5fd4d216b23a1348693d7bc2e712d 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -1,16 +1,11 @@
-#ifndef DIALOG_SETTINGS_USER_H
-#define DIALOG_SETTINGS_USER_H
-#include "tab.qc"
-CLASS(XonoticUserSettingsTab, XonoticTab)
-       METHOD(XonoticUserSettingsTab, fill, void(entity));
-       ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticUserSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticUserSettingsTab, columns, float, 6)
-ENDCLASS(XonoticUserSettingsTab)
-entity makeXonoticUserSettingsTab();
-#endif
+#include "dialog_settings_user.qh"
+
+#include "commandbutton.qh"
+#include "textlabel.qh"
+#include "languagelist.qh"
+#include "skinlist.qh"
+#include "checkbox.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticUserSettingsTab()
 {
        entity me;
@@ -21,16 +16,15 @@ entity makeXonoticUserSettingsTab()
 
 void XonoticUserSettingsTab_fill(entity me)
 {
-       entity e;
-       entity sk;
+       entity e, sk;
 
        me.TR(me);
                me.TDempty(me, 0.25);
                me.TD(me, 1, 2.5, e = makeXonoticHeaderLabel(_("Menu Skins")));
        me.TR(me);
                me.TDempty(me, 0.25);
-               me.TD(me, me.rows - 2.5, 2.5, sk = makeXonoticSkinList());
-       me.gotoRC(me, me.rows - 1.5, 0.25);
+               me.TD(me, me.rows - 3.5, 2.5, sk = makeXonoticSkinList());
+       me.gotoRC(me, me.rows - 2.5, 0.25);
                me.TD(me, 1, 2.5, e = makeXonoticButton(_("Set skin"), '0 0 0'));
                        e.onClick = SetSkin_Click;
                        e.onClickEntity = sk;
@@ -76,23 +70,6 @@ void XonoticUserSettingsTab_fill(entity me)
 
        me.gotoRC(me, 11.5, 3.25); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 2.5, e = makeXonoticCheckBox_T(0, "cl_gentle", _("Disable gore effects and harsh language"),
-                       _("Replace blood and gibs with content that does not have any gore effects (default: disabled)")));
-
-       //me.TR(me);
-       //      me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
-       //      me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
-       //              e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
-       //              e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");
-       //              e.addValue(e, ZCTX(_("TLTIP^Advanced")), "2");
-       //              e.configureXonoticTextSliderValues(e);
-       //me.TR(me);
-       //      me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uidtracking", _("Allow player statistics to track your client"))); // TODO: move to profile tab
-       //me.TR(me);
-       //      me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uid2name", _("Allow player statistics to use your nickname")));
-       //      setDependent(e, "cl_allow_uidtracking", 1, 1);
-
-       //me.gotoRC(me, me.rows - 1, 2.6);
-       //      me.TD(me, 1, 2, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY));
-
+                       _("Replace blood and gibs with content that does not have any gore effects")));
+                       e.sendCvars = true;
 }
-#endif