remove lots of uses of togglemenu

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / skinlist.c

diff --git a/qcsrc/menu/xonotic/skinlist.c b/qcsrc/menu/xonotic/skinlist.c
index 05820bf63c059e784a4ad4c6bf252ec074f73620..b636336b1de825ac4f0a8ba1930a2296cb533190 100644 (file)
--- a/qcsrc/menu/xonotic/skinlist.c
+++ b/qcsrc/menu/xonotic/skinlist.c
@@ -50,14 +50,14 @@ entity makeXonoticSkinList()
        return me;
 }
 
-void configureXonoticSkinListXonoticSkinList(entity me)
+void XonoticSkinList_configureXonoticSkinList(entity me)
 {
        me.configureXonoticListBox(me);
        me.getSkins(me);
        me.loadCvars(me);
 }
 
-void loadCvarsXonoticSkinList(entity me)
+void XonoticSkinList_loadCvars(entity me)
 {
        string s;
        float i, n;
@@ -73,17 +73,17 @@ void loadCvarsXonoticSkinList(entity me)
        }
 }
 
-void saveCvarsXonoticSkinList(entity me)
+void XonoticSkinList_saveCvars(entity me)
 {
        cvar_set("menu_skin", me.skinParameter(me, me.selectedItem, SKINPARM_NAME));
 }
 
-string skinParameterXonoticSkinList(entity me, float i, float key)
+string XonoticSkinList_skinParameter(entity me, float i, float key)
 {
        return bufstr_get(me.skinlist, i * SKINPARM_COUNT + key);
 }
 
-void getSkinsXonoticSkinList(entity me)
+void XonoticSkinList_getSkins(entity me)
 {
        float glob, buf, i, n, fh;
        string s;
@@ -102,10 +102,13 @@ void getSkinsXonoticSkinList(entity me)
        {
                s = search_getfilename(glob, i);
                bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_NAME, substring(s, 9, strlen(s) - 24)); // the * part
-               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, "<TITLE>");
-               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, "<AUTHOR>");
-               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_PREVIEW, strcat("/gfx/menu/", substring(s, 9, strlen(s) - 24), "/skinpreview"));
-               fh = fopen(s, FILE_READ);
+               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_TITLE, _("<TITLE>"));
+               bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_AUTHOR, _("<AUTHOR>"));
+               if(draw_PictureSize(strcat("/gfx/menu/", substring(s, 9, strlen(s) - 24), "/skinpreview")) == '0 0 0')
+                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_PREVIEW, "nopreview_menuskin");
+               else
+                       bufstr_set(buf, i * SKINPARM_COUNT + SKINPARM_PREVIEW, strcat("/gfx/menu/", substring(s, 9, strlen(s) - 24), "/skinpreview"));
+               fh = fopen(language_filename(s), FILE_READ);
                if(fh < 0)
                {
                        print("Warning: can't open skinvalues.txt file\n");
@@ -128,12 +131,12 @@ void getSkinsXonoticSkinList(entity me)
        me.nItems = n;
 }
 
-void destroyXonoticSkinList(entity me)
+void XonoticSkinList_destroy(entity me)
 {
        buf_del(me.skinlist);
 }
 
-void resizeNotifyXonoticSkinList(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
+void XonoticSkinList_resizeNotify(entity me, vector relOrigin, vector relSize, vector absOrigin, vector absSize)
 {
        me.itemAbsSize = '0 0 0';
        SUPER(XonoticSkinList).resizeNotify(me, relOrigin, relSize, absOrigin, absSize);
@@ -149,7 +152,7 @@ void resizeNotifyXonoticSkinList(entity me, vector relOrigin, vector relSize, ve
        me.columnNameSize = 1 - me.columnPreviewSize - 2 * me.realFontSize_x;
 }
 
-void drawListBoxItemXonoticSkinList(entity me, float i, vector absSize, float isSelected)
+void XonoticSkinList_drawListBoxItem(entity me, float i, vector absSize, float isSelected)
 {
        string s;
        
@@ -160,7 +163,7 @@ void drawListBoxItemXonoticSkinList(entity me, float i, vector absSize, float is
        draw_Picture(me.columnPreviewOrigin * eX, s, me.columnPreviewSize * eX + eY, '1 1 1', 1);
        
        s = me.skinParameter(me, i, SKINPARM_NAME);
-       s = strcat(s, ": ", me.skinParameter(me, i, SKINPARM_TITLE));
+       s = sprintf(_("%s: %s"), s, me.skinParameter(me, i, SKINPARM_TITLE));
        s = draw_TextShortenToWidth(s, me.columnNameSize, 0, me.realFontSize);
        draw_Text(me.realUpperMargin1 * eY + (me.columnNameOrigin + 0.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_SKINLIST_TITLE, SKINALPHA_TEXT, 0);
 
@@ -169,10 +172,10 @@ void drawListBoxItemXonoticSkinList(entity me, float i, vector absSize, float is
        draw_Text(me.realUpperMargin2 * eY + (me.columnNameOrigin + 1.00 * (me.columnNameSize - draw_TextWidth(s, 0, me.realFontSize))) * eX, s, me.realFontSize, SKINCOLOR_SKINLIST_AUTHOR, SKINALPHA_TEXT, 0);
 }
 
-void setSkinXonoticSkinList(entity me)
+void XonoticSkinList_setSkin(entity me)
 {
        me.saveCvars(me);
-       localcmd("\nmenu_restart\ntogglemenu\ndefer 0.1 \"menu_cmd skinselect\"\n");
+       localcmd("\nmenu_restart\ndefer 0.1 \"menu_cmd skinselect\"\n");
 }
 
 void SetSkin_Click(entity btn, entity me)
@@ -180,7 +183,7 @@ void SetSkin_Click(entity btn, entity me)
        me.setSkin(me);
 }
 
-void clickListBoxItemXonoticSkinList(entity me, float i, vector where)
+void XonoticSkinList_clickListBoxItem(entity me, float i, vector where)
 {
        if(i == me.lastClickedSkin)
                if(time < me.lastClickedTime + 0.3)
@@ -193,9 +196,9 @@ void clickListBoxItemXonoticSkinList(entity me, float i, vector where)
        me.lastClickedTime = time;
 }
 
-float keyDownXonoticSkinList(entity me, float scan, float ascii, float shift)
+float XonoticSkinList_keyDown(entity me, float scan, float ascii, float shift)
 {
-       if(scan == K_ENTER) {
+       if(scan == K_ENTER || scan == K_KP_ENTER) {
                me.setSkin(me);
                return 1;
        }