From bd58f1ec6c878db60e296f5195ca27db8d497a1c Mon Sep 17 00:00:00 2001 From: div0 Date: Fri, 30 Oct 2009 18:29:12 +0000 Subject: [PATCH] menu rearrangements by Samual git-svn-id: svn://svn.icculus.org/nexuiz/trunk@8190 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- .../dialog_multiplayer_playersetup_weapons.c | 23 ++++++++----------- data/qcsrc/menu/nexuiz/dialog_singleplayer.c | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c index 4f0c91c3b..b6cc10527 100644 --- a/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c +++ b/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_weapons.c @@ -5,8 +5,8 @@ CLASS(NexuizWeaponsDialog) EXTENDS(NexuizDialog) METHOD(NexuizWeaponsDialog, showNotify, void(entity)) ATTRIB(NexuizWeaponsDialog, title, string, "Weapon settings") ATTRIB(NexuizWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) - ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.35) - ATTRIB(NexuizWeaponsDialog, rows, float, 16) + ATTRIB(NexuizWeaponsDialog, intendedWidth, float, 0.5) + ATTRIB(NexuizWeaponsDialog, rows, float, 17) ATTRIB(NexuizWeaponsDialog, columns, float, 4) ATTRIB(NexuizWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(NexuizWeaponsDialog) @@ -24,34 +24,30 @@ string toStringNexuizWeaponsDialog(entity me) void fillNexuizWeaponsDialog(entity me) { entity e; - float h0, h; - h = me.rows - 7; - me.TR(me); me.TD(me, 1, 4, makeNexuizTextLabel(0, "Weapon priority list:")); me.TR(me); - h0 = me.currentRow; - me.TD(me, h, 3, e = me.weaponsList = makeNexuizWeaponsList()); - me.gotoRC(me, h0 + h / 2 - 1, 3); + me.TD(me, 9, 4, e = me.weaponsList = makeNexuizWeaponsList()); + me.gotoRC(me, 10, 0); + me.TDempty(me, 1); me.TD(me, 1, 1, e = makeNexuizButton("Up", '0 0 0')); e.onClick = WeaponsList_MoveUp_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, h0 + h / 2, 3); me.TD(me, 1, 1, e = makeNexuizButton("Down", '0 0 0')); e.onClick = WeaponsList_MoveDown_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, h0 + h, 0); + me.gotoRC(me, 11, 0); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling")); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup")); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); me.TR(me); - me.TDempty(me, 0.5); - me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align")); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "4", "Left align")); setDependent(e, "r_drawviewmodel", 1, 1); - me.TD(me, 1, 2, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align")); + me.TD(me, 1, 1, e = makeNexuizRadioButton(1, "cl_gunalign", "3", "Right align")); setDependent(e, "r_drawviewmodel", 1, 1); me.TR(me); me.TD(me, 1, 3, e = makeNexuizCheckBox(0, "v_flipped", "Flip view horizontally")); @@ -60,5 +56,4 @@ void fillNexuizWeaponsDialog(entity me) e.onClick = Dialog_Close; e.onClickEntity = me; } - #endif diff --git a/data/qcsrc/menu/nexuiz/dialog_singleplayer.c b/data/qcsrc/menu/nexuiz/dialog_singleplayer.c index 16a29f5a9..b344255ea 100644 --- a/data/qcsrc/menu/nexuiz/dialog_singleplayer.c +++ b/data/qcsrc/menu/nexuiz/dialog_singleplayer.c @@ -66,7 +66,7 @@ void fillNexuizSingleplayerDialog(entity me) me.TD(me, 1, me.columns - 2, lblTitle = makeNexuizTextLabel(0.5, "???")); me.TD(me, 1, 1, btnNext = makeNexuizButton(">>", '0 0 0')); me.TR(me); - me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeNexuizCampaignList()); + me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeNexuizCampaignList()); btnPrev.onClick = MultiCampaign_Prev; btnPrev.onClickEntity = me.campaignBox; btnNext.onClick = MultiCampaign_Next; -- 2.17.1