X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc.c;h=98e8a5e1d6d4147640e5b2be8fac8329aeb940f1;hb=d5d861641b0c708c3e148a601af553eef82ff9eb;hp=ec1b93bd267744eac70fb114f3abf487409e4b84;hpb=709e56b1552c26b8d1e3343e61bdfdee232a6f8d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c
index ec1b93bd2..98e8a5e1d 100644
--- a/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@ -3,7 +3,7 @@ CLASS(XonoticMiscSettingsTab) EXTENDS(XonoticTab)
 	METHOD(XonoticMiscSettingsTab, fill, void(entity))
 	ATTRIB(XonoticMiscSettingsTab, title, string, _("Misc"))
 	ATTRIB(XonoticMiscSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticMiscSettingsTab, rows, float, 17)
+	ATTRIB(XonoticMiscSettingsTab, rows, float, 14.5)
 	ATTRIB(XonoticMiscSettingsTab, columns, float, 6.2)
 ENDCLASS(XonoticMiscSettingsTab)
 entity makeXonoticMiscSettingsTab();
@@ -20,48 +20,113 @@ entity makeXonoticMiscSettingsTab()
 void XonoticMiscSettingsTab_fill(entity me)
 {
 	entity e;
-	entity sk;
+	//entity sk;
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Menu skins:")));
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Network")));
+			e.isBold = TRUE;
+			e.alpha = 0.5;
 	me.TR(me);
-		me.TD(me, me.rows - 2, 3, sk = makeXonoticSkinList());
-	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, 3, e = makeXonoticButton(_("Apply immediately"), '0 0 0'));
-			e.onClick = SetSkin_Click;
-			e.onClickEntity = sk;
-
-	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Text language:")));
+		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Client UDP port:")));
+		me.TD(me, 1, 1.5, e = makeXonoticInputBox(0, "cl_port"));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Bandwidth:")));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_rate"));
+			e.addValue(e, _("56k"), "4000");
+			e.addValue(e, _("ISDN"), "7000");
+			e.addValue(e, _("Slow ADSL"), "15000");
+			e.addValue(e, _("Fast ADSL"), "20000");
+			e.addValue(e, _("Broadband"), "66666");
+			e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Input packets/s:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 5, "cl_netfps"));
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Server queries/s:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 10, "net_slist_queriespersecond"));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Downloads:")));
+		me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "cl_curl_maxdownloads"));
+	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(10, 2000, 50, "cl_curl_maxspeed"));
 	me.TR(me);
-		me.TD(me, 3, 3, sk = makeXonoticLanguageList());
+		if(cvar("developer"))
+		{
+			me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Local latency:")));
+			me.TD(me, 1, 2, e = makeXonoticSlider(0, 1000, 25, "cl_netlocalping"));
+		}
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph")));
 	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticButton(_("Apply immediately"), '0 0 0'));
-			e.onClick = SetLanguage_Click;
-			e.onClickEntity = sk;
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation")));
+		setDependent(e, "cl_movement", 1, 1);
+	me.TR(me);
+		if(cvar_type("crypto_aeslevel") & CVAR_TYPEFLAG_ENGINE)
+			me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 1, "crypto_aeslevel", _("Use encryption (AES) when available"))); // TODO: move up
 
+	me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Framerate")));
+			e.isBold = TRUE;
+			e.alpha = 0.5;
+	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");
+			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");
+			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current time")));
+		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");
+			e.addValue(e, ZCTX(_("IDLFPS^Unlimited")), "0");
+			e.configureXonoticTextSliderValues(e);
 	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, "cl_maxfps_alwayssleep", _("Save processing time for other apps")));
+		setDependent(e, "cl_maxfps", 1, 1000);
 	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")));
-
-	if(cvar("developer"))
-	{
-		me.TR(me);
-		me.TR(me);
-			me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu Tooltips:")));
-			me.TD(me, 1, 0.4, e = makeXonoticRadioButton(2, "menu_tooltips", "0", _("Off")));
-			me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "menu_tooltips", "1", _("Standard")));
-			me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "menu_tooltips", "2", _("Advanced")));
-	}
-
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Other")));
+		e.isBold = TRUE;
+		e.alpha = 0.5;
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current date and time")));
+			makeMulti(e, "showdate");
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "developer", _("Enable developer mode")));
 	me.TR(me);
 	me.TR(me);
 		me.TDempty(me, 0.5);