Merge CLASS and EXTENDS, #define NEW(cname) (spawn##cname())

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / skin-customizables.inc

diff --git a/qcsrc/menu/skin-customizables.inc b/qcsrc/menu/skin-customizables.inc
index 6b5cac042ca970af7df0cc83c1c4e9f5e5e14585..ee0e76f399f7efbde625505d3b2fd59db7f84dae 100644 (file)
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@ -45,10 +45,11 @@ SKINBEGIN
        SKINSTRING(GFX_TOOLTIP, "tooltip");
        SKINVECTOR(MARGIN_TOOLTIP, '5 5 0');
        SKINVECTOR(BORDER_TOOLTIP, '1 1 0');
+       SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+       SKINFLOAT(WIDTH_TOOLTIP, 0.3);
        SKINFLOAT(FONTSIZE_TOOLTIP, 12);
        SKINFLOAT(ALPHA_TOOLTIP, 0.7);
-       SKINFLOAT(WIDTH_TOOLTIP, 0.3);
-       SKINVECTOR(AVOID_TOOLTIP, '8 8 0');
+       SKINVECTOR(COLOR_TOOLTIP, '1 1 1');
 
        // the individual dialog background colors
        SKINVECTOR(COLOR_DIALOG_FIRSTRUN, '0.7 0.7 1');
@@ -70,6 +71,7 @@ SKINBEGIN
        SKINVECTOR(COLOR_DIALOG_HUD, '1 0.7 0.7');
        SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
+       SKINVECTOR(COLOR_DIALOG_SCREENSHOTVIEWER, '0.7 0.7 1');
        SKINVECTOR(COLOR_DIALOG_HUDCONFIRM, '1 0 0');
 
        // nexposee positions of windows (they are the scale transformation
@@ -97,6 +99,9 @@ SKINBEGIN
        SKINFLOAT(ALPHA_DISABLED, 0.2);
        SKINFLOAT(ALPHA_BEHIND, 0.5);
        SKINFLOAT(ALPHA_TEXT, 0.7);
+       SKINVECTOR(COLOR_TEXT, '1 1 1');
+       SKINFLOAT(ALPHA_HEADER, 0.5);
+       SKINVECTOR(COLOR_HEADER, '1 1 1');
 
        // item: button
        SKINSTRING(GFX_BUTTON, "button");
@@ -201,15 +206,16 @@ SKINBEGIN
 
        // item: player color button
        SKINSTRING(GFX_COLORBUTTON, "colorbutton");
-       SKINSTRING(GFX_COLORBUTTON_COLOR, "color");
 
        // item: player model
        SKINVECTOR(COLOR_MODELTITLE, '1 1 1');
        SKINFLOAT(ALPHA_MODELTITLE, 1);
 
        // item: player name editor
-       SKINSTRING(GFX_CHARMAP, "charmap");
-       SKINSTRING(GFX_CHARMAP_SELECTED, "charmapbutton");
+       SKINVECTOR(COLOR_CHARMAP_CHAR, '1 1 1');
+       SKINFLOAT(ALPHA_CHARMAP_CHAR, 1);
+       SKINVECTOR(COLOR_CHARMAP_FOCUS, '0 0 1');
+       SKINFLOAT(ALPHA_CHARMAP_FOCUS, 0.5);
 
        // item: radio button
        SKINSTRING(GFX_RADIOBUTTON, "radiobutton");
@@ -227,6 +233,8 @@ SKINBEGIN
        SKINFLOAT(WIDTH_SCROLLBAR, 16);
 
        // item: server list
+       SKINFLOAT(ALPHA_SERVERLIST_CATEGORY, 0.7);
+       SKINVECTOR(COLOR_SERVERLIST_CATEGORY, '1 1 1');
        SKINFLOAT(ALPHA_SERVERLIST_FULL, 0.4);
        SKINFLOAT(ALPHA_SERVERLIST_EMPTY, 0.7);
        SKINVECTOR(COLOR_SERVERLIST_LOWPING, '0 1 0');
@@ -248,6 +256,12 @@ SKINBEGIN
        SKINVECTOR(COLOR_SKINLIST_TITLE, '1 1 1');
        SKINVECTOR(COLOR_SKINLIST_AUTHOR, '0.4 0.4 0.7');
 
+       // item: demo list
+       SKINVECTOR(COLOR_DEMOLIST_SUBDIR, '0.5 0.5 0.5');
+
+       // item: screenshot list
+       SKINVECTOR(COLOR_SCREENSHOTLIST_SUBDIR, '0.5 0.5 0.5');
+
        // item: slider
        SKINSTRING(GFX_SLIDER, "slider");
        SKINVECTOR(COLOR_SLIDER_N, '1 1 1');