Merge branch 'master' into Mirio/balance

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

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.qc b/qcsrc/menu/xonotic/dialog_settings_misc.qc
index 895a554e4757f8aa30ccd5363ab8545b331292f9..8f98df58164e2fbd9933d17492ee6ea2f5ef4c05 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_misc.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.qc
@@ -1,16 +1,16 @@
-#ifndef DIALOG_SETTINGS_MISC_H
-#define DIALOG_SETTINGS_MISC_H
-#include "tab.qc"
-CLASS(XonoticMiscSettingsTab, XonoticTab)
-       METHOD(XonoticMiscSettingsTab, fill, void(entity));
-       ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticMiscSettingsTab, rows, float, 15.5)
-       ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)
-ENDCLASS(XonoticMiscSettingsTab)
-entity makeXonoticMiscSettingsTab();
-#endif
+#include "dialog_settings_misc.qh"
 
-#ifdef IMPLEMENTATION
+#include "textlabel.qh"
+#include "inputbox.qh"
+#include "textslider.qh"
+#include "slider.qh"
+#include "checkbox.qh"
+#include "button.qh"
+#include "mainwindow.qh"
+
+#define ADDVALUE_FPS(i) e.addValue(e, strzone(sprintf(_("%d fps"), i)), #i)
+#define ADDVALUE_SPEED_KB(i) e.addValue(e, strzone(sprintf(_("%d kb/s"), i)), #i)
+#define ADDVALUE_SPEED_MB(i, j) e.addValue(e, strzone(sprintf(_("%d MB/s"), i)), #j)
 entity makeXonoticMiscSettingsTab()
 {
        entity me;
@@ -53,10 +53,16 @@ void XonoticMiscSettingsTab_fill(entity me)
                me.TD(me, 1, 2, e = makeXonoticSlider_T(1, 5, 1, "cl_curl_maxdownloads",
                        _("Maximum number of concurrent HTTP/FTP downloads")));
        me.TR(me);
-               me.TDempty(me, 0.1);
-               me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Speed (kB/s):")));
-               me.TD(me, 1, 2, e = makeXonoticSlider_T(10, 2000, 50, "cl_curl_maxspeed",
-                       _("Maximum download speed")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Download speed:")));
+               me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_curl_maxspeed"));
+               ADDVALUE_SPEED_KB(50);
+               ADDVALUE_SPEED_KB(100);
+               ADDVALUE_SPEED_KB(300);
+               ADDVALUE_SPEED_KB(500);
+               ADDVALUE_SPEED_MB(1, 1000);
+               ADDVALUE_SPEED_MB(2, 2000);
+               e.addValue(e, strzone(_("Unlimited")), "0");
+               e.configureXonoticTextSliderValues(e);
        me.TR(me);
                if(cvar("developer"))
                {
@@ -80,38 +86,39 @@ void XonoticMiscSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Maximum:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps"));
-                       e.addValue(e, ZCTX(_("MAXFPS^5 fps")), "5");
-                       e.addValue(e, ZCTX(_("MAXFPS^10 fps")), "10");
-                       e.addValue(e, ZCTX(_("MAXFPS^20 fps")), "20");
-                       e.addValue(e, ZCTX(_("MAXFPS^30 fps")), "30");
-                       e.addValue(e, ZCTX(_("MAXFPS^40 fps")), "40");
-                       e.addValue(e, ZCTX(_("MAXFPS^50 fps")), "50");
-                       e.addValue(e, ZCTX(_("MAXFPS^60 fps")), "60");
-                       e.addValue(e, ZCTX(_("MAXFPS^70 fps")), "70");
-                       e.addValue(e, ZCTX(_("MAXFPS^100 fps")), "100");
-                       e.addValue(e, ZCTX(_("MAXFPS^125 fps")), "125");
-                       e.addValue(e, ZCTX(_("MAXFPS^200 fps")), "200");
+                       ADDVALUE_FPS(30);
+                       ADDVALUE_FPS(40);
+                       ADDVALUE_FPS(50);
+                       ADDVALUE_FPS(60);
+                       ADDVALUE_FPS(70);
+                       ADDVALUE_FPS(80);
+                       ADDVALUE_FPS(100);
+                       ADDVALUE_FPS(125);
+                       ADDVALUE_FPS(150);
+                       ADDVALUE_FPS(200);
                        e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Target:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps"));
                        e.addValue(e, ZCTX(_("TRGT^Disabled")), "0");
-                       e.addValue(e, ZCTX(_("TRGT^30 fps")), "30");
-                       e.addValue(e, ZCTX(_("TRGT^40 fps")), "40");
-                       e.addValue(e, ZCTX(_("TRGT^50 fps")), "50");
-                       e.addValue(e, ZCTX(_("TRGT^60 fps")), "60");
-                       e.addValue(e, ZCTX(_("TRGT^100 fps")), "100");
-                       e.addValue(e, ZCTX(_("TRGT^125 fps")), "125");
-                       e.addValue(e, ZCTX(_("TRGT^200 fps")), "200");
+                       ADDVALUE_FPS(30);
+                       ADDVALUE_FPS(40);
+                       ADDVALUE_FPS(50);
+                       ADDVALUE_FPS(60);
+                       ADDVALUE_FPS(80);
+                       ADDVALUE_FPS(100);
+                       ADDVALUE_FPS(125);
+                       ADDVALUE_FPS(150);
+                       ADDVALUE_FPS(200);
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Idle limit:")));
                me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxidlefps"));
-                       e.addValue(e, ZCTX(_("IDLFPS^10 fps")), "10");
-                       e.addValue(e, ZCTX(_("IDLFPS^20 fps")), "20");
-                       e.addValue(e, ZCTX(_("IDLFPS^30 fps")), "30");
-                       e.addValue(e, ZCTX(_("IDLFPS^60 fps")), "60");
+                       ADDVALUE_FPS(10);
+                       ADDVALUE_FPS(20);
+                       ADDVALUE_FPS(30);
+                       ADDVALUE_FPS(60);
                        e.addValue(e, ZCTX(_("IDLFPS^Unlimited")), "0");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
@@ -151,4 +158,4 @@ void XonoticMiscSettingsTab_fill(entity me)
                        e.onClick = DialogOpenButton_Click;
                        e.onClickEntity = main.resetDialog;
 }
-#endif
+#undef ADDVALUE_FPS