From: MirceaKitsune Date: Fri, 3 Sep 2010 13:17:45 +0000 (+0300) Subject: Several menu rearrangements X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5e8e2555c9fffd7f9b87fde8fae92a315ece1c9a;p=voretournament%2Fvoretournament.git Several menu rearrangements --- diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create.c b/data/qcsrc/menu/voret/dialog_multiplayer_create.c index 4d948e77..c137f7ad 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_create.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_create.c @@ -66,7 +66,7 @@ void fillVoretServerCreateTab(entity me) me.TR(me); me.TD(me, 1, 0.5, me.playerNameLabel = makeVoretTextLabel(0, "Other:")); me.playerNameLabelAlpha = me.playerNameLabel.alpha; - n = 1; + n = 1.1; me.TD(me, 1, me.columns / n, e = makeVoretGametypeButton(1, "g_rpg", "Role Play")); if(e.checked) e0 = NULL; if(e0) @@ -80,8 +80,8 @@ void fillVoretServerCreateTab(entity me) me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Map list:")); makeCallback(e, me.mapListBox, me.mapListBox.refilterCallback); me.TR(me); - me.TD(me, me.rows - 7, 3, me.mapListBox); - me.gotoRC(me, me.rows - 3, 0); + me.TD(me, me.rows - 6, 3, me.mapListBox); + me.gotoRC(me, me.rows - 2, 0); me.TDempty(me, 0.5); me.TD(me, 1, 1, e = makeVoretButton("All", '0 0 0')); e.onClick = MapList_All; @@ -91,7 +91,7 @@ void fillVoretServerCreateTab(entity me) e.onClickEntity = me.mapListBox; me.TDempty(me, 0.5); - me.gotoRC(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn); + me.gotoRC(me, 4, 3.5); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Match settings:")); me.TR(me); me.sliderTimelimit = makeVoretSlider(1.0, 60.0, 0.5, "timelimit_override"); @@ -144,22 +144,6 @@ void fillVoretServerCreateTab(entity me) me.TD(me, 1, 0.7, e = makeVoretInputBox(1, "bot_suffix")); setDependent(e, "bot_number", 0, -1); me.TR(me); - me.TR(me); - me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Map voting:")); - me.TD(me, 1, 2, e = makeVoretTextSlider("g_maplist_votable")); - e.addValue(e, "No voting", "0"); - e.addValue(e, "2 choices", "2"); - e.addValue(e, "3 choices", "3"); - e.addValue(e, "4 choices", "4"); - e.addValue(e, "5 choices", "5"); - e.addValue(e, "6 choices", "6"); - e.addValue(e, "7 choices", "7"); - e.addValue(e, "8 choices", "8"); - e.addValue(e, "9 choices", "9"); - e.configureVoretTextSliderValues(e); - me.TR(me); - me.TD(me, 1, 3, e = makeVoretCheckBoxEx(0.5, 0, "sv_vote_simple_majority_factor", "Simple majority wins vcall")); - me.TR(me); me.TR(me); me.TDempty(me, 0.5); me.TD(me, 1, 2, e = makeVoretButton("Advanced settings...", '0 0 0')); diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c index c0f181b1..718a9857 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c @@ -6,7 +6,7 @@ CLASS(VoretAdvancedDialog) EXTENDS(VoretDialog) ATTRIB(VoretAdvancedDialog, title, string, "Advanced server settings") ATTRIB(VoretAdvancedDialog, color, vector, SKINCOLOR_DIALOG_ADVANCED) ATTRIB(VoretAdvancedDialog, intendedWidth, float, 0.5) - ATTRIB(VoretAdvancedDialog, rows, float, 17) + ATTRIB(VoretAdvancedDialog, rows, float, 20) ATTRIB(VoretAdvancedDialog, columns, float, 3) ATTRIB(VoretAdvancedDialog, refilterEntity, entity, NULL) ENDCLASS(VoretAdvancedDialog) @@ -35,6 +35,25 @@ void fillVoretAdvancedDialog(entity me) me.TD(me, 1, 1.5, e = makeVoretInputBox(1, "hostname")); setDependentAND(e, "sv_public", 1, 1, "menu_use_default_hostname", 0, 0); me.TR(me); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Map voting:")); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.7, e = makeVoretTextSlider("g_maplist_votable")); + e.addValue(e, "No voting", "0"); + e.addValue(e, "2 choices", "2"); + e.addValue(e, "3 choices", "3"); + e.addValue(e, "4 choices", "4"); + e.addValue(e, "5 choices", "5"); + e.addValue(e, "6 choices", "6"); + e.addValue(e, "7 choices", "7"); + e.addValue(e, "8 choices", "8"); + e.addValue(e, "9 choices", "9"); + e.configureVoretTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeVoretCheckBoxEx(0.5, 0, "sv_vote_simple_majority_factor", "Simple majority wins vcall")); + me.TR(me); me.TR(me); me.TD(me, 1, 1.2, makeVoretTextLabel(0, "Game settings:")); me.TR(me); diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c index 5afae427..fcb2bd3e 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c @@ -7,7 +7,7 @@ CLASS(VoretMutatorsDialog) EXTENDS(VoretDialog) ATTRIB(VoretMutatorsDialog, title, string, "Mutators") ATTRIB(VoretMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS) ATTRIB(VoretMutatorsDialog, intendedWidth, float, 0.3) - ATTRIB(VoretMutatorsDialog, rows, float, 18) + ATTRIB(VoretMutatorsDialog, rows, float, 17) ATTRIB(VoretMutatorsDialog, columns, float, 2) ATTRIB(VoretMutatorsDialog, refilterEntity, entity, NULL) ENDCLASS(VoretMutatorsDialog) diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c index 8a407100..1feb3ed4 100644 --- a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c +++ b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c @@ -5,9 +5,9 @@ CLASS(VoretWeaponsDialog) EXTENDS(VoretDialog) METHOD(VoretWeaponsDialog, showNotify, void(entity)) ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings") ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) - ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.95) - ATTRIB(VoretWeaponsDialog, rows, float, 17) - ATTRIB(VoretWeaponsDialog, columns, float, 8) + ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5) + ATTRIB(VoretWeaponsDialog, rows, float, 15) + ATTRIB(VoretWeaponsDialog, columns, float, 4) ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(VoretWeaponsDialog) #endif @@ -47,19 +47,6 @@ void fillVoretWeaponsDialog(entity me) me.TDempty(me, 0.3); me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));*/ me.TR(me); - me.TDempty(me, 0.3); - me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); - me.TR(me); - me.TDempty(me, 0.6); - me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align")); - setDependent(e, "r_drawviewmodel", 1, 1); - me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align")); - setDependent(e, "r_drawviewmodel", 1, 1); - me.TR(me); - me.TDempty(me, 0.3); - me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally")); - - me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:")); me.TR(me); me.TDempty(me, 0.3); @@ -100,6 +87,22 @@ void fillVoretWeaponsDialog(entity me) me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1", "TrueAim")); me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies")); + me.TR(me); + me.TR(me); + me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model & view settings:")); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); + me.TR(me); + me.TDempty(me, 0.6); + me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align")); + setDependent(e, "r_drawviewmodel", 1, 1); + me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align")); + setDependent(e, "r_drawviewmodel", 1, 1); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally")); + me.gotoRC(me, me.rows - 1, 0); me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0')); e.onClick = Dialog_Close;