X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_misc.c;h=1deda87df078a26c24569b2bf1dd6cb54155b1b6;hb=5dbda91e68e08abcedef699f99c3654c8f97242b;hp=37effe93256e3415ac97140777ee7bda1062669e;hpb=f5689f55e2665c871cfabcee9f8534c482e2b79b;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 37effe932..1deda87df 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();
@@ -23,10 +23,13 @@ void XonoticMiscSettingsTab_fill(entity me)
 	//entity sk;
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Network:")));
+		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Network")));
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Speed:")));
+		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");
@@ -35,51 +38,40 @@ void XonoticMiscSettingsTab_fill(entity me)
 			e.addValue(e, _("Broadband"), "66666");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Input packets/s:")));
+		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);
 		if(cvar("developer"))
 		{
-			me.TDempty(me, 0.2);
-			me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Local latency:")));
+			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.TDempty(me, 0.2);
-		me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, _("Client UDP port:")));
-		me.TD(me, 1, 1, e = makeXonoticInputBox(0, "cl_port"));
-			e.enableClearButton = 0;
-	me.TR(me);
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph")));
+		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.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction")));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation")));
 		setDependent(e, "cl_movement", 1, 1);
 	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Downloads:")));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:")));
-		me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "cl_curl_maxdownloads"));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Speed (kB/s):")));
-		me.TD(me, 1, 2, e = makeXonoticSlider(10, 1500, 10, "cl_curl_maxspeed"));
-	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, _("Framerate:")));
+		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Framerate")));
 	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:")));
+		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");
@@ -95,8 +87,7 @@ void XonoticMiscSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("MAXFPS^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, 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");
@@ -108,8 +99,7 @@ void XonoticMiscSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("TRGT^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, 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");
@@ -119,13 +109,13 @@ void XonoticMiscSettingsTab_fill(entity me)
 			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")));
+		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.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Other")));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
@@ -134,18 +124,20 @@ void XonoticMiscSettingsTab_fill(entity me)
 			e.addValue(e, ZCTX(_("TLTIP^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.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);
 		me.TD(me, 1, 2, e = makeXonoticButton(_("Advanced settings..."), '0 0 0'));
 			e.onClick = DialogOpenButton_Click;
 			e.onClickEntity = main.cvarsDialog;
 	me.TR(me);
+		me.TDempty(me, 0.5);
+		me.TD(me, 1, 2, e = makeXonoticButton(_("Factory reset"), '0 0 0'));
+			e.onClick = DialogOpenButton_Click;
+			e.onClickEntity = main.resetDialog;
 }
 #endif