inventory panel

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c b/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
index b67210a1e32e5c4e9edd994ef2e8bd23f601a364..863146593de8777d8db19381ab57393ca314d0db 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_inventory.c
@@ -1,7 +1,7 @@
 #ifdef INTERFACE
 CLASS(XonoticHUDInventoryDialog) EXTENDS(XonoticRootDialog)
        METHOD(XonoticHUDInventoryDialog, fill, void(entity))
-       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel Setup")
+       ATTRIB(XonoticHUDInventoryDialog, title, string, "Inventory Panel")
        ATTRIB(XonoticHUDInventoryDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
        ATTRIB(XonoticHUDInventoryDialog, intendedWidth, float, 0.4)
        ATTRIB(XonoticHUDInventoryDialog, rows, float, 15)
@@ -14,19 +14,67 @@ ENDCLASS(XonoticHUDInventoryDialog)
 void XonoticHUDInventoryDialog_fill(entity me)
 {
        entity e;
+       string panelname = "inventory";
+       float i;
+
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory", "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, "Ammunition display:"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show only current ammo type"));
        me.TR(me);
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "hud_inventory", "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_inventory_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_inventory_bg_alpha"));
-               me.TR(me);
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_inventory_onlycurrent", "Show Current Ammo Only"));             
-       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.4, e = makeXonoticTextLabel(0, "Align icon:"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_inventory_iconalign", "0", "Left"));
+                       me.TD(me, 1, 0.8, e = makeXonoticRadioButton(2, "hud_inventory_iconalign", "1", "Right"));
 }
 #endif

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c b/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
index 04c8ed76aea07223c3c117bf2f38038dc98e1191..27926ff77a3963845ed3c5c6ff05ee8a75c0f9c4 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_weaponicons.c
@@ -89,7 +89,5 @@ void XonoticHUDWeaponIconsDialog_fill(entity me)
                me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, "Ammo bar alpha:"));
                        me.TD(me, 1, 2.6, e = makeXonoticSlider(0.1, 1, 0.1, "hud_weaponicons_ammo_alpha"));
                        setDependent(e, "hud_weaponicons_ammo", 1, 1);
-       //me.gotoRC(me, me.rows - 1, 0);
-               //me.TD(me, 1, me.columns, e = makeXonoticCommandButton("Exit Setup", '0 0 0', "_hud_configure 0", 1));
 }
 #endif