From 09c2da89fff2d4426955d4893c0ce10edc4fae2b Mon Sep 17 00:00:00 2001 From: Samual Date: Mon, 16 Jan 2012 23:48:27 -0500 Subject: [PATCH] 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. --- qcsrc/menu/classes.c | 2 +- qcsrc/menu/xonotic/dialog_settings.c | 2 +- ...tings_network.c => dialog_settings_user.c} | 26 +++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) rename qcsrc/menu/xonotic/{dialog_settings_network.c => dialog_settings_user.c} (63%) 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_user.c similarity index 63% rename from qcsrc/menu/xonotic/dialog_settings_network.c rename to qcsrc/menu/xonotic/dialog_settings_user.c index cc6079531..4cffb9f11 100644 --- a/qcsrc/menu/xonotic/dialog_settings_network.c +++ b/qcsrc/menu/xonotic/dialog_settings_user.c @@ -1,34 +1,34 @@ #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(); +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 makeXonoticNetworkSettingsTab() +entity makeXonoticUserSettingsTab() { entity me; - me = spawnXonoticNetworkSettingsTab(); + me = spawnXonoticUserSettingsTab(); me.configureDialog(me); return me; } -void XonoticNetworkSettingsTab_fill(entity me) +void XonoticUserSettingsTab_fill(entity me) { entity e; me.TR(me); - //me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_nolerp", _("Network update smoothing"))); + //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, _("Network speed:"))); + 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"); -- 2.39.2