X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_vote.c;h=e097e86b4a0d526b4f7e7e471a44ccd7bac2eb52;hb=e132748116be6a6a94b5b089161fec2e2166db5d;hp=df50e039e0543b0b6441c6922c579866a981c499;hpb=a9e41298d7a296528d3ab8aff39826c761f1ae89;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
index df50e039e..e097e86b4 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDVoteDialog) EXTENDS(XonoticRootDialog)
 	METHOD(XonoticHUDVoteDialog, fill, void(entity))
-	ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel Setup")
+	ATTRIB(XonoticHUDVoteDialog, title, string, "Vote Panel")
 	ATTRIB(XonoticHUDVoteDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
 	ATTRIB(XonoticHUDVoteDialog, intendedWidth, float, 0.4)
 	ATTRIB(XonoticHUDVoteDialog, rows, float, 15)
@@ -11,20 +11,63 @@ ENDCLASS(XonoticHUDVoteDialog)
 #endif
 
 #ifdef IMPLEMENTATION
-void fillXonoticHUDVoteDialog(entity me)
+void XonoticHUDVoteDialog_fill(entity me)
 {
 	entity e;
+	string panelname = "vote";
+	float i;
+
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "Enable panel"));
+	me.TR(me);
+		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background:"));
+	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.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.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"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				for(i = 1; i <= 10; ++i)
+					e.addValue(e, strzone(ftos_decimals(i * 2, 0)), strzone(ftos(i * 2)));
+				e.configureXonoticTextSliderValues(e);
+	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"))));
+				e.addValue(e, "Default", "");
+				for(i = 1; i <= 10; ++i)
+					e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+				e.configureXonoticTextSliderValues(e);
+	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"))));
+				e.addValue(e, "Default", "");
+				e.addValue(e, "Disable", "0");
+				for(i = 1; i <= 10; ++i)
+					e.addValue(e, strzone(ftos_decimals(i/10, 1)), strzone(ftos(i/10)));
+				e.configureXonoticTextSliderValues(e);
+	me.TR(me);
+		me.TDempty(me, 0.4);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_teamcolorforced", "Test the team color in HUD configure mode"));
+	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"))));
+				e.addValue(e, "Default", "");
+				for(i = 0; i <= 10; ++i)
+					e.addValue(e, strzone(ftos_decimals(i - 5, 0)), strzone(ftos(i - 5)));
+				e.configureXonoticTextSliderValues(e);
 	me.TR(me);
-		me.TR(me);
-			me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_vote", "On/Off"));
-		me.TR(me);
-			me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Team Color:"));
-				me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_color_team"));
-		me.TR(me);
-			me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Background Alpha:"));
-				me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_vote_bg_alpha"));
-	me.TR(me);
-	//me.gotoRC(me, me.rows - 1, 0);
-		//me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
+		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Alpha after voting:"));
+			me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_vote_alreadyvoted_alpha"));
 }
 #endif