From e9ba677adabf5744245fe5cc23dd82e30d2ad20d Mon Sep 17 00:00:00 2001 From: terencehill Date: Wed, 9 Dec 2015 00:24:06 +0100 Subject: [PATCH] Increase number of rows of Game Settings tabs so they match Settings tab rows and add back items that long time ago got removed when nested tabs were introduced --- .../mutators/mutator/damagetext/damagetext.qc | 2 +- .../xonotic/dialog_settings_game_crosshair.qc | 24 +++++++------------ .../menu/xonotic/dialog_settings_game_hud.qc | 9 ++++--- .../xonotic/dialog_settings_game_messages.qc | 5 +--- .../xonotic/dialog_settings_game_model.qc | 2 +- .../menu/xonotic/dialog_settings_game_view.qc | 2 +- .../xonotic/dialog_settings_game_weapons.qc | 2 +- 7 files changed, 18 insertions(+), 28 deletions(-) diff --git a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc index 923ca3bcc..264a412b0 100644 --- a/qcsrc/common/mutators/mutator/damagetext/damagetext.qc +++ b/qcsrc/common/mutators/mutator/damagetext/damagetext.qc @@ -137,7 +137,7 @@ CLASS(XonoticDamageTextSettings, XonoticTab) REGISTER_SETTINGS(damagetext, NEW(XonoticDamageTextSettings)); ATTRIB(XonoticDamageTextSettings, title, string, _("Damage text")) ATTRIB(XonoticDamageTextSettings, intendedWidth, float, 0.9) - ATTRIB(XonoticDamageTextSettings, rows, float, 13) + ATTRIB(XonoticDamageTextSettings, rows, float, 15.5) ATTRIB(XonoticDamageTextSettings, columns, float, 5) INIT(XonoticDamageTextSettings) { this.configureDialog(this); } METHOD(XonoticDamageTextSettings, showNotify, void(entity this)) { loadAllCvars(this); } diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index add9d82b6..9b5c21269 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@ -6,7 +6,7 @@ CLASS(XonoticGameCrosshairSettingsTab, XonoticTab) METHOD(XonoticGameCrosshairSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameCrosshairSettingsTab, title, string, _("Crosshair")) ATTRIB(XonoticGameCrosshairSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 13) + ATTRIB(XonoticGameCrosshairSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameCrosshairSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameCrosshairSettingsTab) entity makeXonoticGameCrosshairSettingsTab(); @@ -82,11 +82,12 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) me.TD(me, 1, 2.9, e = makeXonoticCheckBox_T(0, "crosshair_ring", _("Use rings to indicate weapon status"), "-")); makeMulti(e, "crosshair_ring_reload"); setDependent(e, "crosshair_enabled", 1, 2); - //me.TR(me); - // me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Ring size:"))); - // setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); - // me.TD(me, 1, 2, e = makeXonoticSlider(2, 4, 0.1, "crosshair_ring_size")); - // setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Ring size:"))); + setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); + me.TD(me, 1, 1.8, e = makeXonoticSlider(2, 4, 0.1, "crosshair_ring_size")); + setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); me.TR(me); me.TDempty(me, 0.3); me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Ring alpha:"))); @@ -138,7 +139,7 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.25, 0, "crosshair_pickup", _("Animate crosshair when picking up an item"))); setDependent(e, "crosshair_enabled", 1, 2); - /*me.TR(me); + me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Hit testing:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider_T("crosshair_hittest", _("None: do not do hit tests for the crosshair; TrueAim: blur the crosshair when you would not hit the wall; Enemies: also enlarge the crosshair when you would hit an enemy"))); @@ -146,13 +147,6 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) e.addValue(e, ZCTX(_("HTTST^TrueAim")), "1"); e.addValue(e, ZCTX(_("HTTST^Enemies")), "1.25"); e.configureXonoticTextSliderValues(e); - setDependent(e, "crosshair_enabled", 1, 2);*/ - - /*me.TR(me); - - me.gotoRC(me, me.rows - 1, 0); - me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0')); - e.onClick = Dialog_Close; - e.onClickEntity = me;*/ + setDependent(e, "crosshair_enabled", 1, 2); } #endif diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc index 0c9342d22..150357de2 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc @@ -6,7 +6,7 @@ CLASS(XonoticGameHUDSettingsTab, XonoticTab) METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD")) ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13) + ATTRIB(XonoticGameHUDSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameHUDSettingsTab) entity makeXonoticGameHUDSettingsTab(); @@ -47,12 +47,11 @@ void XonoticGameHUDSettingsTab_fill(entity me) // threshold: hud_damage_pain_threshold_lower_health // scoreboard_alpha* - //me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); me.TR(me); me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Scoreboard"))); - //me.TR(me); - // me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:"))); - // me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg")); + me.TR(me); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:"))); + me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg")); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Fading speed:"))); me.TD(me, 1, 2, e = makeXonoticScoreboardFadeTimeSlider()); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc index b1b03942b..f9ff06796 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_messages.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.qc @@ -6,7 +6,7 @@ CLASS(XonoticGameMessageSettingsTab, XonoticTab) METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages")) ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameMessageSettingsTab, rows, float, 13) + ATTRIB(XonoticGameMessageSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity, NULL) ENDCLASS(XonoticGameMessageSettingsTab) @@ -106,12 +106,9 @@ void XonoticGameMessageSettingsTab_fill(entity me) me.gotoRC(me, 9, 3.2); me.setFirstColumn(me, me.currentColumn); me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Announcers"))); - #if 0 - // there's just not enough room for this, and it's not important enough to justify... me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBoxEx_T(2, 0, "notification_ANNCE_NUM_RESPAWN_1", _("Respawn countdown sounds"), "-")); makeMulti(e, "notification_ANNCE_NUM_RESPAWN_2 notification_ANNCE_NUM_RESPAWN_3 notification_ANNCE_NUM_RESPAWN_4 notification_ANNCE_NUM_RESPAWN_5 notification_ANNCE_NUM_RESPAWN_6 notification_ANNCE_NUM_RESPAWN_7 notification_ANNCE_NUM_RESPAWN_8 notification_ANNCE_NUM_RESPAWN_9 notification_ANNCE_NUM_RESPAWN_10"); - #endif me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBoxEx_T(1, 0, "notification_ANNCE_KILLSTREAK_03", _("Killstreak sounds"), "-")); makeMulti(e, "notification_ANNCE_KILLSTREAK_05 notification_ANNCE_KILLSTREAK_10 notification_ANNCE_KILLSTREAK_15 notification_ANNCE_KILLSTREAK_20 notification_ANNCE_KILLSTREAK_25 notification_ANNCE_KILLSTREAK_30"); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_model.qc b/qcsrc/menu/xonotic/dialog_settings_game_model.qc index 45d7aee30..740dbe95a 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_model.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_model.qc @@ -7,7 +7,7 @@ CLASS(XonoticGameModelSettingsTab, XonoticTab) ATTRIB(XonoticGameModelSettingsTab, title, string, _("Models")) ATTRIB(XonoticGameModelSettingsTab, tooltip, string, _("Customize how players and items are displayed in game")) ATTRIB(XonoticGameModelSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameModelSettingsTab, rows, float, 13) + ATTRIB(XonoticGameModelSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameModelSettingsTab, columns, float, 5) ENDCLASS(XonoticGameModelSettingsTab) entity makeXonoticGameModelSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_view.qc b/qcsrc/menu/xonotic/dialog_settings_game_view.qc index 5a7279fb8..91ffa0e29 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_view.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_view.qc @@ -6,7 +6,7 @@ CLASS(XonoticGameViewSettingsTab, XonoticTab) METHOD(XonoticGameViewSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameViewSettingsTab, title, string, _("View")) ATTRIB(XonoticGameViewSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameViewSettingsTab, rows, float, 13) + ATTRIB(XonoticGameViewSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameViewSettingsTab, columns, float, 6.2) ENDCLASS(XonoticGameViewSettingsTab) entity makeXonoticGameViewSettingsTab(); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc index 410bddd09..ec52b5e4d 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc @@ -6,7 +6,7 @@ CLASS(XonoticGameWeaponsSettingsTab, XonoticTab) METHOD(XonoticGameWeaponsSettingsTab, showNotify, void(entity)); ATTRIB(XonoticGameWeaponsSettingsTab, title, string, _("Weapons")) ATTRIB(XonoticGameWeaponsSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 13) + ATTRIB(XonoticGameWeaponsSettingsTab, rows, float, 15.5) ATTRIB(XonoticGameWeaponsSettingsTab, columns, float, 6) ATTRIB(XonoticGameWeaponsSettingsTab, weaponsList, entity, NULL) ENDCLASS(XonoticGameWeaponsSettingsTab) -- 2.39.2