Merge branch 'master' into terencehill/newpanelhud

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / util.qh

diff --git a/qcsrc/menu/xonotic/util.qh b/qcsrc/menu/xonotic/util.qh
index fea001f1d422e2b64dbdeeef480ac0d08c658f9d..e5fcc155a3e2c7350217d2faed2400717d063dd9 100644 (file)
--- a/qcsrc/menu/xonotic/util.qh
+++ b/qcsrc/menu/xonotic/util.qh
@@ -22,8 +22,6 @@ string getZonedTooltipForIdentifier(string s);
 
 string resolvemod(string m);
 
-string HUD_Panel_GetSettingName(float setting);
-
 float URI_GET_DISCARD = 0;
 
 float URI_GET_UPDATENOTIFICATION = 1;
@@ -41,62 +39,14 @@ float GameType_GetID(float cnt);
 string GameType_GetName(float cnt);
 float GameType_GetCount();
 
+void dialog_hudpanel_common_notoggle(entity me, string panelname);
 #define DIALOG_HUDPANEL_COMMON_NOTOGGLE() \
-       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)
+       dialog_hudpanel_common_notoggle(me, panelname)
 #define DIALOG_HUDPANEL_COMMON() \
        me.TR(me); \
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", hudpanel)), _("Enable panel"))); \
+               me.TD(me, 1, 4, e = makeXonoticCheckBox(0, strzone(strcat("hud_panel_", panelname)), _("Enable panel"))); \
        DIALOG_HUDPANEL_COMMON_NOTOGGLE()
 
 string language_filename(string s);
+string CTX(string s);
+#define ZCTX(s) strzone(CTX(s))