r3322 - in trunk/data: gfx/menu/default gfx/menu/xaw qcsrc/menu qcsrc/menu/nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Thu Jan 31 04:21:01 EST 2008
Author: div0
Date: 2008-01-31 04:20:40 -0500 (Thu, 31 Jan 2008)
New Revision: 3322
Modified:
trunk/data/gfx/menu/default/skinvalues.txt
trunk/data/gfx/menu/xaw/skinvalues.txt
trunk/data/qcsrc/menu/nexuiz/button.c
trunk/data/qcsrc/menu/nexuiz/checkbox.c
trunk/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c
trunk/data/qcsrc/menu/nexuiz/colorbutton.c
trunk/data/qcsrc/menu/nexuiz/crosshairbutton.c
trunk/data/qcsrc/menu/nexuiz/dialog.c
trunk/data/qcsrc/menu/nexuiz/gametypebutton.c
trunk/data/qcsrc/menu/nexuiz/inputbox.c
trunk/data/qcsrc/menu/nexuiz/keybinder.c
trunk/data/qcsrc/menu/nexuiz/playermodel.c
trunk/data/qcsrc/menu/nexuiz/radiobutton.c
trunk/data/qcsrc/menu/nexuiz/slider.c
trunk/data/qcsrc/menu/nexuiz/textlabel.c
trunk/data/qcsrc/menu/nexuiz/textslider.c
trunk/data/qcsrc/menu/skin-customizables.inc
Log:
more skin customizable stuff
Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/gfx/menu/default/skinvalues.txt 2008-01-31 09:20:40 UTC (rev 3322)
@@ -36,6 +36,7 @@
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
+ALPHA_TEXT 0.7
// item: button
// uses "button" images
@@ -90,9 +91,17 @@
COLOR_INPUTBOX_F '1 1 1'
MARGIN_INPUTBOX 0.02
+// item: key grabber
+COLOR_KEYGRABBER_TITLES '1 1 1'
+ALPHA_KEYGRABBER_TITLES 1
+COLOR_KEYGRABBER_KEYS '1 1 1'
+ALPHA_KEYGRABBER_KEYS 0.7
+
// item: list box
COLOR_LISTBOX_SELECTED '0 0 1'
ALPHA_LISTBOX_SELECTED 0.5
+COLOR_LISTBOX_WAITING '1 0 0'
+ALPHA_LISTBOX_WAITING 0.5
// item: map list
COLOR_MAPLIST_TITLE '1 1 1'
@@ -109,6 +118,10 @@
// uses "colorbutton" images
// uses "color" images
+// item: player model
+COLOR_MODELTITLE '1 1 1'
+ALPHA_MODELTITLE 1
+
// item: player name editor
// uses "charmap" images
// uses "charmapbutton" images
Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt 2008-01-31 09:20:40 UTC (rev 3322)
@@ -36,6 +36,7 @@
ALPHA_BACKGROUND_INGAME 0
ALPHA_DISABLED 0.2
ALPHA_BEHIND 1
+ALPHA_TEXT 0.7
// item: button
// uses button.tga
@@ -90,9 +91,17 @@
COLOR_INPUTBOX_F '1 1 1'
MARGIN_INPUTBOX 0.02
+// item: key grabber
+COLOR_KEYGRABBER_TITLES '1 1 1'
+ALPHA_KEYGRABBER_TITLES 1
+COLOR_KEYGRABBER_KEYS '1 1 1'
+ALPHA_KEYGRABBER_KEYS 0.7
+
// item: list box
COLOR_LISTBOX_SELECTED '0 0 0'
ALPHA_LISTBOX_SELECTED 1
+COLOR_LISTBOX_WAITING '1 0 0'
+ALPHA_LISTBOX_WAITING 0.5
// item: map list
COLOR_MAPLIST_TITLE '1 1 1'
@@ -109,6 +118,10 @@
// uses colorbutton.tga
// uses color.tga
+// item: player model
+COLOR_MODELTITLE '1 1 1'
+ALPHA_MODELTITLE 1
+
// item: player name editor
// uses charmap.tga
// uses charmapbutton.tga
Modified: trunk/data/qcsrc/menu/nexuiz/button.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/button.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/button.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -8,6 +8,7 @@
ATTRIB(NexuizButton, colorC, vector, SKINCOLOR_BUTTON_C)
ATTRIB(NexuizButton, colorF, vector, SKINCOLOR_BUTTON_F)
ATTRIB(NexuizButton, colorD, vector, SKINCOLOR_BUTTON_D)
+ ATTRIB(NexuizButton, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizButton, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizButton)
entity makeNexuizButton(string theText, vector theColor);
Modified: trunk/data/qcsrc/menu/nexuiz/checkbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/checkbox.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/checkbox.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -19,6 +19,7 @@
METHOD(NexuizCheckBox, loadCvars, void(entity))
METHOD(NexuizCheckBox, saveCvars, void(entity))
+ ATTRIB(NexuizCheckBox, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizCheckBox, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizCheckBox)
entity makeNexuizCheckBox(float, string, string);
Modified: trunk/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/checkbox_slider_invalid.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -11,6 +11,7 @@
ATTRIB(NexuizSliderCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F)
ATTRIB(NexuizSliderCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D)
+ ATTRIB(NexuizSliderCheckBox, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizSliderCheckBox, disabledAlpha, float, SKINALPHA_DISABLED)
ATTRIB(NexuizSliderCheckBox, controlledSlider, entity, NULL)
Modified: trunk/data/qcsrc/menu/nexuiz/colorbutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/colorbutton.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/colorbutton.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -14,8 +14,6 @@
ATTRIB(NexuizColorButton, cvarValueFloat, float, 0)
METHOD(NexuizColorButton, loadCvars, void(entity))
METHOD(NexuizColorButton, saveCvars, void(entity))
-
- ATTRIB(NexuizColorButton, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizColorButton)
entity makeNexuizColorButton(float, float, float);
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/crosshairbutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/crosshairbutton.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/crosshairbutton.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -12,8 +12,6 @@
ATTRIB(NexuizCrosshairButton, cvarValueFloat, float, 0)
METHOD(NexuizCrosshairButton, loadCvars, void(entity))
METHOD(NexuizCrosshairButton, saveCvars, void(entity))
-
- ATTRIB(NexuizCrosshairButton, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizCrosshairButton)
entity makeNexuizCrosshairButton(float, float);
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/dialog.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/dialog.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -23,6 +23,8 @@
ATTRIB(NexuizDialog, closeButtonImage, string, SKINGFX_CLOSEBUTTON)
ATTRIB(NexuizDialog, zoomedOutTitleBarPosition, float, SKINHEIGHT_ZOOMEDTITLE * 0.5 - 0.5)
ATTRIB(NexuizDialog, zoomedOutTitleBar, float, SKINHEIGHT_ZOOMEDTITLE != 0)
+
+ ATTRIB(NexuizDialog, alpha, float, SKINALPHA_TEXT)
ENDCLASS(NexuizDialog)
#endif
Modified: trunk/data/qcsrc/menu/nexuiz/gametypebutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/gametypebutton.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/gametypebutton.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -15,6 +15,7 @@
METHOD(NexuizGametypeButton, loadCvars, void(entity))
METHOD(NexuizGametypeButton, saveCvars, void(entity))
+ ATTRIB(NexuizGametypeButton, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizGametypeButton, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizGametypeButton)
entity makeNexuizGametypeButton(float, string, string);
Modified: trunk/data/qcsrc/menu/nexuiz/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/inputbox.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/inputbox.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -12,6 +12,8 @@
ATTRIB(NexuizInputBox, color, vector, SKINCOLOR_INPUTBOX_N)
ATTRIB(NexuizInputBox, colorF, vector, SKINCOLOR_INPUTBOX_F)
+ ATTRIB(NexuizInputBox, alpha, float, SKINALPHA_TEXT)
+
ATTRIB(NexuizInputBox, cvarName, string, string_null)
METHOD(NexuizInputBox, loadCvars, void(entity))
METHOD(NexuizInputBox, saveCvars, void(entity))
Modified: trunk/data/qcsrc/menu/nexuiz/keybinder.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/keybinder.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/keybinder.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -268,7 +268,8 @@
if(func == "")
{
theAlpha = 1;
- theColor = '1 1 1';
+ theColor = SKINCOLOR_KEYGRABBER_TITLES;
+ theAlpha = SKINALPHA_KEYGRABBER_TITLES;
extraMargin = 0;
}
else
@@ -276,12 +277,12 @@
if(isSelected)
{
if(keyGrabber == me)
- draw_Fill('0 0 0', '1 1 0', '1 0 0', 0.5);
+ draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_WAITING, SKINALPHA_LISTBOX_WAITING);
else
- draw_Fill('0 0 0', '1 1 0', '0 0 1', 0.5);
+ draw_Fill('0 0 0', '1 1 0', SKINCOLOR_LISTBOX_SELECTED, SKINALPHA_LISTBOX_SELECTED);
}
- theAlpha = 0.7;
- theColor = '1 1 1';
+ theAlpha = SKINALPHA_KEYGRABBER_KEYS;
+ theColor = SKINCOLOR_KEYGRABBER_KEYS;
extraMargin = me.realFontSize_x * 0.5;
}
@@ -293,7 +294,7 @@
descr = s;
if(cvar_string(strcat(s, "_press")) == "")
if(cvar_string(strcat(s, "_release")) == "")
- theAlpha *= 0.5;
+ theAlpha *= SKINALPHA_DISABLED;
}
draw_Text(me.realUpperMargin * eY + extraMargin * eX, descr, me.realFontSize, theColor, theAlpha, 0);
Modified: trunk/data/qcsrc/menu/nexuiz/playermodel.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/playermodel.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/playermodel.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -180,7 +180,7 @@
me.src = string_null;
// draw text on the image, handle \n in the description
- draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), '1 1 1', 1, FALSE);
+ draw_CenterText('0.5 0 0', me.currentModelTitle, me.realFontSize * (me.titleFontSize / me.fontSize), SKINCOLOR_MODELTITLE, SKINALPHA_MODELTITLE, FALSE);
o = '0.5 1 0' - eY * me.realFontSize_y * ((n = tokenizebyseparator(me.currentModelDescription, "\n")) + 0.5);
for(i = 0; i < n; ++i)
Modified: trunk/data/qcsrc/menu/nexuiz/radiobutton.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/radiobutton.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/radiobutton.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -15,6 +15,7 @@
METHOD(NexuizRadioButton, loadCvars, void(entity))
METHOD(NexuizRadioButton, saveCvars, void(entity))
+ ATTRIB(NexuizRadioButton, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizRadioButton, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizRadioButton)
entity makeNexuizRadioButton(float, string, string, string);
Modified: trunk/data/qcsrc/menu/nexuiz/slider.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/slider.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/slider.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -17,6 +17,7 @@
METHOD(NexuizSlider, loadCvars, void(entity))
METHOD(NexuizSlider, saveCvars, void(entity))
+ ATTRIB(NexuizSlider, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizSlider, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizSlider)
entity makeNexuizSlider(float, float, float, string);
Modified: trunk/data/qcsrc/menu/nexuiz/textlabel.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/textlabel.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/textlabel.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -3,6 +3,7 @@
METHOD(NexuizTextLabel, configureNexuizTextLabel, void(entity, float, string))
METHOD(NexuizTextLabel, draw, void(entity))
ATTRIB(NexuizTextLabel, fontSize, float, SKINFONTSIZE_NORMAL)
+ ATTRIB(NexuizTextLabel, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizTextLabel, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizTextLabel)
entity makeNexuizTextLabel(float theAlign, string theText);
Modified: trunk/data/qcsrc/menu/nexuiz/textslider.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/textslider.c 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/nexuiz/textslider.c 2008-01-31 09:20:40 UTC (rev 3322)
@@ -18,6 +18,7 @@
METHOD(NexuizTextSlider, loadCvars, void(entity))
METHOD(NexuizTextSlider, saveCvars, void(entity))
+ ATTRIB(NexuizTextSlider, alpha, float, SKINALPHA_TEXT)
ATTRIB(NexuizTextSlider, disabledAlpha, float, SKINALPHA_DISABLED)
ENDCLASS(NexuizTextSlider)
entity makeNexuizTextSlider(string); // note: you still need to call addValue and configureNexuizTextSliderValues!
Modified: trunk/data/qcsrc/menu/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu/skin-customizables.inc 2008-01-30 22:42:03 UTC (rev 3321)
+++ trunk/data/qcsrc/menu/skin-customizables.inc 2008-01-31 09:20:40 UTC (rev 3322)
@@ -33,7 +33,7 @@
// font sizes (used for everything)
SKINFLOAT(FONTSIZE_NORMAL, 12);
SKINFLOAT(HEIGHT_NORMAL, 1.5);
- SKINFLOAT(FONTSIZE_TITLE, 24);
+ SKINFLOAT(FONTSIZE_TITLE, 16);
SKINFLOAT(HEIGHT_TITLE, 1.5);
SKINFLOAT(HEIGHT_ZOOMEDTITLE, -1);
@@ -65,9 +65,10 @@
// general
SKINSTRING(GFX_BACKGROUND, "background");
SKINSTRING(GFX_BACKGROUND_INGAME, "background_ingame");
- SKINFLOAT(ALPHA_BACKGROUND_INGAME, 0);
+ SKINFLOAT(ALPHA_BACKGROUND_INGAME, 0.7);
SKINFLOAT(ALPHA_DISABLED, 0.2);
SKINFLOAT(ALPHA_BEHIND, 0.5);
+ SKINFLOAT(ALPHA_TEXT, 0.7);
// item: button
SKINSTRING(GFX_BUTTON, "button");
@@ -122,9 +123,17 @@
SKINVECTOR(COLOR_INPUTBOX_F, '1 1 1');
SKINFLOAT(MARGIN_INPUTBOX, 0.02);
+ // item: key grabber
+ SKINVECTOR(COLOR_KEYGRABBER_TITLES, '1 1 1');
+ SKINFLOAT(ALPHA_KEYGRABBER_TITLES, 1);
+ SKINVECTOR(COLOR_KEYGRABBER_KEYS, '1 1 1');
+ SKINFLOAT(ALPHA_KEYGRABBER_KEYS, 0.7);
+
// item: list box
SKINVECTOR(COLOR_LISTBOX_SELECTED, '0 0 1');
SKINFLOAT(ALPHA_LISTBOX_SELECTED, 0.5);
+ SKINVECTOR(COLOR_LISTBOX_WAITING, '1 0 0');
+ SKINFLOAT(ALPHA_LISTBOX_WAITING, 0.5);
// item: map list
SKINVECTOR(COLOR_MAPLIST_TITLE, '1 1 1');
@@ -141,6 +150,10 @@
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");
More information about the nexuiz-commits
mailing list