From daa65131b35fbf0f347aea7b4d059988bdbfd750 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sun, 28 Jul 2013 22:06:13 -0400 Subject: [PATCH] Once again start working on new menu organization --- qcsrc/menu/xonotic/dialog_multiplayer.c | 5 +++-- .../xonotic/dialog_multiplayer_playersetup.c | 15 ++++++++------ qcsrc/menu/xonotic/dialog_settings.c | 20 ++++++++++--------- 3 files changed, 23 insertions(+), 17 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer.c b/qcsrc/menu/xonotic/dialog_multiplayer.c index 2c86f79c3..8bb9e337f 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer.c @@ -17,8 +17,9 @@ void XonoticMultiplayerDialog_fill(entity me) me.TR(me); me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"), makeXonoticServerListTab())); me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"), makeXonoticServerCreateTab())); - me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Demos"), makeXonoticDemoBrowserTab())); - me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Player Setup"), makeXonoticPlayerSettingsTab())); + //me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Players"), makeXonoticDemoBrowserTab())); + me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Media"), makeXonoticDemoBrowserTab())); + me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Profile"), makeXonoticPlayerSettingsTab())); me.TR(me); me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c index 482a60510..b065863b6 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup.c @@ -2,7 +2,7 @@ CLASS(XonoticPlayerSettingsTab) EXTENDS(XonoticTab) METHOD(XonoticPlayerSettingsTab, fill, void(entity)) METHOD(XonoticPlayerSettingsTab, draw, void(entity)) - ATTRIB(XonoticPlayerSettingsTab, title, string, _("Player Setup")) + ATTRIB(XonoticPlayerSettingsTab, title, string, _("Profile")) ATTRIB(XonoticPlayerSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticPlayerSettingsTab, rows, float, 22) ATTRIB(XonoticPlayerSettingsTab, columns, float, 6.2) // added extra .2 for center space @@ -56,19 +56,20 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TR(me); me.TR(me); - me.TR(me); + me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TDempty(me, 1); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Model:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Model:"))); me.TR(me); - me.TDempty(me, 1); pms = makeXonoticPlayerModelSelector(); me.TD(me, 1, 0.3, e = makeXonoticButton("<<", '0 0 0')); e.onClick = PlayerModelSelector_Prev_Click; e.onClickEntity = pms; - me.TD(me, me.rows - (me.currentRow + 2), 1.4, pms); + me.TD(me, 13, 2.4, pms); me.TD(me, 1, 0.3, e = makeXonoticButton(">>", '0 0 0')); e.onClick = PlayerModelSelector_Next_Click; e.onClickEntity = pms; + + me.gotoRC(me, 14, 3.533); me.setFirstColumn(me, me.currentColumn); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color:"))); for(i = 0; i < 15; ++i) @@ -77,7 +78,7 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TR(me); me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(1, 0, i), '0 1 0'); } - me.TR(me); + me.gotoRC(me, 14, 4.866); me.setFirstColumn(me, me.currentColumn); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color:"))); for(i = 0; i < 15; ++i) @@ -87,6 +88,7 @@ void XonoticPlayerSettingsTab_fill(entity me) me.TDNoMargin(me, 1, 0.2, e = makeXonoticColorButton(2, 1, i), '0 1 0'); } + /* // crosshair_enabled: 0 = no crosshair options, 1 = no crosshair selection, but everything else enabled, 2 = all crosshair options enabled // FIXME: In the future, perhaps make one global crosshair_type cvar which has 0 for disabled, 1 for custom, 2 for per weapon, etc? me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); @@ -176,6 +178,7 @@ void XonoticPlayerSettingsTab_fill(entity me) e.onClickEntity = main.hudDialog; // TODO: show hud config name with text here + */ me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_autoswitch;sendcvar cl_forceplayermodels;sendcvar cl_forceplayermodelsfromxonotic;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY)); } diff --git a/qcsrc/menu/xonotic/dialog_settings.c b/qcsrc/menu/xonotic/dialog_settings.c index 930fa7df9..65686db5e 100644 --- a/qcsrc/menu/xonotic/dialog_settings.c +++ b/qcsrc/menu/xonotic/dialog_settings.c @@ -4,7 +4,7 @@ CLASS(XonoticSettingsDialog) EXTENDS(XonoticDialog) ATTRIB(XonoticSettingsDialog, title, string, _("Settings")) ATTRIB(XonoticSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS) ATTRIB(XonoticSettingsDialog, intendedWidth, float, 0.96) - ATTRIB(XonoticSettingsDialog, rows, float, 19) + ATTRIB(XonoticSettingsDialog, rows, float, 20) ATTRIB(XonoticSettingsDialog, columns, float, 6) ENDCLASS(XonoticSettingsDialog) #endif @@ -13,16 +13,18 @@ ENDCLASS(XonoticSettingsDialog) void XonoticSettingsDialog_fill(entity me) { entity mc; - mc = makeXonoticTabController(me.rows - 2); + mc = makeXonoticTabController(me.rows - 3); me.TR(me); - me.TD(me, 1, 1, mc.makeTabButton(mc, _("Input"), makeXonoticInputSettingsTab())); - 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, _("User"), makeXonoticUserSettingsTab())); - me.TD(me, 1, 1, mc.makeTabButton(mc, _("Misc"), makeXonoticMiscSettingsTab())); + me.TD(me, 1, 2, mc.makeTabButton(mc, _("Video"), makeXonoticVideoSettingsTab())); + me.TD(me, 1, 2, mc.makeTabButton(mc, _("Effects"), makeXonoticEffectsSettingsTab())); + me.TD(me, 1, 2, mc.makeTabButton(mc, _("Audio"), makeXonoticAudioSettingsTab())); me.TR(me); + me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Game"), makeXonoticInputSettingsTab())); + me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Input"), makeXonoticInputSettingsTab())); + me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("User"), makeXonoticUserSettingsTab())); + me.TD(me, 1, 1.5, mc.makeTabButton(mc, _("Misc"), makeXonoticMiscSettingsTab())); me.TR(me); - me.TD(me, me.rows - 2, me.columns, mc); + me.TR(me); + me.TD(me, me.rows - 3, me.columns, mc); } #endif -- 2.39.2