Merge remote branch 'origin/terencehill/minstagib_outofammo'

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c
index be6da7a3f534216346da82dd2c67c45349ac9ca9..9a1710a9f5bbe8635bcf665281dcd9cdafc621d8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.c
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -28,11 +28,12 @@ void XonoticUserSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, me.rows - 2, 2, sk = makeXonoticSkinList());
        me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, 2, e = makeXonoticButton(_("Apply immediately"), '0 0 0'));
+               me.TD(me, 1, 2, e = makeXonoticButton(_("Set skin"), '0 0 0'));
                        e.onClick = SetSkin_Click;
                        e.onClickEntity = sk;
 
-       me.gotoRC(me, 0, 2.4); me.setFirstColumn(me, me.currentColumn);
+       /* AFTER 0.6 RELEASE TODO: Add a listbox which has fonts too, this way user can select the font they want.
+       me.gotoRC(me, 0, 2.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Text language:")));
        me.TR(me);
                me.TD(me, 6, 1, sk = makeXonoticLanguageList());
@@ -46,18 +47,45 @@ void XonoticUserSettingsTab_fill(entity me)
                        e.onClick = SetLanguage_Click;
                        e.onClickEntity = sk;
 
-       me.gotoRC(me, 0, 3.6); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Font:")));
+       me.gotoRC(me, 0, 3.3); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 1.5, e = makeXonoticTextLabel(0, _("Font:")));
+       me.TR(me);
+               me.TD(me, 2, 1.5, sk = makeXonoticLanguageList());
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 1.5, e = makeXonoticButton(_("Set font"), '0 0 0'));
+                       e.onClick = SetLanguage_Click;
+                       e.onClickEntity = sk;*/
+                       
+       me.gotoRC(me, 0, 3.1); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Text language:")));
+       me.TR(me);
+               me.TD(me, 6, 1, sk = makeXonoticLanguageList());
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticButton(_("Set language"), '0 0 0'));
+                       e.onClick = SetLanguage_Click;
+                       e.onClickEntity = sk;
+               
+       me.gotoRC(me, 9, 2.2); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language")));
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uidtracking", _("Allow player statistics to track your client")));
+       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, 7, 2.2); me.setFirstColumn(me, me.currentColumn);
-       if(cvar("developer"))
-       {
-               me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 0.75, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
-                       me.TD(me, 1, 0.75, e = makeXonoticRadioButton(2, "menu_tooltips", "0", _("Disabled")));
-                       me.TD(me, 1, 0.75, e = makeXonoticRadioButton(2, "menu_tooltips", "1", _("Standard")));
-                       me.TD(me, 1, 0.75, e = makeXonoticRadioButton(2, "menu_tooltips", "2", _("Advanced")));
-       }
+       me.gotoRC(me, me.rows - 3, 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));
+
 }
 #endif