Add "mutewhenidle" selection in audio tab, move tooltip selection to misc tab, and...

diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c
index c2b841f11e97e215de8bc42697f78ccb82cec1e0..8e80495321436beaeeeed91eca8447e5ee00cdd5 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_audio.c
+++ b/qcsrc/menu/xonotic/dialog_settings_audio.c
@@ -115,6 +115,8 @@ void XonoticAudioSettingsTab_fill(entity me)
        me.TR(me);
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "menu_snd_attenuation_method", _("New style sound attenuation")));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "snd_mutewhenidle", _("Mute sounds when not active")));
        
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Frequency:")));

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index 48a3c3993149e1130a1645d7c99881aa5ac1c066..b26b6f8a259d6c78d63367147fc7d23ece4195d2 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -75,14 +75,70 @@ void XonoticMiscSettingsTab_fill(entity me)
        me.TR(me);
 
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Framerate:")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
+                       e.addValue(e, _("5 fps"), "5");
+                       e.addValue(e, _("10 fps"), "10");
+                       e.addValue(e, _("20 fps"), "20");
+                       e.addValue(e, _("30 fps"), "30");
+                       e.addValue(e, _("40 fps"), "40");
+                       e.addValue(e, _("50 fps"), "50");
+                       e.addValue(e, _("60 fps"), "60");
+                       e.addValue(e, _("70 fps"), "70");
+                       e.addValue(e, _("100 fps"), "100");
+                       e.addValue(e, _("125 fps"), "125");
+                       e.addValue(e, _("200 fps"), "200");
+                       e.addValue(e, _("Unlimited"), "0");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Target:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
+                       e.addValue(e, _("Disabled"), "0");
+                       e.addValue(e, _("30 fps"), "30");
+                       e.addValue(e, _("40 fps"), "40");
+                       e.addValue(e, _("50 fps"), "50");
+                       e.addValue(e, _("60 fps"), "60");
+                       e.addValue(e, _("100 fps"), "100");
+                       e.addValue(e, _("125 fps"), "125");
+                       e.addValue(e, _("200 fps"), "200");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Idle limit:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxidlefps"));
+                       e.addValue(e, _("10 fps"), "10");
+                       e.addValue(e, _("20 fps"), "20");
+                       e.addValue(e, _("30 fps"), "30");
+                       e.addValue(e, _("60 fps"), "60");
+                       e.addValue(e, _("Unlimited"), "0");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second")));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Save processing time for other apps")));
+               setDependent(e, "cl_maxfps", 1, 1000);
+       me.TR(me);
+       me.TR(me);
+               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
+                       e.addValue(e, _("Disabled"), "0");
+                       e.addValue(e, _("Standard"), "1");
+                       e.addValue(e, _("Advanced"), "2");
+                       e.configureXonoticTextSliderValues(e);
+       me.TR(me);
+       me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current time")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showdate", _("Show current date")));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second")));
-       me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Minimize input latency")));
-               
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "developer", _("Enable developer mode")));
        me.TR(me);
        me.TR(me);
                me.TDempty(me, 0.5);

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c
index 954c74717c12a13516b728a71d043fb57837043b..9a1710a9f5bbe8635bcf665281dcd9cdafc621d8 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_user.c
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -76,22 +76,15 @@ void XonoticUserSettingsTab_fill(entity me)
                        e.onClickEntity = sk;
                
        me.gotoRC(me, 9, 2.2); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
-               me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
-                       e.addValue(e, _("Disabled"), "0");
-                       e.addValue(e, _("Standard"), "1");
-                       e.addValue(e, _("Advanced"), "2");
-                       e.configureXonoticTextSliderValues(e);
-       me.TR(me);
-       me.TR(me);
                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, me.rows - 2, 2.6);
+       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));
 
 }