Add a button for saving the current HUD skin

diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
index bb83510a402be567c6f0c59029e86f69a5031666..d261bb8bffd83ce2d4d16e2bd723a561a4113bea 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
+++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.qc
@@ -34,12 +34,17 @@ void XonoticHUDExitDialog_fill(entity me)
                        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.TD(me, 12.5, 4, hudskinlist);
+       me.gotoRC(me, me.rows - 3.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.TR(me);
+               me.TDempty(me, 0.75);
+               me.TD(me, 1, 2.5, e = makeXonoticButton(_("Save current skin"), '0 0 0'));
+                       e.onClick = SaveHUDSkin_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:")));

diff --git a/qcsrc/menu/xonotic/hudskinlist.qc b/qcsrc/menu/xonotic/hudskinlist.qc
index f338d813aa3be9db63b2ce8ebeab44d013f15df0..c06e22535f5d7044f4370bf9bf01cec88a38aada 100644 (file)
--- a/qcsrc/menu/xonotic/hudskinlist.qc
+++ b/qcsrc/menu/xonotic/hudskinlist.qc
@@ -5,6 +5,7 @@ CLASS(XonoticHUDSkinList, XonoticListBox)
        METHOD(XonoticHUDSkinList, configureXonoticHUDSkinList, void(entity));
        ATTRIB(XonoticHUDSkinList, rowsPerItem, float, 1)
        METHOD(XonoticHUDSkinList, resizeNotify, void(entity, vector, vector, vector, vector));
+       METHOD(XonoticHUDSkinList, draw, void(entity));
        METHOD(XonoticHUDSkinList, drawListBoxItem, void(entity, int, vector, bool, bool));
        METHOD(XonoticHUDSkinList, getHUDSkins, void(entity));
        METHOD(XonoticHUDSkinList, setHUDSkin, void(entity));
@@ -23,12 +24,14 @@ CLASS(XonoticHUDSkinList, XonoticListBox)
        ATTRIB(XonoticHUDSkinList, itemAbsSize, vector, '0 0 0')
 
        ATTRIB(XonoticHUDSkinList, filterString, string, string_null)
+       ATTRIB(XonoticHUDSkinList, delayedRefreshTime, float, 0)
 ENDCLASS(XonoticHUDSkinList)
 
 #ifndef IMPLEMENTATION
 // public:
 entity hudskinlist;
 entity makeXonoticHUDSkinList();
+void SaveHUDSkin_Click(entity btn, entity me);
 void SetHUDSkin_Click(entity btn, entity me);
 #endif
 void HUDSkinList_Refresh_Click(entity btn, entity me);
@@ -62,14 +65,15 @@ string XonoticHUDSkinList_hudskinName(entity me, float i)
        return s;
 }
 
-void getAllHUDSkins(entity me)
+void getAllHUDSkins(entity me, string subdir)
 {
        string s;
        if(me.filterString)
                s = me.filterString;
        else
                s = "*";
-       s = strcat("hud_", s, ".cfg");
+       s = strcat(subdir, "hud_", s, ".cfg");
+       float strlen_subdir = strlen(subdir);
 
        float list, i, n;
        list = search_begin(s, false, true);
@@ -79,7 +83,7 @@ void getAllHUDSkins(entity me)
                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
+                       s = substring(s, strlen_subdir + 4, (strlen(s) - strlen_subdir - 4 - 4)); // remove "hud_" prefix and ".cfg" suffix
                        bufstr_add(me.listHUDSkin, s, true);
                }
                search_end(list);
@@ -96,7 +100,8 @@ void XonoticHUDSkinList_getHUDSkins(entity me)
                me.nItems = 0;
                return;
        }
-       getAllHUDSkins(me);
+       getAllHUDSkins(me, "");
+       getAllHUDSkins(me, "data/");
        me.nItems = buf_getsize(me.listHUDSkin);
        if(me.nItems > 0)
                buf_sort(me.listHUDSkin, 128, false);
@@ -166,10 +171,25 @@ void HUDSkinList_Filter_Change(entity box, entity me)
        me.getHUDSkins(me);
 }
 
+void SaveHUDSkin_Click(entity btn, entity me)
+{
+       localcmd("hud save myconfig\n");
+       me.delayedRefreshTime = time + 1;
+}
+
+void XonoticHUDSkinList_draw(entity me)
+{
+       if(me.delayedRefreshTime > 0 && me.delayedRefreshTime < time)
+       {
+               HUDSkinList_Refresh_Click(NULL, me);
+               me.delayedRefreshTime = 0;
+       }
+       SUPER(XonoticHUDSkinList).draw(me);
+}
+
 void XonoticHUDSkinList_setHUDSkin(entity me)
 {
        string s = me.hudskinName(me, me.selectedItem);
-
        localcmd("exec \"hud_", s, ".cfg\"\n");
 }