Merge branch 'master' into terencehill/music_player

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

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
index a8e31c52cac14953afb2e35d45c8c79aca2ea15e..b2b440a1c45673b0dbe7cc1aef5c62cb874f4858 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_view.c
@@ -6,8 +6,8 @@ CLASS(XonoticViewDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticViewDialog, title, string, _("View settings"))
        ATTRIB(XonoticViewDialog, color, vector, SKINCOLOR_DIALOG_VIEW)
        ATTRIB(XonoticViewDialog, intendedWidth, float, 0.9)
-       ATTRIB(XonoticViewDialog, rows, float, 12)
-       ATTRIB(XonoticViewDialog, columns, float, 6.2) // added extra .2 for center space 
+       ATTRIB(XonoticViewDialog, rows, float, 11)
+       ATTRIB(XonoticViewDialog, columns, float, 6.2) // added extra .2 for center space
 ENDCLASS(XonoticViewDialog)
 #endif
 
@@ -18,30 +18,28 @@ void XonoticViewDialog_showNotify(entity me)
 }
 string XonoticViewDialog_toString(entity me)
 {
-       return "hi"; //me.weaponsList.toString(me.weaponsList);
+       return "hi"; // TODO: show fov and other settings with text here
 }
 void XonoticViewDialog_fill(entity me)
 {
-       entity e, sl;
-       float i;
-       
+       entity e;
+
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Field of view:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(60, 130, 5, "fov"));
-       me.TR(me);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Zoom:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_reticle"));
-                       e.addValue(e, _("Fullscreen"), "0");
-                       e.addValue(e, _("With reticle"), "1");
+                       e.addValue(e, ZCTX(_("RETICLE^Fullscreen")), "0");
+                       e.addValue(e, ZCTX(_("RETICLE^With reticle")), "1");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Factor:")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("ZOOM^Factor:"))));
                me.TD(me, 1, 2, e = makeXonoticSlider(2, 16, 0.5, "cl_zoomfactor"));
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Speed:")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("ZOOM^Speed:"))));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_zoomspeed"));
                        e.addValue(e, "1", "1"); // Samual: for() loop doesn't work here, even though it would make sense.
                        e.addValue(e, "2", "2");
@@ -51,28 +49,28 @@ void XonoticViewDialog_fill(entity me)
                        e.addValue(e, "6", "6");
                        e.addValue(e, "7", "7");
                        e.addValue(e, "8", "8");
-                       e.addValue(e, _("Instant"), "-1");
+                       e.addValue(e, ZCTX(_("ZOOM^Instant")), "-1");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Sensitivity:")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("ZOOM^Sensitivity:"))));
                me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.1, "cl_zoomsensitivity"));
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Velocity zoom:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_velocityzoom_type"));
-                       e.addValue(e, _("Disabled"), "0");
-                       e.addValue(e, _("Forward only"), "3");
-                       e.addValue(e, _("All directions"), "1");
+                       e.addValue(e, ZCTX(_("VZOOM^Disabled")), "0");
+                       e.addValue(e, ZCTX(_("VZOOM^Forward only")), "2");
+                       e.addValue(e, ZCTX(_("VZOOM^All directions")), "1");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Speed")));
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, ZCTX(_("VZOOM^Speed"))));
                me.TD(me, 1, 2, e = makeXonoticSlider(-1, 1, 0.2, "cl_velocityzoom"));
                setDependent(e, "cl_velocityzoom_type", 1, 3);
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_clippedspectating", _("Allow passing through walls while spectating")));
-       
+
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "0", _("1st person perspective")));
                makeMulti(e, "crosshair_hittest_showimpact");
@@ -86,19 +84,13 @@ void XonoticViewDialog_fill(entity me)
                setDependent(e, "chase_active", -1, 0);
        me.TR(me);
                me.TDempty(me, 0.2);
-               sl = makeXonoticSlider(0.45, 0.75, 0.01, "cl_bobcycle");
-               makeMulti(sl, "cl_bob2cycle");
-               setDependent(sl, "chase_active", -1, 0);
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View bobbing:")));
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(1, 0, "v_idlescale", _("View waving while idle")));
                setDependent(e, "chase_active", -1, 0);
-               me.TD(me, 1, 1.8, sl);
        me.TR(me);
                me.TDempty(me, 0.2);
-               sl = makeXonoticSlider(1, 10, 1, "v_idlescale");
-               setDependent(sl, "chase_active", -1, 0);
-               me.TD(me, 1, 1, e = makeXonoticSliderCheckBox(0, 1, sl, _("View waving:")));
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(0.01, 0, "cl_bob", _("View bobbing while walking around")));
+               makeMulti(e, "cl_bob2");
                setDependent(e, "chase_active", -1, 0);
-               me.TD(me, 1, 1.8, sl);
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticRadioButton(1, "chase_active", "1", _("3rd person perspective")));
@@ -116,7 +108,7 @@ void XonoticViewDialog_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticSlider(10, 50, 1, "chase_up"));
                setDependent(e, "chase_active", 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;