From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 21 Jul 2010 14:36:50 +0000 (+0300)
Subject: allow disabling/enabling the hud bg from the menu dialogs now
X-Git-Tag: xonotic-v0.1.0preview~362^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8f16983e7368e3f4e922157321d1262c730a8674;p=xonotic%2Fxonotic-data.pk3dir.git

allow disabling/enabling the hud bg from the menu dialogs now
---

diff --git a/qcsrc/client/hud.qh b/qcsrc/client/hud.qh
index 3a073bee9..11a039bec 100644
--- a/qcsrc/client/hud.qh
+++ b/qcsrc/client/hud.qh
@@ -83,7 +83,6 @@ var string picpath;
 // ----------------------
 // Little help for the poor people who have to make sense of this: Start from the bottom
 
-// TODO: shirt, pants, team colors
 #define HUD_Panel_GetProgressBarColor(item) \
 switch(item) {\
 	case "strength": progressbar_color = autocvar_hud_progressbar_strength_color; break;\
@@ -103,13 +102,17 @@ if(!autocvar__hud_configure && panel_bg_str == "0") {\
 	if(panel_bg_str == "") {\
 		panel_bg = autocvar_hud_panel_bg;\
 	} else if(panel_bg_str == "0" && autocvar__hud_configure) {\
-		panel_bg = "border";\
+		panel_bg = autocvar_hud_panel_bg;\
+		panel_bg_alpha_str = "0";\
 	} else {\
 		panel_bg = panel_bg_str;\
 	}\
 	panel_bg = strcat(hud_skin_path, "/", panel_bg);\
 	if(precache_pic(panel_bg) == "") {\
-		panel_bg = strcat("gfx/hud/default/", "border");\
+		panel_bg = strcat(hud_skin_path, "/", "border");\
+		if(precache_pic(panel_bg) == "") {\
+			panel_bg = strcat("gfx/hud/default/", "border");\
+		}\
 	}\
 }
 
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
index 0b42072f7..1e0d4bf92 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_ammo.c
@@ -20,7 +20,12 @@ void XonoticHUDAmmoDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_ammo", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c
index b03fff704..74fabe051 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c
@@ -20,7 +20,12 @@ void XonoticHUDChatDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_chat", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c
index ec54da42d..8d359e9cf 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_engineinfo.c
@@ -20,7 +20,12 @@ void XonoticHUDEngineInfoDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_engineinfo", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
index e5bae98cb..b276045b6 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c
@@ -20,7 +20,12 @@ void XonoticHUDHealthArmorDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c
index d7d8093ec..56d4bf463 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_infomessages.c
@@ -20,7 +20,12 @@ void XonoticHUDInfoMessagesDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_infomessages", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
index 6adf4cb73..ebd5f240b 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c
@@ -20,7 +20,12 @@ void XonoticHUDModIconsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_modicons", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c
index 70fb8a77f..c811cb628 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c
@@ -20,7 +20,12 @@ void XonoticHUDNotificationDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_healtharmor", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
index 33a138554..14f4a1926 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c
@@ -20,7 +20,12 @@ void XonoticHUDPowerupsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_powerups", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
index 881654de7..0c8302560 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
@@ -24,7 +24,12 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 			e.addValue(e, "Panel always enabled", "2");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
index f34f9a683..febbd5449 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c
@@ -20,7 +20,12 @@ void XonoticHUDRaceTimerDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_racetimer", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c
index 327eb06a9..90de04795 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c
@@ -24,7 +24,12 @@ void XonoticHUDRadarDialog_fill(entity me)
 			e.addValue(e, "Panel always enabled", "2");
 			e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
index da331c6e8..8c8561ea7 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_score.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.c
@@ -20,7 +20,12 @@ void XonoticHUDScoreDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_score", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
index 5bacc4bc1..748d2911e 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c
@@ -20,7 +20,12 @@ void XonoticHUDTimerDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_timer", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
index 34a0b55ee..6c935d9e7 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
@@ -20,7 +20,12 @@ void XonoticHUDVoteDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_vote", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
index 8bd128517..a32099d9d 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_weapons.c
@@ -20,7 +20,12 @@ void XonoticHUDWeaponsDialog_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_weapons", "Enable panel"));
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Background:"));
+			me.TD(me, 1, 1.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				e.addValue(e, strzone(strcat("border_", panelname)), strzone(strcat("border_", panelname)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Color:"));