From: FruitieX Date: Tue, 13 Jul 2010 00:39:37 +0000 (+0300) Subject: dialogs for most remaining panels. problem left to tackle: how to select the dialog... X-Git-Tag: xonotic-v0.1.0preview~362^2~44^2~5 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e132748116be6a6a94b5b089161fec2e2166db5d dialogs for most remaining panels. problem left to tackle: how to select the dialog background image? --- diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc index 132643ad59..183f0d142c 100644 --- a/qcsrc/client/hud.qc +++ b/qcsrc/client/hud.qc @@ -2182,10 +2182,10 @@ void HUD_HealthArmor(void) { if(autocvar_hud_healtharmor_baralign == 1 || autocvar_hud_healtharmor_baralign == 3) { // right align barpos = pos + eX * mySize_x - eX * mySize_x * min(1, leftcnt/200); - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } else { // left align barpos = pos; - barsize = eX * mySize_x * min(1, rightcnt/200) + eY * 0.5 * mySize_y; + barsize = eX * mySize_x * min(1, leftcnt/200) + eY * 0.5 * mySize_y; } HUD_Panel_GetProgressBarColor(leftname) diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c index 33e861a6aa..7f0da65b39 100644 --- a/qcsrc/menu/classes.c +++ b/qcsrc/menu/classes.c @@ -98,4 +98,6 @@ #include "xonotic/dialog_hudpanel_vote.c" #include "xonotic/dialog_hudpanel_modicons.c" #include "xonotic/dialog_hudpanel_chat.c" +#include "xonotic/dialog_hudpanel_engineinfo.c" +#include "xonotic/dialog_hudpanel_infomessages.c" #include "xonotic/dialog_hudpanel_weaponicons.c" diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c index cd9f3854b9..7d16347220 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_chat.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_chat.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDChatDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDChatDialog, fill, void(entity)) - ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel Setup") + ATTRIB(XonoticHUDChatDialog, title, string, "Chat Panel") ATTRIB(XonoticHUDChatDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDChatDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDChatDialog, rows, float, 15) @@ -14,25 +14,70 @@ ENDCLASS(XonoticHUDChatDialog) void XonoticHUDChatDialog_fill(entity me) { entity e; + string panelname = "chat"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Chat entries:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat size:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(6, 20, 1, "con_chatsize")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Chat lifetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(5, 60, 5, "con_chattime")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_chat", "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_chat_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_chat_bg_alpha")); - me.TR(me); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Font size:")); - me.TD(me, 1, 2, e = makeXonoticSlider(6, 16, 1, "con_chatsize")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(16, 40, 2, "con_chattime")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Message sound beep")); - //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.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_chatsound", "Chat beep sound")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c index e2e896b384..7624d4cde0 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_healtharmor.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDHealthArmorDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDHealthArmorDialog, fill, void(entity)) - ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel Setup") + ATTRIB(XonoticHUDHealthArmorDialog, title, string, "Health/Armor Panel") ATTRIB(XonoticHUDHealthArmorDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDHealthArmorDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDHealthArmorDialog, rows, float, 15) @@ -14,26 +14,75 @@ ENDCLASS(XonoticHUDHealthArmorDialog) void XonoticHUDHealthArmorDialog_fill(entity me) { entity e; + string panelname = "healtharmor"; + float i; + me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Status:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_healtharmor")); - e.addValue(e, "Disabled", "0"); - e.addValue(e, "Enabled", "1"); - e.addValue(e, "Combined h/a", "2"); - e.configureXonoticTextSliderValues(e); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor", "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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:")); 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_healtharmor_bg_color_team")); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_healtharmor_baralign", "4", "Outward")); 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_healtharmor_bg_alpha")); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:")); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip")); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_healtharmor_iconalign", "4", "Outward")); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_mirror", "Mirror")); - //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, 3, e = makeXonoticCheckBox(0, "hud_healtharmor_flip", "Flip health and armor positions")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c index 8635dae06c..08b5ec832c 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_modicons.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDModIconsDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDModIconsDialog, fill, void(entity)) - ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel Setup") + ATTRIB(XonoticHUDModIconsDialog, title, string, "Mod Icons Panel") ATTRIB(XonoticHUDModIconsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDModIconsDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDModIconsDialog, rows, float, 15) @@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDModIconsDialog) void XonoticHUDModIconsDialog_fill(entity me) { entity e; + string panelname = "modicons"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "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.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_modicons", "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_modicons_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_modicons_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.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); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c index 503d50a47f..f0db4a0f7f 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_notification.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_notification.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDNotificationDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDNotificationDialog, fill, void(entity)) - ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel Setup") + ATTRIB(XonoticHUDNotificationDialog, title, string, "Notification Panel") ATTRIB(XonoticHUDNotificationDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDNotificationDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDNotificationDialog, rows, float, 15) @@ -14,27 +14,73 @@ ENDCLASS(XonoticHUDNotificationDialog) void XonoticHUDNotificationDialog_fill(entity me) { entity e; + string panelname = "notify"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_healtharmor", "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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Notifications:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print notifications to the console")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip notify order")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry lifetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(3, 15, 1, "hud_notify_time")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify", "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_notify_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_notify_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_flip", "Flip")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message lifetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(3, 15, 1, "hud_notify_time")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Message fadetime:")); - me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "hud_notify_fadetime")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_notify_print", "Also print messages to console")); - 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.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Entry fadetime:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(0.5, 5, 0.5, "hud_notify_fadetime")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c index b6d42326de..31d98ddf12 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_powerups.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDPowerupsDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDPowerupsDialog, fill, void(entity)) - ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel Setup") + ATTRIB(XonoticHUDPowerupsDialog, title, string, "Powerups Panel") ATTRIB(XonoticHUDPowerupsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPowerupsDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDPowerupsDialog, rows, float, 15) @@ -14,21 +14,75 @@ ENDCLASS(XonoticHUDPowerupsDialog) void XonoticHUDPowerupsDialog_fill(entity me) { entity e; + string panelname = "powerups"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Status bar alignment:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(2, "hud_powerups_baralign", "4", "Outward")); + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Icon alignment:")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "0", "Left")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "1", "Right")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "3", "Inward")); + me.TD(me, 1, 0.95, e = makeXonoticRadioButton(3, "hud_powerups_iconalign", "4", "Outward")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups", "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_powerups_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_powerups_bg_alpha")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip")); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_powerups_mirror", "Mirror")); - 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, 3, e = makeXonoticCheckBox(0, "hud_powerups_flip", "Flip strength and shield positions")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c index 9b66fc3cba..d847fbb900 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_pressedkeys.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDPressedKeysDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDPressedKeysDialog, fill, void(entity)) - ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel Setup") + ATTRIB(XonoticHUDPressedKeysDialog, title, string, "Pressed Keys Panel") ATTRIB(XonoticHUDPressedKeysDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDPressedKeysDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDPressedKeysDialog, rows, float, 15) @@ -14,17 +14,65 @@ ENDCLASS(XonoticHUDPressedKeysDialog) void XonoticHUDPressedKeysDialog_fill(entity me) { entity e; + string panelname = "pressedkeys"; + float i; + + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_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.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_pressedkeys", "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_pressedkeys_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_pressedkeys_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.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")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c index 7fe0f682e9..edcbcc4eaa 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_racetimer.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDRaceTimerDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDRaceTimerDialog, fill, void(entity)) - ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel Setup") + ATTRIB(XonoticHUDRaceTimerDialog, title, string, "Race Timer Panel") ATTRIB(XonoticHUDRaceTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRaceTimerDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDRaceTimerDialog, rows, float, 15) @@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDRaceTimerDialog) void XonoticHUDRaceTimerDialog_fill(entity me) { entity e; + string panelname = "racetimer"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "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.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_racetimer", "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_racetimer_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_racetimer_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.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); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c index a0ead55ef9..93006905ca 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_radar.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_radar.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDRadarDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDRadarDialog, fill, void(entity)) - ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel Setup") + ATTRIB(XonoticHUDRadarDialog, title, string, "Radar Panel") ATTRIB(XonoticHUDRadarDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDRadarDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDRadarDialog, rows, float, 15) @@ -14,37 +14,90 @@ ENDCLASS(XonoticHUDRadarDialog) void XonoticHUDRadarDialog_fill(entity me) { entity e; + string panelname = "radar"; + float i; + + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar")); + e.addValue(e, "Panel disabled", "0"); + e.addValue(e, "Panel enabled in teamgames", "1"); + e.addValue(e, "Panel always enabled", "2"); + e.configureXonoticTextSliderValues(e); + 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.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_radar", "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_radar_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_radar_bg_alpha")); - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Foreground Alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_radar_foreground_alpha")); - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Rotation:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_rotation")); - e.addValue(e, "Player", "0"); + 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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Radar:")); + 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 = makeXonoticSlider(0.1, 1, 0.1, "hud_radar_foreground_alpha")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Rotation:")); + me.TD(me, 1, 2.6, e = makeXonoticTextSlider("hud_radar_rotation")); + e.addValue(e, "Forward", "0"); e.addValue(e, "West", "1"); e.addValue(e, "South", "2"); e.addValue(e, "East", "3"); e.addValue(e, "North", "4"); e.configureXonoticTextSliderValues(e); - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Zoom:")); - me.TD(me, 1, 2, e = makeXonoticTextSlider("hud_radar_zoommode")); - e.addValue(e, "Default", "0"); - e.addValue(e, "Zoomed", "1"); - e.addValue(e, "Always Zoomed", "2"); - e.addValue(e, "Zoomed Out", "3"); - e.configureXonoticTextSliderValues(e); 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.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Scale:")); + me.TD(me, 1, 2.6, e = makeXonoticSlider(1024, 8192, 512, "hud_radar_scale")); + me.TR(me); + me.TDempty(me, 0.2); + me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, "Zoom mode:")); + me.TD(me, 1, 1.6, e = makeXonoticTextSlider("hud_radar_zoommode")); + e.addValue(e, "Zoomed in", "0"); + e.addValue(e, "Zoomed out", "1"); + e.addValue(e, "Always zoomed", "2"); + e.addValue(e, "Never zoomed", "3"); + e.configureXonoticTextSliderValues(e); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_score.c b/qcsrc/menu/xonotic/dialog_hudpanel_score.c index 05fdb74f10..0cda2a3600 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_score.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_score.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDScoreDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDScoreDialog, fill, void(entity)) - ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel Setup") + ATTRIB(XonoticHUDScoreDialog, title, string, "Score Panel") ATTRIB(XonoticHUDScoreDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDScoreDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDScoreDialog, rows, float, 15) @@ -14,17 +14,57 @@ ENDCLASS(XonoticHUDScoreDialog) void XonoticHUDScoreDialog_fill(entity me) { entity e; + string panelname = "score"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "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.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_score", "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_score_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_score_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.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); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c index 6bfa03b995..4242b06ad7 100644 --- a/qcsrc/menu/xonotic/dialog_hudpanel_timer.c +++ b/qcsrc/menu/xonotic/dialog_hudpanel_timer.c @@ -1,7 +1,7 @@ #ifdef INTERFACE CLASS(XonoticHUDTimerDialog) EXTENDS(XonoticRootDialog) METHOD(XonoticHUDTimerDialog, fill, void(entity)) - ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel Setup") + ATTRIB(XonoticHUDTimerDialog, title, string, "Timer Panel") ATTRIB(XonoticHUDTimerDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT) ATTRIB(XonoticHUDTimerDialog, intendedWidth, float, 0.4) ATTRIB(XonoticHUDTimerDialog, rows, float, 15) @@ -14,17 +14,62 @@ ENDCLASS(XonoticHUDTimerDialog) void XonoticHUDTimerDialog_fill(entity me) { entity e; + string panelname = "timer"; + float i; + + me.TR(me); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "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.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Timer:")); me.TR(me); - me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer", "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_timer_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_timer_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.TDempty(me, 0.2); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_timer_increment", "Show elapsed time")); } #endif diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_vote.c b/qcsrc/menu/xonotic/dialog_hudpanel_vote.c index e96af574aa..e097e86b4a 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) @@ -14,17 +14,60 @@ ENDCLASS(XonoticHUDVoteDialog) 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