From: terencehill <piuntn@gmail.com>
Date: Wed, 18 Nov 2015 19:13:24 +0000 (+0100)
Subject: Add a HUD skin selector in the HUD Setup window (that one that appears pressing ESC... 
X-Git-Tag: xonotic-v0.8.2~1467^2~16
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bea91a714040103a1bc533c4366678ff09cc3781;p=xonotic%2Fxonotic-data.pk3dir.git

Add a HUD skin selector in the HUD Setup window (that one that appears pressing ESC in the HUD Editor)
---

diff --git a/qcsrc/menu/classes.inc b/qcsrc/menu/classes.inc
index 08563a118a..3aa3e43057 100644
--- a/qcsrc/menu/classes.inc
+++ b/qcsrc/menu/classes.inc
@@ -102,6 +102,7 @@
 #include "xonotic/dialog_singleplayer_winner.qc"
 #include "xonotic/dialog_teamselect.qc"
 #include "xonotic/gametypelist.qc"
+#include "xonotic/hudskinlist.qc"
 #include "xonotic/image.qc"
 #include "xonotic/inputbox.qc"
 #include "xonotic/keybinder.qc"
diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
index b9d4c34b7e..a4ebbb2cfb 100644
--- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
+++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
@@ -5,9 +5,9 @@ CLASS(XonoticHUDExitDialog, XonoticRootDialog)
 	METHOD(XonoticHUDExitDialog, fill, void(entity));
 	ATTRIB(XonoticHUDExitDialog, title, string, _("Panel HUD Setup"))
 	ATTRIB(XonoticHUDExitDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
-	ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.4)
+	ATTRIB(XonoticHUDExitDialog, intendedWidth, float, 0.8)
 	ATTRIB(XonoticHUDExitDialog, rows, float, 18)
-	ATTRIB(XonoticHUDExitDialog, columns, float, 4)
+	ATTRIB(XonoticHUDExitDialog, columns, float, 8.2)
 	ATTRIB(XonoticHUDExitDialog, name, string, "HUDExit")
 	ATTRIB(XonoticHUDExitDialog, requiresConnection, float, true)
 ENDCLASS(XonoticHUDExitDialog)
@@ -18,9 +18,30 @@ ENDCLASS(XonoticHUDExitDialog)
 void XonoticHUDExitDialog_fill(entity me)
 {
 	entity e;
-	float i;
+	int i;
+	hudskinlist = makeXonoticHUDSkinList();
 
 	me.TR(me);
+		me.TD(me, 1, 4, makeXonoticHeaderLabel(_("HUD skins")));
+	me.TR(me);
+		me.TD(me, 1, 0.9, e = makeXonoticButton(_("Refresh"), '0 0 0'));
+			e.onClick = HUDSkinList_Refresh_Click;
+			e.onClickEntity = hudskinlist;
+		me.TDempty(me, 0.1);
+		me.TD(me, 1, 1, e = makeXonoticTextLabel(1, _("Filter:")));
+		me.TD(me, 1, 2, e = makeXonoticInputBox(0, string_null));
+			e.onChange = HUDSkinList_Filter_Change;
+			e.onChangeEntity = hudskinlist;
+			hudskinlist.controlledTextbox = e;
+	me.TR(me);
+		me.TD(me, 13.5, 4, hudskinlist);
+	me.gotoRC(me, me.rows - 2.5, 0);
+		me.TDempty(me, 0.75);
+		me.TD(me, 1, 2.5, e = makeXonoticButton(_("Set skin"), '0 0 0'));
+			e.onClick = SetHUDSkin_Click;
+			e.onClickEntity = hudskinlist;
+
+	me.gotoRC(me, 0, 4.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Panel background defaults:")));
 	me.TR(me);
 		me.TD(me, 1, 1.4, e = makeXonoticTextLabel(0, _("Background:")));
diff --git a/qcsrc/menu/xonotic/hudskinlist.qc b/qcsrc/menu/xonotic/hudskinlist.qc
new file mode 100644
index 0000000000..f338d813aa
--- /dev/null
+++ b/qcsrc/menu/xonotic/hudskinlist.qc
@@ -0,0 +1,200 @@
+#ifndef HUDSKINLIST_H
+#define HUDSKINLIST_H
+#include "listbox.qc"
+CLASS(XonoticHUDSkinList, XonoticListBox)
+	METHOD(XonoticHUDSkinList, configureXonoticHUDSkinList, void(entity));
+	ATTRIB(XonoticHUDSkinList, rowsPerItem, float, 1)
+	METHOD(XonoticHUDSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
+	METHOD(XonoticHUDSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));
+	METHOD(XonoticHUDSkinList, getHUDSkins, void(entity));
+	METHOD(XonoticHUDSkinList, setHUDSkin, void(entity));
+	METHOD(XonoticHUDSkinList, hudskinName, string(entity, float));
+	METHOD(XonoticHUDSkinList, doubleClickListBoxItem, void(entity, float, vector));
+	METHOD(XonoticHUDSkinList, keyDown, float(entity, float, float, float));
+	METHOD(XonoticHUDSkinList, destroy, void(entity));
+	METHOD(XonoticHUDSkinList, showNotify, void(entity));
+
+	ATTRIB(XonoticHUDSkinList, listHUDSkin, float, -1)
+	ATTRIB(XonoticHUDSkinList, realFontSize, vector, '0 0 0')
+	ATTRIB(XonoticHUDSkinList, columnNameOrigin, float, 0)
+	ATTRIB(XonoticHUDSkinList, columnNameSize, float, 0)
+	ATTRIB(XonoticHUDSkinList, realUpperMargin, float, 0)
+	ATTRIB(XonoticHUDSkinList, origin, vector, '0 0 0')
+	ATTRIB(XonoticHUDSkinList, itemAbsSize, vector, '0 0 0')
+
+	ATTRIB(XonoticHUDSkinList, filterString, string, string_null)
+ENDCLASS(XonoticHUDSkinList)
+
+#ifndef IMPLEMENTATION
+// public:
+entity hudskinlist;
+entity makeXonoticHUDSkinList();
+void SetHUDSkin_Click(entity btn, entity me);
+#endif
+void HUDSkinList_Refresh_Click(entity btn, entity me);
+void HUDSkinList_Filter_Change(entity box, entity me);
+#endif
+
+#ifdef IMPLEMENTATION
+
+entity makeXonoticHUDSkinList()
+{
+	entity me;
+	me = NEW(XonoticHUDSkinList);
+	me.configureXonoticHUDSkinList(me);
+	return me;
+}
+
+void XonoticHUDSkinList_configureXonoticHUDSkinList(entity me)
+{
+	me.configureXonoticListBox(me);
+	me.getHUDSkins(me);
+}
+
+string XonoticHUDSkinList_hudskinName(entity me, float i)
+{
+	string s;
+	s = bufstr_get(me.listHUDSkin, i);
+
+	if(substring(s, 0, 1) == "/")
+		s = substring(s, 1, strlen(s) - 1);  // remove the first forward slash
+
+	return s;
+}
+
+void getAllHUDSkins(entity me)
+{
+	string s;
+	if(me.filterString)
+		s = me.filterString;
+	else
+		s = "*";
+	s = strcat("hud_", s, ".cfg");
+
+	float list, i, n;
+	list = search_begin(s, false, true);
+	if(list >= 0)
+	{
+		n = search_getsize(list);
+		for(i = 0; i < n; ++i)
+		{
+			s = search_getfilename(list, i); // get initial full file name
+			s = substring(s, 4, (strlen(s) - 4 - 4)); // remove "hud_" prefix and ".cfg" suffix
+			bufstr_add(me.listHUDSkin, s, true);
+		}
+		search_end(list);
+	}
+}
+
+void XonoticHUDSkinList_getHUDSkins(entity me)
+{
+	if (me.listHUDSkin >= 0)
+		buf_del(me.listHUDSkin);
+	me.listHUDSkin = buf_create();
+	if (me.listHUDSkin < 0)
+	{
+		me.nItems = 0;
+		return;
+	}
+	getAllHUDSkins(me);
+	me.nItems = buf_getsize(me.listHUDSkin);
+	if(me.nItems > 0)
+		buf_sort(me.listHUDSkin, 128, false);
+}
+
+void XonoticHUDSkinList_destroy(entity me)
+{
+	if(me.nItems > 0)
+		buf_del(me.listHUDSkin);
+}
+
+void XonoticHUDSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+{
+	me.itemAbsSize = '0 0 0';
+	SUPER(XonoticHUDSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
+
+	me.realFontSize_y = me.fontSize / (me.itemAbsSize_y = (absSize.y * me.itemHeight));
+	me.realFontSize_x = me.fontSize / (me.itemAbsSize_x = (absSize.x * (1 - me.controlWidth)));
+	me.realUpperMargin = 0.5 * (1 - me.realFontSize.y);
+
+	me.columnNameOrigin = me.realFontSize.x;
+	me.columnNameSize = 1 - 2 * me.realFontSize.x;
+}
+
+void XonoticHUDSkinList_drawListBoxItem(entity me, int i, vector absSize, bool isSelected, bool isFocused)
+{
+	string s;
+	if(isSelected)
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
+	else if(isFocused)
+	{
+		me.focusedItemAlpha = getFadedAlpha(me.focusedItemAlpha, SKINALPHA_LISTBOX_FOCUSED, SKINFADEALPHA_LISTBOX_FOCUSED);
+		draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_FOCUSED, me.focusedItemAlpha);
+	}
+
+	s = me.hudskinName(me,i);
+	s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
+	draw_Text(me.realUpperMargin * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_TEXT, SKINALPHA_TEXT, 1);
+}
+
+void XonoticHUDSkinList_showNotify(entity me)
+{
+	me.getHUDSkins(me);
+}
+
+void HUDSkinList_Refresh_Click(entity btn, entity me)
+{
+	me.getHUDSkins(me);
+	me.setSelected(me, 0); //always select the first element after a list update
+}
+
+void HUDSkinList_Filter_Change(entity box, entity me)
+{
+	if(me.filterString)
+		strunzone(me.filterString);
+
+	if(box.text != "")
+	{
+		if (strstrofs(box.text, "*", 0) >= 0 || strstrofs(box.text, "?", 0) >= 0)
+			me.filterString = strzone(box.text);
+		else
+			me.filterString = strzone(strcat("*", box.text, "*"));
+	}
+	else
+		me.filterString = string_null;
+
+	me.getHUDSkins(me);
+}
+
+void XonoticHUDSkinList_setHUDSkin(entity me)
+{
+	string s = me.hudskinName(me, me.selectedItem);
+
+	localcmd("exec \"hud_", s, ".cfg\"\n");
+}
+
+void SetHUDSkin_Click(entity btn, entity me)
+{
+	me.setHUDSkin(me);
+}
+
+void XonoticHUDSkinList_doubleClickListBoxItem(entity me, float i, vector where)
+{
+	m_play_click_sound(MENU_SOUND_EXECUTE);
+	me.setHUDSkin(me);
+}
+
+float XonoticHUDSkinList_keyDown(entity me, float scan, float ascii, float shift)
+{
+	if(scan == K_ENTER || scan == K_KP_ENTER)
+	{
+		me.setHUDSkin(me);
+		return 1;
+	}
+	else
+	{
+		return SUPER(XonoticHUDSkinList).keyDown(me, scan, ascii, shift);
+	}
+}
+#endif
+