Several menu rearrangements

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create.c b/data/qcsrc/menu/voret/dialog_multiplayer_create.c
index 4d948e7784a0f059d95cbb602bf09c0f88404c09..c137f7ad3349bb45c8f48b6e6d7ab76ac04538c4 100644 (file)
--- 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);\r
                me.TD(me, 1, 0.5, me.playerNameLabel = makeVoretTextLabel(0, "Other:"));\r
                        me.playerNameLabelAlpha = me.playerNameLabel.alpha;\r
-               n = 1;\r
+               n = 1.1;\r
                me.TD(me, 1, me.columns / n, e = makeVoretGametypeButton(1, "g_rpg", "Role Play"));\r
                        if(e.checked) e0 = NULL;\r
                if(e0)\r
@@ -80,8 +80,8 @@ void fillVoretServerCreateTab(entity me)
                me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Map list:"));\r
                        makeCallback(e, me.mapListBox, me.mapListBox.refilterCallback);\r
        me.TR(me);\r
-               me.TD(me, me.rows - 7, 3, me.mapListBox);\r
-       me.gotoRC(me, me.rows - 3, 0);\r
+               me.TD(me, me.rows - 6, 3, me.mapListBox);\r
+       me.gotoRC(me, me.rows - 2, 0);\r
                me.TDempty(me, 0.5);\r
                me.TD(me, 1, 1, e = makeVoretButton("All", '0 0 0'));\r
                        e.onClick = MapList_All;\r
@@ -91,7 +91,7 @@ void fillVoretServerCreateTab(entity me)
                        e.onClickEntity = me.mapListBox;\r
                me.TDempty(me, 0.5);\r
 \r
-       me.gotoRC(me, 3, 3.5); me.setFirstColumn(me, me.currentColumn);\r
+       me.gotoRC(me, 4, 3.5); me.setFirstColumn(me, me.currentColumn);\r
                me.TD(me, 1, 3, e = makeVoretTextLabel(0, "Match settings:"));\r
        me.TR(me);\r
                me.sliderTimelimit = makeVoretSlider(1.0, 60.0, 0.5, "timelimit_override");\r
@@ -144,22 +144,6 @@ void fillVoretServerCreateTab(entity me)
                me.TD(me, 1, 0.7, e = makeVoretInputBox(1, "bot_suffix"));\r
                        setDependent(e, "bot_number", 0, -1);\r
        me.TR(me);\r
-       me.TR(me);\r
-               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Map voting:"));\r
-               me.TD(me, 1, 2, e = makeVoretTextSlider("g_maplist_votable"));\r
-                       e.addValue(e, "No voting", "0");\r
-                       e.addValue(e, "2 choices", "2");\r
-                       e.addValue(e, "3 choices", "3");\r
-                       e.addValue(e, "4 choices", "4");\r
-                       e.addValue(e, "5 choices", "5");\r
-                       e.addValue(e, "6 choices", "6");\r
-                       e.addValue(e, "7 choices", "7");\r
-                       e.addValue(e, "8 choices", "8");\r
-                       e.addValue(e, "9 choices", "9");\r
-                       e.configureVoretTextSliderValues(e);\r
-       me.TR(me);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBoxEx(0.5, 0, "sv_vote_simple_majority_factor", "Simple majority wins vcall"));\r
-       me.TR(me);\r
        me.TR(me);\r
                me.TDempty(me, 0.5);\r
                me.TD(me, 1, 2, e = makeVoretButton("Advanced settings...", '0 0 0'));\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_advanced.c
index c0f181b167b39f94b7450e0f434fc383415bf756..718a985722e89731c5ce436e83f55a0fdaf0d2d7 100644 (file)
--- 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")\r
        ATTRIB(VoretAdvancedDialog, color, vector, SKINCOLOR_DIALOG_ADVANCED)\r
        ATTRIB(VoretAdvancedDialog, intendedWidth, float, 0.5)\r
-       ATTRIB(VoretAdvancedDialog, rows, float, 17)\r
+       ATTRIB(VoretAdvancedDialog, rows, float, 20)\r
        ATTRIB(VoretAdvancedDialog, columns, float, 3)\r
        ATTRIB(VoretAdvancedDialog, refilterEntity, entity, NULL)\r
 ENDCLASS(VoretAdvancedDialog)\r
@@ -35,6 +35,25 @@ void fillVoretAdvancedDialog(entity me)
                me.TD(me, 1, 1.5, e = makeVoretInputBox(1, "hostname"));\r
                        setDependentAND(e, "sv_public", 1, 1, "menu_use_default_hostname", 0, 0);\r
        me.TR(me);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 1, e = makeVoretTextLabel(0, "Map voting:"));\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 1.7, e = makeVoretTextSlider("g_maplist_votable"));\r
