Updates to view settings dialog

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index d83e7808e201363adc1e704f55b9f6f7ce3b37e2..c4a004e858b9095915ab9f6b85f2bd1a39d29e99 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -64,6 +64,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
        SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
+       SKINVECTOR(COLOR_DIALOG_VIEW, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index 95c55523a3f54780807bf6cd73008f9f0a677adb..22d5b6de2585ecdb9664af8d80b6246300c74bc8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -4,9 +4,9 @@ CLASS(XonoticViewDialog) EXTENDS(XonoticDialog)
        METHOD(XonoticViewDialog, fill, void(entity))
        METHOD(XonoticViewDialog, showNotify, void(entity))
        ATTRIB(XonoticViewDialog, title, string, _("View settings"))
-       ATTRIB(XonoticViewDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)
-       ATTRIB(XonoticViewDialog, intendedWidth, float, 0.4)
-       ATTRIB(XonoticViewDialog, rows, float, 18)
+       ATTRIB(XonoticViewDialog, color, vector, SKINCOLOR_DIALOG_VIEW)
+       ATTRIB(XonoticViewDialog, intendedWidth, float, 0.6)
+       ATTRIB(XonoticViewDialog, rows, float, 10)
        ATTRIB(XonoticViewDialog, columns, float, 3)
 ENDCLASS(XonoticViewDialog)
 #endif
@@ -24,6 +24,18 @@ void XonoticViewDialog_fill(entity me)
 {
        entity e;
 
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints")));
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint scale:")));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale"));
+                               setDependent(e, "cl_hidewaypoints", 0, 0);
+       me.TR(me);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint alpha:")));
+                       me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
+                               setDependent(e, "cl_hidewaypoints", 0, 0);
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_shownames", _("Show names above players")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", _("Use priority list for weapon cycling")));
        me.TR(me);
@@ -38,7 +50,8 @@ void XonoticViewDialog_fill(entity me)
                        setDependent(e, "r_drawviewmodel", 1, 1);
                me.TD(me, 1, 1.0, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align")));
                        setDependent(e, "r_drawviewmodel", 1, 1);
-       me.TR(me);
+                       
+       me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;