X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_pressedkeys.c;h=30f6bfc1f2da723a813477fa3b70e4c106ab9432;hp=d847fbb90020b91ba787097109ed174083413c95;hb=dee2594bc4afa62147d64d691c30d200dbbcc693;hpb=9fa4c0d887cfe9f1165c2407639f4cca2f62a2e1

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
index d847fbb900..30f6bfc1f2 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c
@@ -18,25 +18,30 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 	float i;
 
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_pressedkeys"));
+		me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_panel_pressedkeys"));
 			e.addValue(e, "Panel disabled", "0");
 			e.addValue(e, "Panel enabled when spectating", "1");
 			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:"));
-		me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_", panelname, "_bg_color"))));
-			setDependentStringNotEqual(e, strzone(strcat("hud_", panelname, "_bg_color")), "");
+		me.TD(me, 2, 2.4, e = makeXonoticColorpickerString(strzone(strcat("hud_panel_", panelname, "_bg_color")), "hud_panel_bg_color"));
+			setDependentStringNotEqual(e, strzone(strcat("hud_panel_", panelname, "_bg_color")), "");
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_", panelname, "_bg_color")), "Use default"));
+		me.TD(me, 1, 1.2, e = makeXonoticCheckBoxString("", "1 1 1", strzone(strcat("hud_panel_", panelname, "_bg_color")), "Use default"));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Border size:"));
-			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_border"))));
+			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_border"))));
 				e.addValue(e, "Default", "");
 				e.addValue(e, "Disable", "0");
 				for(i = 1; i <= 10; ++i)
@@ -45,7 +50,7 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Alpha:"));
-			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_alpha"))));
+			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_alpha"))));
 				e.addValue(e, "Default", "");
 				for(i = 1; i <= 10; ++i)
 					e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
@@ -53,7 +58,7 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Team Color:"));
-			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_color_team"))));
+			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_color_team"))));
 				e.addValue(e, "Default", "");
 				e.addValue(e, "Disable", "0");
 				for(i = 1; i <= 10; ++i)
@@ -65,7 +70,7 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Padding:"));
-			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_", panelname, "_bg_padding"))));
+			me.TD(me, 1, 2.6, e = makeXonoticTextSlider(strzone(strcat("hud_panel_", panelname, "_bg_padding"))));
 				e.addValue(e, "Default", "");
 				for(i = 0; i <= 10; ++i)
 					e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
@@ -73,6 +78,6 @@ void XonoticHUDPressedKeysDialog_fill(entity me)
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Forced aspect:"));
-			me.TD(me, 1, 2.6, e = makeXonoticSlider(0.25, 4, 0.25, "hud_pressedkeys_aspect"));
+			me.TD(me, 1, 2.6, e = makeXonoticSlider(0.2, 4, 0.1, "hud_panel_pressedkeys_aspect"));
 }
 #endif