X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_hudpanel_physics.c;h=aeedc492df6dea50d26b1ada2f553baad827e8ba;hb=e272bb5918f084daadf92e7f90f0cab46e4bda31;hp=e00524167bd0c9d4ccf353e77d5a6ae990150910;hpb=2fb4172213439edb17c1d116747c75f9540f2017;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_physics.c b/qcsrc/menu/xonotic/dialog_hudpanel_physics.c
index e00524167..aeedc492d 100644
--- a/qcsrc/menu/xonotic/dialog_hudpanel_physics.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_physics.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDPhysicsDialog) EXTENDS(XonoticRootDialog)
 	METHOD(XonoticHUDPhysicsDialog, fill, void(entity))
-	ATTRIB(XonoticHUDPhysicsDialog, title, string, "Physics Panel")
+	ATTRIB(XonoticHUDPhysicsDialog, title, string, _("Physics Panel"))
 	ATTRIB(XonoticHUDPhysicsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
 	ATTRIB(XonoticHUDPhysicsDialog, intendedWidth, float, 0.4)
 	ATTRIB(XonoticHUDPhysicsDialog, rows, float, 15)
@@ -16,112 +16,67 @@ void XonoticHUDPhysicsDialog_fill(entity me)
 {
 	entity e;
 	string panelname = "physics";
-	float i;
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics", "Enable panel"));
-	me.TR(me);
-		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_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_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_panel_", 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_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)));
-				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_panel_", 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_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)));
-				e.configureXonoticTextSliderValues(e);
+		me.TD(me, 1, 4, e = makeXonoticTextSlider("hud_panel_physics"));
+			e.addValue(e, _("Panel disabled"), "0");
+			e.addValue(e, _("Panel enabled"), "1");
+			e.addValue(e, _("Panel enabled even observing"), "2");
+			e.addValue(e, _("Panel enabled only in Race/CTS"), "3");
+			e.configureXonoticTextSliderValues(e);
+
+	DIALOG_HUDPANEL_COMMON_NOTOGGLE();
+
 	me.TR(me);
-		me.TD(me, 1, 1.4, e = makeXonoticCheckBox(0, "hud_panel_physics_progressbar", "Status bar"));
-		me.TD(me, 1, 1.6, e = makeXonoticTextSlider("hud_panel_physics_baralign"));
-			e.addValue(e, "Left align"   , "0");
-			e.addValue(e, "Right align"  , "1");
-			e.addValue(e, "Inward align" , "2");
-			e.addValue(e, "Outward align", "3");
+		me.TD(me, 1, 1.4, e = makeXonoticCheckBox(0, "hud_panel_physics_progressbar", _("Status bar")));
+		me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_panel_physics_baralign"));
+			e.addValue(e, _("Left align")   , "0");
+			e.addValue(e, _("Right align")  , "1");
+			e.addValue(e, _("Inward align") , "2");
+			e.addValue(e, _("Outward align"), "3");
 			e.configureXonoticTextSliderValues(e);
-			setDependent(e, "hud_panel_physics_progressbar", 1, 1);
+			setDependent(e, "hud_panel_physics_progressbar", 1, 3);
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics_flip", "Flip speed/acceleration positions"));
+		me.TD(me, 1, 4, e = makeXonoticCheckBox(0, "hud_panel_physics_flip", _("Flip speed/acceleration positions")));
 
 //speed
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Speed:"));
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics_speed_z", "Include vertical speed"));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Speed:")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics_speed_vertical", _("Include vertical speed")));
 	// me.TR(me);
 		// me.TDempty(me, 0.2);
-		// me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, "Full status bar at:"));
+		// me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, _("Full status bar at:")));
 			// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
 		// me.TD(me, 1, 1, e = makeXonoticInputBox(1, "hud_panel_physics_speed_max"));
 			// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
-		// me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "qu/s"));
+		// me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("qu/s")));
 			// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Speed unit:"));
+		me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Speed unit:")));
 		me.TD(me, 1, 2.6/3*2, e = makeXonoticTextSlider("hud_panel_physics_speed_unit"));
-			e.addValue(e, "qu/s" , "1");
-			e.addValue(e, "m/s"  , "2");
-			e.addValue(e, "km/h" , "3");
-			e.addValue(e, "mph"  , "4");
-			e.addValue(e, "knots", "5");
+			e.addValue(e, _("qu/s") , "1");
+			e.addValue(e, _("m/s")  , "2");
+			e.addValue(e, _("km/h") , "3");
+			e.addValue(e, _("mph")  , "4");
+			e.addValue(e, _("knots"), "5");
 			e.configureXonoticTextSliderValues(e);
-		me.TD(me, 1, 2.6/3, e = makeXonoticCheckBox(0, "hud_panel_physics_speed_unit_show", "Show"));
+		me.TD(me, 1, 2.6/3, e = makeXonoticCheckBox(0, "hud_panel_physics_speed_unit_show", _("Show")));
 	me.TR(me);
 		me.TDempty(me, 0.2);
-		me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_physics_topspeed", "Top Speed"));
+		me.TD(me, 1, 3.8/2, e = makeXonoticCheckBox(0, "hud_panel_physics_topspeed", _("Top speed")));
 		me.TD(me, 1, 3.8/2, e = makeXonoticSlider(1, 10, 1, "hud_panel_physics_topspeed_time"));
 			setDependent(e, "hud_panel_physics_topspeed", 1, 1);
 
 //acceleration
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Acceleration:"));
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics_acceleration_z", "Include vertical acc."));
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Acceleration:")));
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_panel_physics_acceleration_vertical", _("Include vertical acceleration")));
 	// me.TR(me);
 		// me.TDempty(me, 0.2);
-		// me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, "Full status bar at:"));
+		// me.TD(me, 1, 1.8, e = makeXonoticTextLabel(0, _("Full status bar at:")));
 			// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
 		// me.TD(me, 1, 0.6, e = makeXonoticInputBox(1, "hud_panel_physics_acceleration_max"));
 			// setDependent(e, "hud_panel_physics_progressbar", 1, 1);
 }
-#endif
\ No newline at end of file
+#endif