From: Samual <samual@xonotic.org>
Date: Tue, 17 Jan 2012 04:48:27 +0000 (-0500)
Subject: Abolish "network" tab, and make a new "user" tab in settings window. This will be... 
X-Git-Tag: xonotic-v0.6.0~145
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=09c2da89fff2d4426955d4893c0ce10edc4fae2b;p=xonotic%2Fxonotic-data.pk3dir.git

Abolish "network" tab, and make a new "user" tab in settings window. This will be to better spread out the usage of the tabs, and push the network stuff into an "advanced" or misc tab.
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 41532801d..f838257c5 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -34,7 +34,7 @@
 #include "xonotic/dialog_settings_video.c"
 #include "xonotic/dialog_settings_effects.c"
 #include "xonotic/dialog_settings_audio.c"
-#include "xonotic/dialog_settings_network.c"
+#include "xonotic/dialog_settings_user.c"
 #include "xonotic/dialog_settings_misc.c"
 #include "xonotic/dialog_multiplayer.c"
 #include "xonotic/dialog_multiplayer_playersetup.c"
diff --git a/qcsrc/menu/xonotic/dialog_settings.c b/qcsrc/menu/xonotic/dialog_settings.c
index 1f084a16c..930fa7df9 100644
--- a/qcsrc/menu/xonotic/dialog_settings.c
+++ b/qcsrc/menu/xonotic/dialog_settings.c
@@ -19,7 +19,7 @@ void XonoticSettingsDialog_fill(entity me)
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Video"),   makeXonoticVideoSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Effects"), makeXonoticEffectsSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Audio"),   makeXonoticAudioSettingsTab()));
-		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Network"), makeXonoticNetworkSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("User"),    makeXonoticUserSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Misc"),    makeXonoticMiscSettingsTab()));
 	me.TR(me);
 	me.TR(me);
diff --git a/qcsrc/menu/xonotic/dialog_settings_network.c b/qcsrc/menu/xonotic/dialog_settings_network.c
deleted file mode 100644
index cc6079531..000000000
--- a/qcsrc/menu/xonotic/dialog_settings_network.c
+++ /dev/null
@@ -1,58 +0,0 @@
-#ifdef INTERFACE
-CLASS(XonoticNetworkSettingsTab) EXTENDS(XonoticTab)
-	METHOD(XonoticNetworkSettingsTab, fill, void(entity))
-	ATTRIB(XonoticNetworkSettingsTab, title, string, _("Network"))
-	ATTRIB(XonoticNetworkSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticNetworkSettingsTab, rows, float, 17)
-	ATTRIB(XonoticNetworkSettingsTab, columns, float, 6.2) // added extra .2 for center space 
-ENDCLASS(XonoticNetworkSettingsTab)
-entity makeXonoticNetworkSettingsTab();
-#endif
-
-#ifdef IMPLEMENTATION
-entity makeXonoticNetworkSettingsTab()
-{
-	entity me;
-	me = spawnXonoticNetworkSettingsTab();
-	me.configureDialog(me);
-	return me;
-}
-
-void XonoticNetworkSettingsTab_fill(entity me)
-{
-	entity e;
-
-	me.TR(me);
-		//me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_nolerp", _("Network update smoothing")));
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph")));
-	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Network speed:")));
-		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, 1, "cl_netfps"));
-	me.TR(me);
-	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("HTTP downloads:")));
-	me.TR(me);
-		me.TDempty(me, 0.2);
-		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Downloads:")));
-		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);
-	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Client UDP port:")));
-		me.TD(me, 1, 0.64, e = makeXonoticInputBox(0, "cl_port"));
-}
-#endif
diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c
new file mode 100644
index 000000000..4cffb9f11
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -0,0 +1,58 @@
+#ifdef INTERFACE
+CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
+	METHOD(XonoticUserSettingsTab, fill, void(entity))
+	ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
+	ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
+	ATTRIB(XonoticUserSettingsTab, rows, float, 17)
+	ATTRIB(XonoticUserSettingsTab, columns, float, 6.2) // added extra .2 for center space 
+ENDCLASS(XonoticUserSettingsTab)
+entity makeXonoticUserSettingsTab();
+#endif
+
+#ifdef IMPLEMENTATION
+entity makeXonoticUserSettingsTab()
+{
+	entity me;
+	me = spawnXonoticUserSettingsTab();
+	me.configureDialog(me);
+	return me;
+}
+
+void XonoticUserSettingsTab_fill(entity me)
+{
+	entity e;
+
+	me.TR(me);
+		//me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_nolerp", _("User update smoothing")));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph")));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("User speed:")));
+		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, 1, "cl_netfps"));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("HTTP downloads:")));
+	me.TR(me);
+		me.TDempty(me, 0.2);
+		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Downloads:")));
+		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);
+	me.TR(me);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Client UDP port:")));
+		me.TD(me, 1, 0.64, e = makeXonoticInputBox(0, "cl_port"));
+}
+#endif