+                       e.addValue(e, "No voting", "0");\r
+                       e.addValue(e, "2 choices", "2");\r
+                       e.addValue(e, "3 choices", "3");\r
+                       e.addValue(e, "4 choices", "4");\r
+                       e.addValue(e, "5 choices", "5");\r
+                       e.addValue(e, "6 choices", "6");\r
+                       e.addValue(e, "7 choices", "7");\r
+                       e.addValue(e, "8 choices", "8");\r
+                       e.addValue(e, "9 choices", "9");\r
+                       e.configureVoretTextSliderValues(e);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.2);\r
+               me.TD(me, 1, 1.2, e = makeVoretCheckBoxEx(0.5, 0, "sv_vote_simple_majority_factor", "Simple majority wins vcall"));\r
+       me.TR(me);\r
        me.TR(me);\r
                me.TD(me, 1, 1.2, makeVoretTextLabel(0, "Game settings:"));\r
        me.TR(me);\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c b/data/qcsrc/menu/voret/dialog_multiplayer_create_mutators.c
index 5afae427342cee4839d717674e542c2d2d80534f..fcb2bd3ec5b0759b62270c4a270d23228029863c 100644 (file)
--- 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")\r
        ATTRIB(VoretMutatorsDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS)\r
        ATTRIB(VoretMutatorsDialog, intendedWidth, float, 0.3)\r
-       ATTRIB(VoretMutatorsDialog, rows, float, 18)\r
+       ATTRIB(VoretMutatorsDialog, rows, float, 17)\r
        ATTRIB(VoretMutatorsDialog, columns, float, 2)\r
        ATTRIB(VoretMutatorsDialog, refilterEntity, entity, NULL)\r
 ENDCLASS(VoretMutatorsDialog)\r

diff --git a/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c b/data/qcsrc/menu/voret/dialog_multiplayer_playersetup_weapons.c
index 8a4071002c3c6ea1aa8fe431a18d13a398cbb891..1feb3ed46fed874d677e03ff424e8e5576bcfce4 100644 (file)
--- 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))\r
        ATTRIB(VoretWeaponsDialog, title, string, "Weapon & Crosshair settings")\r
        ATTRIB(VoretWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS)\r
-       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.95)\r
-       ATTRIB(VoretWeaponsDialog, rows, float, 17)\r
-       ATTRIB(VoretWeaponsDialog, columns, float, 8)\r
+       ATTRIB(VoretWeaponsDialog, intendedWidth, float, 0.5)\r
+       ATTRIB(VoretWeaponsDialog, rows, float, 15)\r
+       ATTRIB(VoretWeaponsDialog, columns, float, 4)\r
        ATTRIB(VoretWeaponsDialog, weaponsList, entity, NULL)\r
 ENDCLASS(VoretWeaponsDialog)\r
 #endif\r
@@ -47,19 +47,6 @@ void fillVoretWeaponsDialog(entity me)
                me.TDempty(me, 0.3);\r
                me.TD(me, 1, 3, e = makeVoretCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup"));*/\r
        me.TR(me);\r
-               me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));\r
-       me.TR(me);\r
-               me.TDempty(me, 0.6);\r
-               me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align"));\r
-                       setDependent(e, "r_drawviewmodel", 1, 1);\r
-               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align"));\r
-                       setDependent(e, "r_drawviewmodel", 1, 1);\r
-       me.TR(me);\r
-               me.TDempty(me, 0.3);\r
-               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally"));\r
-\r
-       me.gotoRC(me, 0, 4); me.setFirstColumn(me, me.currentColumn);\r
        me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon crosshair settings:"));\r
        me.TR(me);\r
                me.TDempty(me, 0.3);\r
@@ -100,6 +87,22 @@ void fillVoretWeaponsDialog(entity me)
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1",    "TrueAim"));\r
                me.TD(me, 1, 2.5/3, e = makeVoretRadioButton(2, "crosshair_hittest", "1.25", "Enemies"));\r
 \r
+       me.TR(me);\r
+       me.TR(me);\r
+       me.TD(me, 1, 3, makeVoretTextLabel(0, "Weapon model & view settings:"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model"));\r
+       me.TR(me);\r
+               me.TDempty(me, 0.6);\r
+               me.TD(me, 1, 2, e = makeVoretRadioButton(1, "cl_gunalign", "4", "Left align"));\r
+                       setDependent(e, "r_drawviewmodel", 1, 1);\r
+               me.TD(me, 1, 1, e = makeVoretRadioButton(1, "cl_gunalign", "3", "Right align"));\r
+                       setDependent(e, "r_drawviewmodel", 1, 1);\r
+       me.TR(me);\r
+               me.TDempty(me, 0.3);\r
+               me.TD(me, 1, 3, e = makeVoretCheckBox(0, "v_flipped", "Flip view horizontally"));\r
+\r
        me.gotoRC(me, me.rows - 1, 0);\r
                me.TD(me, 1, me.columns, e = makeVoretButton("OK", '0 0 0'));\r
                        e.onClick = Dialog_Close;\r