X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game_hud.qc;h=becefc6607f2f8202cbe7963eefdaa3e80963630;hb=42e255d014f2c6a1871177ea511f630624cdfb57;hp=fc7e3a136abb12250ac5af16ca22e38d4b7187f9;hpb=e3507f4fdbc2b3e15b663365e57e0aa60f3cf1a6;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
index fc7e3a136..becefc660 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_hud.qc
@@ -1,18 +1,13 @@
-#ifdef INTERFACE
-CLASS(XonoticGameHUDSettingsTab) EXTENDS(XonoticTab)
-	//METHOD(XonoticGameHUDSettingsTab, toString, string(entity))
-	METHOD(XonoticGameHUDSettingsTab, fill, void(entity))
-	METHOD(XonoticGameHUDSettingsTab, showNotify, void(entity))
-	ATTRIB(XonoticGameHUDSettingsTab, title, string, _("HUD"))
-	ATTRIB(XonoticGameHUDSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticGameHUDSettingsTab, rows, float, 13)
-	ATTRIB(XonoticGameHUDSettingsTab, columns, float, 6.2)
-ENDCLASS(XonoticGameHUDSettingsTab)
-entity makeXonoticGameHUDSettingsTab();
-void HUDSetup_Start(entity me, entity btn);
-#endif
+#include "dialog_settings_game_hud.qh"
+
+#include "../item/modalcontroller.qh"
+#include "mainwindow.qh"
+#include "textlabel.qh"
+#include "slider.qh"
+#include "slider_sbfadetime.qh"
+#include "checkbox.qh"
+#include "button.qh"
 
-#ifdef IMPLEMENTATION
 void HUDSetup_Check_Gamestatus(entity me, entity btn)
 {
 	if(!(gamestatus & (GAME_CONNECTED | GAME_ISSERVER))) // we're not in a match, ask the player if they want to start one anyway
@@ -31,7 +26,7 @@ void XonoticGameHUDSettingsTab_showNotify(entity me)
 entity makeXonoticGameHUDSettingsTab()
 {
 	entity me;
-	me = spawnXonoticGameHUDSettingsTab();
+	me = NEW(XonoticGameHUDSettingsTab);
 	me.configureDialog(me);
 	return me;
 }
@@ -44,12 +39,11 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 	// threshold: hud_damage_pain_threshold_lower_health
 	// scoreboard_alpha*
 
-	//me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Scoreboard")));
-	//me.TR(me);
-	//	me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:")));
-	//	me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg"));
+	me.TR(me);
+	me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Alpha:")));
+	me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.05, "scoreboard_alpha_bg"));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Fading speed:")));
 		me.TD(me, 1, 2, e = makeXonoticScoreboardFadeTimeSlider());
@@ -68,12 +62,14 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 	me.TR(me);
 		me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Waypoints")));
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Display waypoint markers for objectives on the map")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox_T(1, "cl_hidewaypoints", _("Display waypoint markers for objectives on the map"),
+			_("Show various gametype specific waypoints")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Alpha:")));
 			setDependent(e, "cl_hidewaypoints", 0, 0);
-		me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha"));
+		me.TD(me, 1, 2, e = makeXonoticSlider_T(0.1, 1, 0.05, "g_waypointsprite_alpha",
+			_("Control transparency of the waypoints")));
 			setDependent(e, "cl_hidewaypoints", 0, 0);
 	me.TR(me);
 		me.TDempty(me, 0.2);
@@ -85,7 +81,7 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Edge offset:")));
 			setDependent(e, "cl_hidewaypoints", 0, 0);
-		me.TD(me, 1, 2, e = makeXonoticSlider(0, 0.3, 0.01, "g_waypointsprite_edgeoffset_bottom"));
+		me.TD(me, 1, 2, e = makeXonoticSlider_T(0, 0.3, 0.01, "g_waypointsprite_edgeoffset_bottom", "-"));
 			makeMulti(e, "g_waypointsprite_edgeoffset_top g_waypointsprite_edgeoffset_left g_waypointsprite_edgeoffset_right");
 			setDependent(e, "cl_hidewaypoints", 0, 0);
 
@@ -142,9 +138,9 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 		me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Decolorize:")));
 			setDependent(e, "hud_shownames", 1, 1);
 		me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_shownames_decolorize"));
-			e.addValue(e, ZCTX(_("Never")), "0");
-			e.addValue(e, ZCTX(_("Teamplay")), "1");
-			e.addValue(e, ZCTX(_("Always")), "2");
+			e.addValue(e, _("Never"), "0");
+			e.addValue(e, _("Teamplay"), "1");
+			e.addValue(e, _("Always"), "2");
 			e.configureXonoticTextSliderValues(e);
 			setDependent(e, "hud_shownames", 1, 1);
 
@@ -170,4 +166,3 @@ void XonoticGameHUDSettingsTab_fill(entity me)
 			e.onClickEntity = me;
 		// TODO: show hud config name with text here
 }
-#endif