From 778c211bd96fa77022a23aeaf51672b13f5c5ec8 Mon Sep 17 00:00:00 2001 From: otta8634 Date: Sat, 8 Feb 2025 19:24:00 +0800 Subject: [PATCH] Neaten Settings > Game > Crosshair dialog Improved padding. Added a header. Shortened one translatable string. --- .../xonotic/dialog_settings_game_crosshair.qc | 74 ++++++++++--------- 1 file changed, 38 insertions(+), 36 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc index c1c409303..7c541881e 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc +++ b/qcsrc/menu/xonotic/dialog_settings_game_crosshair.qc @@ -24,9 +24,11 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) { entity e; + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Crosshair"))); // crosshair_enabled: 0 = no crosshair options, 1 = no crosshair selection, but everything else enabled, 2 = all crosshair options enabled // FIXME: In the future, perhaps make one global crosshair_type cvar which has 0 for disabled, 1 for custom, 2 for per weapon, etc? - me.TR(me); //me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); + me.TR(me); me.TD(me, 1, 1, e = makeXonoticRadioButton(3, "crosshair_enabled", "0", _("No crosshair"))); //me.TR(me); me.TD(me, 1, 1, e = makeXonoticRadioButton_T(3, "crosshair_per_weapon", string_null, _("Per weapon"), @@ -35,32 +37,32 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) //me.TR(me); me.TD(me, 1, 1, e = makeXonoticRadioButton(3, "crosshair_enabled", "2", _("Custom"))); me.TR(me); - me.TDempty(me, 0.1); + me.TDempty(me, 0.2); me.TD(me, 3, 2, e = makeXonoticCrosshairPicker()); setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2); - me.TD(me, 3, 0.9, e = makeXonoticCrosshairPreview()); + me.TD(me, 3, 0.8, e = makeXonoticCrosshairPreview()); setDependentAND(e, "crosshair_per_weapon", 0, 0, "crosshair_enabled", 1, 2); me.TR(me); me.TR(me); me.TR(me); - me.TDempty(me, 0.1); + me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Size:"))); setDependent(e, "crosshair_enabled", 1, 2); - me.TD(me, 1, 1.9, e = makeXonoticSlider(0.1, 1.0, 0.01, "crosshair_size")); + me.TD(me, 1, 1.8, e = makeXonoticSlider(0.1, 1.0, 0.01, "crosshair_size")); setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); + me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:"))); setDependent(e, "crosshair_enabled", 1, 2); - me.TD(me, 1, 1.9, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha")); + me.TD(me, 1, 1.8, e = makeXonoticSlider(0, 1, 0.1, "crosshair_alpha")); setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); + me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Color:"))); setDependent(e, "crosshair_enabled", 1, 2); - me.TD(me, 1, 0.9, e = makeXonoticRadioButton(5, "crosshair_color_special", "1", _("Per weapon"))); + me.TD(me, 1, 1.8/2, e = makeXonoticRadioButton(5, "crosshair_color_special", "1", _("Per weapon"))); setDependent(e, "crosshair_enabled", 1, 2); - me.TD(me, 1, 1, e = makeXonoticRadioButton(5, "crosshair_color_special", "2", _("By health"))); + me.TD(me, 1, 1.8/2, e = makeXonoticRadioButton(5, "crosshair_color_special", "2", _("By health"))); setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); me.TDempty(me, 0.2); @@ -71,49 +73,49 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) me.TR(me); me.TR(me); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2.9, e = makeXonoticCheckBox_T(0, "crosshair_ring", _("Use rings to indicate weapon status"), "-")); + me.TDempty(me, 0.2); + me.TD(me, 1, 2.8, 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.TDempty(me, 0.3); - me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Size:"))); + me.TDempty(me, 0.4); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("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")); + me.TD(me, 1, 1.6, 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, _("Alpha:"))); + me.TDempty(me, 0.4); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:"))); setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); - me.TD(me, 1, 1.8, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_ring_alpha")); + me.TD(me, 1, 1.6, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_ring_alpha")); setDependentAND(e, "crosshair_ring", 1, 1, "crosshair_enabled", 1, 2); me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_dot", _("Enable center crosshair dot"))); + me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "crosshair_dot", _("Enable center crosshair dot"))); setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Size:"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Size:"))); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); - me.TD(me, 1, 2, e = makeXonoticSlider(0.2, 2, 0.1, "crosshair_dot_size")); + me.TD(me, 1, 1.8, e = makeXonoticSlider(0.2, 2, 0.1, "crosshair_dot_size")); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Alpha:"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:"))); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); - me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_dot_alpha")); + me.TD(me, 1, 1.8, e = makeXonoticSlider(0.1, 1, 0.1, "crosshair_dot_alpha")); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Color:"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Color:"))); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); - me.TD(me, 1, 2, e = makeXonoticRadioButton(1, "crosshair_dot_color_custom", "0", _("Use normal crosshair color"))); + me.TD(me, 1, 1.8, e = makeXonoticRadioButton(1, "crosshair_dot_color_custom", "0", _("Use normal color"))); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.2); + me.TDempty(me, 0.4); me.TD(me, 1, 0.8, e = makeXonoticRadioButton(1, "crosshair_dot_color_custom", "1", _("Custom"))); setDependentAND(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2); - me.TD(me, 2, 2, e = makeXonoticColorpickerString("crosshair_dot_color", "crosshair_dot_color")); + me.TD(me, 2, 1.8, e = makeXonoticColorpickerString("crosshair_dot_color", "crosshair_dot_color")); setDependentAND3(e, "crosshair_dot", 1, 1, "crosshair_enabled", 1, 2, "crosshair_dot_color_custom", 1, 1); me.TR(me); me.TR(me); @@ -124,16 +126,16 @@ void XonoticGameCrosshairSettingsTab_fill(entity me) me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "crosshair_hittest", _("Perform hit tests for the crosshair"))); setDependent(e, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2.9, e = makeXonoticCheckBox(0, "crosshair_hittest_blur_wall", _("Blur if obstructed by an obstacle"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "crosshair_hittest_blur_wall", _("Blur if obstructed by an obstacle"))); setDependentAND(e, "crosshair_hittest", 1, 100, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2.9, e = makeXonoticCheckBox(0, "crosshair_hittest_blur_teammate", _("Blur if obstructed by a teammate"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "crosshair_hittest_blur_teammate", _("Blur if obstructed by a teammate"))); setDependentAND(e, "crosshair_hittest", 1, 100, "crosshair_enabled", 1, 2); me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2.9, e = makeXonoticCheckBoxEx(1.25, 1, "crosshair_hittest", _("Shrink if obstructed by a teammate"))); + me.TDempty(me, 0.2); + me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(1.25, 1, "crosshair_hittest", _("Shrink if obstructed by a teammate"))); setDependentAND(e, "crosshair_enabled", 1, 2, "crosshair_hittest", 1, 100); me.TR(me); me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(0.5, 0, "crosshair_hitindication", _("Animate crosshair when hitting an enemy"))); -- 2.39.5