From 14067fd75ea3a16d40fd6a46b709073c021dad9e Mon Sep 17 00:00:00 2001 From: terencehill Date: Tue, 21 Jan 2025 00:16:58 +0100 Subject: [PATCH] Improve some Weapons panel dialog settings: * Rename "Show weapon ID as:" to "Show label:" (weapon is implicit) * Turn "Show label:" into a checkbox so to get rid of the "None" option * Add "Name" checkbox as "Show label:" option * Rename "Weapon ID scale:" to "Scale:" (weapon label is implicit) * Fix a few wrong dependencies introduced by xonotic/xonotic-data.pk3dir!1414 --- qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc index be4a82dbe..a9f0fddde 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc +++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.qc @@ -40,27 +40,30 @@ void XonoticHUDWeaponsDialog_fill(entity me) me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Noncurrent alpha:"))); - setDependent(e, "hud_panel_weapons_onlyowned", 0, 0); + setDependent(e, "hud_panel_weapons_onlyowned", 0, 1); me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_weapons_noncurrent_alpha")); - setDependent(e, "hud_panel_weapons_onlyowned", 0, 0); + setDependent(e, "hud_panel_weapons_onlyowned", 0, 1); me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Noncurrent scale:"))); - setDependent(e, "hud_panel_weapons_onlyowned", 0, 0); + setDependent(e, "hud_panel_weapons_onlyowned", 0, 1); me.TD(me, 1, 2.6, e = makeXonoticSlider(0, 1, 0.1, "hud_panel_weapons_noncurrent_scale")); - setDependent(e, "hud_panel_weapons_onlyowned", 0, 0); + setDependent(e, "hud_panel_weapons_onlyowned", 0, 1); me.TR(me); - me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Show weapon ID as:"))); - me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "0", ZCTX(_("SHOWAS^None")))); + me.TD(me, 1, 1.4, e = makeXonoticCheckBox(0, "hud_panel_weapons_label", _("Show label:"))); me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "1", _("Number"))); + setDependent(e, "hud_panel_weapons_label", 1, 3); me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "2", _("Bind"))); + setDependent(e, "hud_panel_weapons_label", 1, 3); + me.TD(me, 1, 2.6/3, e = makeXonoticRadioButton(2, "hud_panel_weapons_label", "3", _("Name"))); + setDependent(e, "hud_panel_weapons_label", 1, 3); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Weapon ID scale:"))); - setDependent(e, "hud_panel_weapons_label", 1, 2); - me.TD(me, 1, 2.4, e = makeXonoticSlider(0.1, 1, 0.05, "hud_panel_weapons_label_scale")); - setDependent(e, "hud_panel_weapons_label", 1, 2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Scale:"))); + setDependent(e, "hud_panel_weapons_label", 1, 3); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.05, "hud_panel_weapons_label_scale")); + setDependent(e, "hud_panel_weapons_label", 1, 3); me.TR(me); me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_panel_weapons_ammo", _("Show Ammo"))); -- 2.39.5