r2939 - in trunk/data/qcsrc/menu-div0test: . item nexuiz

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Nov 10 18:52:09 EST 2007


Author: div0
Date: 2007-11-10 18:52:08 -0500 (Sat, 10 Nov 2007)
New Revision: 2939

Modified:
   trunk/data/qcsrc/menu-div0test/item/button.c
   trunk/data/qcsrc/menu-div0test/item/image.c
   trunk/data/qcsrc/menu-div0test/item/inputbox.c
   trunk/data/qcsrc/menu-div0test/item/listbox.c
   trunk/data/qcsrc/menu-div0test/item/slider.c
   trunk/data/qcsrc/menu-div0test/nexuiz/button.c
   trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
   trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c
   trunk/data/qcsrc/menu-div0test/nexuiz/listbox.c
   trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c
   trunk/data/qcsrc/menu-div0test/nexuiz/slider.c
   trunk/data/qcsrc/menu-div0test/nexuiz/tabcontroller.c
   trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c
   trunk/data/qcsrc/menu-div0test/skin.qh
Log:
expanded skin.qh; made most items support colors in skin.qh


Modified: trunk/data/qcsrc/menu-div0test/item/button.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/button.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/item/button.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -21,6 +21,10 @@
 	ATTRIB(Button, disabled, float, 0)
 	ATTRIB(Button, forcePressed, float, 0)
 	ATTRIB(Button, color, vector, '1 1 1')
+	ATTRIB(Button, colorC, vector, '1 1 1')
+	ATTRIB(Button, colorF, vector, '1 1 1')
+	ATTRIB(Button, colorD, vector, '1 1 1')
+	ATTRIB(Button, color2, vector, '1 1 1')
 
 	ATTRIB(Button, origin, vector, '0 0 0')
 	ATTRIB(Button, size, vector, '0 0 0')
@@ -96,11 +100,11 @@
 			bOrigin = '0 0 0';
 			bSize = '1 1 0';
 			if(me.disabled)
-				draw_ButtonPicture(bOrigin, strcat(me.src, "_d", me.srcSuffix), bSize, '1 1 1', 1);
+				draw_ButtonPicture(bOrigin, strcat(me.src, "_d", me.srcSuffix), bSize, me.colorD, 1);
 			else if(me.forcePressed || me.pressed || me.clickTime > 0)
-				draw_ButtonPicture(bOrigin, strcat(me.src, "_c", me.srcSuffix), bSize, me.color, 1);
+				draw_ButtonPicture(bOrigin, strcat(me.src, "_c", me.srcSuffix), bSize, me.colorC, 1);
 			else if(me.focused)
-				draw_ButtonPicture(bOrigin, strcat(me.src, "_f", me.srcSuffix), bSize, me.color, 1);
+				draw_ButtonPicture(bOrigin, strcat(me.src, "_f", me.srcSuffix), bSize, me.colorF, 1);
 			else
 				draw_ButtonPicture(bOrigin, strcat(me.src, "_n", me.srcSuffix), bSize, me.color, 1);
 		}
@@ -117,11 +121,11 @@
 				bSize = me.realFontSize;
 			}
 			if(me.disabled)
-				draw_Picture(bOrigin, strcat(me.src, "_d", me.srcSuffix), bSize, '1 1 1', 1);
+				draw_Picture(bOrigin, strcat(me.src, "_d", me.srcSuffix), bSize, me.colorD, 1);
 			else if(me.forcePressed || me.pressed || me.clickTime > 0)
-				draw_Picture(bOrigin, strcat(me.src, "_c", me.srcSuffix), bSize, me.color, 1);
+				draw_Picture(bOrigin, strcat(me.src, "_c", me.srcSuffix), bSize, me.colorC, 1);
 			else if(me.focused)
-				draw_Picture(bOrigin, strcat(me.src, "_f", me.srcSuffix), bSize, me.color, 1);
+				draw_Picture(bOrigin, strcat(me.src, "_f", me.srcSuffix), bSize, me.colorF, 1);
 			else
 				draw_Picture(bOrigin, strcat(me.src, "_n", me.srcSuffix), bSize, me.color, 1);
 		}
@@ -130,7 +134,7 @@
 	{
 		bOrigin = me.keepspaceLeft * eX;
 		bSize = eY + eX * (1 - me.keepspaceLeft);
-		draw_Picture(bOrigin, me.src2, bSize, me.color, 1);
+		draw_Picture(bOrigin, me.src2, bSize, me.color2, 1);
 	}
 	drawLabel(me);
 

Modified: trunk/data/qcsrc/menu-div0test/item/image.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/image.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/item/image.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -4,6 +4,7 @@
 	METHOD(Image, draw, void(entity))
 	METHOD(Image, toString, string(entity))
 	ATTRIB(Image, src, string, string_null)
+	ATTRIB(Image, color, vector, '1 1 1')
 ENDCLASS(Image)
 #endif
 
@@ -18,6 +19,6 @@
 }
 void drawImage(entity me)
 {
-	draw_Picture('0 0 0', me.src, '1 1 0', '1 1 1', 1);
+	draw_Picture('0 0 0', me.src, '1 1 0', me.color, 1);
 };
 #endif

Modified: trunk/data/qcsrc/menu-div0test/item/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/inputbox.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/item/inputbox.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -19,6 +19,8 @@
 	ATTRIB(InputBox, dragScrollPos, vector, '0 0 0')
 	ATTRIB(InputBox, pressed, float, 0)
 	ATTRIB(InputBox, editColorCodes, float, 1)
+	ATTRIB(InputBox, color, vector, '1 1 1')
+	ATTRIB(InputBox, colorF, vector, '1 1 1')
 ENDCLASS(InputBox)
 #endif
 
@@ -115,9 +117,9 @@
 	if(me.src)
 	{
 		if(me.focused)
-			draw_ButtonPicture('0 0 0', strcat(me.src, "_f"), '1 1 0', '1 1 1', 1);
+			draw_ButtonPicture('0 0 0', strcat(me.src, "_f"), '1 1 0', me.colorF, 1);
 		else
-			draw_ButtonPicture('0 0 0', strcat(me.src, "_n"), '1 1 0', '1 1 1', 1);
+			draw_ButtonPicture('0 0 0', strcat(me.src, "_n"), '1 1 0', me.color, 1);
 	}
 
 	me.cursorPos = bound(0, me.cursorPos, strlen(me.text));
@@ -178,7 +180,7 @@
 						case 9: theColor = '0.5 0.5 0.5'; theAlpha = 1; break;
 					}
 					theColor = theColor * (1 - brightness) + brightness * '1 1 1';
-					draw_Fill(p, eX * w + eY * me.realFontSize_y, '0 0 0', 0.5);
+					draw_Fill(p, eX * w + eY * me.realFontSize_y, '1 1 1', 0.5);
 					draw_Text(p, strcat(ch, ch2), me.realFontSize, theColor, theAlpha, 0);
 					draw_Text(p, strcat(ch, ch2), me.realFontSize, theColor, theAlpha, 0);
 				}

Modified: trunk/data/qcsrc/menu-div0test/item/listbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/listbox.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/item/listbox.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -23,6 +23,10 @@
 	ATTRIB(ListBox, dragScrollPos, vector, '0 0 0')
 
 	ATTRIB(ListBox, src, string, string_null) // scrollbar
+	ATTRIB(ListBox, color, vector, '1 1 1')
+	ATTRIB(ListBox, color2, vector, '1 1 1')
+	ATTRIB(ListBox, colorC, vector, '1 1 1')
+	ATTRIB(ListBox, colorF, vector, '1 1 1')
 	ATTRIB(ListBox, tolerance, vector, '0 0 0') // drag tolerance
 	ATTRIB(ListBox, scrollbarWidth, float, 0) // pixels
 	ATTRIB(ListBox, nItems, float, 42)
@@ -218,18 +222,18 @@
 	if(me.pressed == 2)
 		me.mouseDrag(me, me.dragScrollPos); // simulate mouseDrag event
 	me.updateControlTopBottom(me);
-	draw_VertButtonPicture(eX * (1 - me.controlWidth), strcat(me.src, "_s"), eX * me.controlWidth + eY, '1 1 1', 1);
+	draw_VertButtonPicture(eX * (1 - me.controlWidth), strcat(me.src, "_s"), eX * me.controlWidth + eY, me.color2, 1);
 	if(me.nItems * me.itemHeight > 1)
 	{
 		vector o, s;
 		o = eX * (1 - me.controlWidth) + eY * me.controlTop;
 		s = eX * me.controlWidth + eY * (me.controlBottom - me.controlTop);
 		if(me.pressed == 1)
-			draw_VertButtonPicture(o, strcat(me.src, "_c"), s, '1 1 1', 1);
+			draw_VertButtonPicture(o, strcat(me.src, "_c"), s, me.colorC, 1);
 		else if(me.focused)
-			draw_VertButtonPicture(o, strcat(me.src, "_f"), s, '1 1 1', 1);
+			draw_VertButtonPicture(o, strcat(me.src, "_f"), s, me.colorF, 1);
 		else
-			draw_VertButtonPicture(o, strcat(me.src, "_n"), s, '1 1 1', 1);
+			draw_VertButtonPicture(o, strcat(me.src, "_n"), s, me.color, 1);
 	}
 	draw_SetClip();
 	oldshift = draw_shift;

Modified: trunk/data/qcsrc/menu-div0test/item/slider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/slider.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/item/slider.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -30,6 +30,11 @@
 	ATTRIB(Slider, previousValue, float, 0)
 	ATTRIB(Slider, tolerance, vector, '0 0 0')
 	ATTRIB(Slider, disabled, float, 0)
+	ATTRIB(Slider, color, vector, '1 1 1')
+	ATTRIB(Slider, color2, vector, '1 1 1')
+	ATTRIB(Slider, colorD, vector, '1 1 1')
+	ATTRIB(Slider, colorC, vector, '1 1 1')
+	ATTRIB(Slider, colorF, vector, '1 1 1')
 ENDCLASS(Slider)
 #endif
 
@@ -193,18 +198,18 @@
 	me.focusable = !me.disabled;
 	if(me.disabled)
 		draw_alpha *= 0.5;
-	draw_ButtonPicture('0 0 0', strcat(me.src, "_s"), eX * (1 - me.textSpace) + eY, '1 1 1', 1);
+	draw_ButtonPicture('0 0 0', strcat(me.src, "_s"), eX * (1 - me.textSpace) + eY, me.color2, 1);
 	if(me.value == median(me.valueMin, me.value, me.valueMax))
 	{
 		controlLeft = (me.value - me.valueMin) / (me.valueMax - me.valueMin) * (1 - me.textSpace - me.controlWidth);
 		if(me.disabled)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_d"), eX * me.controlWidth + eY, '1 1 1', 1);
+			draw_Picture(eX * controlLeft, strcat(me.src, "_d"), eX * me.controlWidth + eY, me.colorD, 1);
 		else if(me.pressed)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_c"), eX * me.controlWidth + eY, '1 1 1', 1);
+			draw_Picture(eX * controlLeft, strcat(me.src, "_c"), eX * me.controlWidth + eY, me.colorC, 1);
 		else if(me.focused)
-			draw_Picture(eX * controlLeft, strcat(me.src, "_f"), eX * me.controlWidth + eY, '1 1 1', 1);
+			draw_Picture(eX * controlLeft, strcat(me.src, "_f"), eX * me.controlWidth + eY, me.colorF, 1);
 		else
-			draw_Picture(eX * controlLeft, strcat(me.src, "_n"), eX * me.controlWidth + eY, '1 1 1', 1);
+			draw_Picture(eX * controlLeft, strcat(me.src, "_n"), eX * me.controlWidth + eY, me.color, 1);
 	}
 	me.setText(me, me.valueToText(me, me.value));
 	drawLabel(me);

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/button.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/button.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/button.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -4,6 +4,10 @@
 	ATTRIB(NexuizButton, fontSize, float, SKINFONTSIZE_NORMAL)
 	ATTRIB(NexuizButton, image, string, SKINGFX_BUTTON)
 	ATTRIB(NexuizButton, grayImage, string, SKINGFX_BUTTON_GRAY)
+	ATTRIB(NexuizButton, color, vector, SKINCOLOR_BUTTON_N)
+	ATTRIB(NexuizButton, colorC, vector, SKINCOLOR_BUTTON_C)
+	ATTRIB(NexuizButton, colorF, vector, SKINCOLOR_BUTTON_F)
+	ATTRIB(NexuizButton, colorD, vector, SKINCOLOR_BUTTON_D)
 ENDCLASS(NexuizButton)
 entity makeNexuizButton(string theText, vector theColor);
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/checkbox.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -6,6 +6,11 @@
 	ATTRIB(NexuizCheckBox, image, string, SKINGFX_CHECKBOX)
 	ATTRIB(NexuizCheckBox, inverted, float, 0)
 
+	ATTRIB(NexuizCheckBox, color, vector, SKINCOLOR_CHECKBOX_N)
+	ATTRIB(NexuizCheckBox, colorC, vector, SKINCOLOR_CHECKBOX_C)
+	ATTRIB(NexuizCheckBox, colorF, vector, SKINCOLOR_CHECKBOX_F)
+	ATTRIB(NexuizCheckBox, colorD, vector, SKINCOLOR_CHECKBOX_D)
+
 	ATTRIB(NexuizCheckBox, cvarName, string, string_null)
 	METHOD(NexuizCheckBox, loadCvars, void(entity))
 	METHOD(NexuizCheckBox, saveCvars, void(entity))

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -2,7 +2,7 @@
 CLASS(NexuizMultiplayerDialog) EXTENDS(NexuizDialog)
 	METHOD(NexuizMultiplayerDialog, fill, void(entity))
 	ATTRIB(NexuizMultiplayerDialog, title, string, "Multiplayer")
-	ATTRIB(NexuizMultiplayerDialog, color, vector, '0.5 0.5 1')
+	ATTRIB(NexuizMultiplayerDialog, color, vector, SKINCOLOR_DIALOG_MULTIPLAYER)
 	ATTRIB(NexuizMultiplayerDialog, intendedWidth, float, 0.96)
 	ATTRIB(NexuizMultiplayerDialog, rows, float, 24)
 	ATTRIB(NexuizMultiplayerDialog, columns, float, 6)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -24,7 +24,7 @@
 
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Player Name:"));
-		me.TD(me, 1, 2, e = makeNexuizResolutionSlider());
+		me.TD(me, 1, 2, e = makeNexuizInputBox(1, "_cl_name"));
 	me.TR(me);
 		me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Shirt Color:"));
 		for(i = 0; i < 15; ++i)
@@ -76,6 +76,6 @@
 			e.configureNexuizTextSliderValues(e);
 
 	me.gotoXY(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1", COMMANDBUTTON_APPLY));
+		me.TD(me, 1, me.columns, makeNexuizCommandButton("Apply immediately", '0 0 0', "color -1 -1;name $_cl_name", COMMANDBUTTON_APPLY));
 }
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -2,7 +2,7 @@
 CLASS(NexuizSettingsDialog) EXTENDS(NexuizDialog)
 	METHOD(NexuizSettingsDialog, fill, void(entity))
 	ATTRIB(NexuizSettingsDialog, title, string, "Settings")
-	ATTRIB(NexuizSettingsDialog, color, vector, '0.5 0.5 1')
+	ATTRIB(NexuizSettingsDialog, color, vector, SKINCOLOR_DIALOG_SETTINGS)
 	ATTRIB(NexuizSettingsDialog, intendedWidth, float, 0.96)
 	ATTRIB(NexuizSettingsDialog, rows, float, 17)
 	ATTRIB(NexuizSettingsDialog, columns, float, 6)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -3,7 +3,7 @@
 	METHOD(NexuizTeamSelectDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
 	METHOD(NexuizTeamSelectDialog, showNotify, void(entity))
 	ATTRIB(NexuizTeamSelectDialog, title, string, "Team Selection") // ;)
-	ATTRIB(NexuizTeamSelectDialog, color, vector, '1 1 1')
+	ATTRIB(NexuizTeamSelectDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
 	ATTRIB(NexuizTeamSelectDialog, intendedWidth, float, 0.4)
 	ATTRIB(NexuizTeamSelectDialog, rows, float, 5)
 	ATTRIB(NexuizTeamSelectDialog, columns, float, 4)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/inputbox.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -9,6 +9,8 @@
 	ATTRIB(NexuizInputBox, onChangeEntity, entity, NULL)
 	ATTRIB(NexuizInputBox, keepspaceLeft, float, SKINMARGIN_INPUTBOX)
 	ATTRIB(NexuizInputBox, keepspaceRight, float, SKINMARGIN_INPUTBOX)
+	ATTRIB(NexuizInputBox, color, vector, SKINCOLOR_INPUTBOX_N)
+	ATTRIB(NexuizInputBox, colorF, vector, SKINCOLOR_INPUTBOX_F)
 
 	ATTRIB(NexuizInputBox, cvarName, string, string_null)
 	METHOD(NexuizInputBox, loadCvars, void(entity))

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/listbox.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/listbox.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/listbox.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -7,6 +7,9 @@
 	ATTRIB(NexuizListBox, tolerance, vector, SKINTOLERANCE_SLIDER)
 	ATTRIB(NexuizListBox, rowsPerItem, float, 1)
 	METHOD(NexuizListBox, resizeNotify, void(entity, vector, vector, vector, vector))
+	ATTRIB(NexuizListBox, color, vector, SKINCOLOR_SCROLLBAR_N)
+	ATTRIB(NexuizListBox, colorF, vector, SKINCOLOR_SCROLLBAR_F)
+	ATTRIB(NexuizListBox, color2, vector, SKINCOLOR_SCROLLBAR_S)
 ENDCLASS(NexuizListBox)
 entity makeNexuizListBox();
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/radiobutton.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -4,6 +4,10 @@
 	METHOD(NexuizRadioButton, setChecked, void(entity, float))
 	ATTRIB(NexuizRadioButton, fontSize, float, SKINFONTSIZE_NORMAL)
 	ATTRIB(NexuizRadioButton, image, string, SKINGFX_RADIOBUTTON)
+	ATTRIB(NexuizRadioButton, color, vector, SKINCOLOR_RADIOBUTTON_N)
+	ATTRIB(NexuizRadioButton, colorC, vector, SKINCOLOR_RADIOBUTTON_C)
+	ATTRIB(NexuizRadioButton, colorF, vector, SKINCOLOR_RADIOBUTTON_F)
+	ATTRIB(NexuizRadioButton, colorD, vector, SKINCOLOR_RADIOBUTTON_D)
 
 	ATTRIB(NexuizRadioButton, cvarName, string, string_null)
 	ATTRIB(NexuizRadioButton, cvarValue, string, string_null)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/slider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/slider.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/slider.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -7,6 +7,11 @@
 	ATTRIB(NexuizSlider, image, string, SKINGFX_SLIDER)
 	ATTRIB(NexuizSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
 	ATTRIB(NexuizSlider, align, float, 0.5)
+	ATTRIB(NexuizSlider, color, vector, SKINCOLOR_SLIDER_N)
+	ATTRIB(NexuizSlider, colorC, vector, SKINCOLOR_SLIDER_C)
+	ATTRIB(NexuizSlider, colorF, vector, SKINCOLOR_SLIDER_F)
+	ATTRIB(NexuizSlider, colorD, vector, SKINCOLOR_SLIDER_D)
+	ATTRIB(NexuizSlider, color2, vector, SKINCOLOR_SLIDER_S)
 
 	ATTRIB(NexuizSlider, cvarName, string, string_null)
 	METHOD(NexuizSlider, loadCvars, void(entity))

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/tabcontroller.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/tabcontroller.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/tabcontroller.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -29,6 +29,7 @@
 	b = spawnButton();
 	b.configureButton(b, theTitle, me.fontSize, me.image);
 	me.addTab(me, tab, b);
+	// TODO make this real tab buttons (with color parameters, and different gfx)
 	return b;
 }
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/textslider.c	2007-11-10 23:52:08 UTC (rev 2939)
@@ -8,6 +8,11 @@
 	ATTRIB(NexuizTextSlider, image, string, SKINGFX_SLIDER)
 	ATTRIB(NexuizSlider, tolerance, vector, SKINTOLERANCE_SLIDER)
 	ATTRIB(NexuizTextSlider, align, float, 0.5)
+	ATTRIB(NexuizSlider, color, vector, SKINCOLOR_SLIDER_N)
+	ATTRIB(NexuizSlider, colorC, vector, SKINCOLOR_SLIDER_C)
+	ATTRIB(NexuizSlider, colorF, vector, SKINCOLOR_SLIDER_F)
+	ATTRIB(NexuizSlider, colorD, vector, SKINCOLOR_SLIDER_D)
+	ATTRIB(NexuizSlider, color2, vector, SKINCOLOR_SLIDER_S)
 
 	ATTRIB(NexuizTextSlider, cvarName, string, string_null)
 	METHOD(NexuizTextSlider, loadCvars, void(entity))

Modified: trunk/data/qcsrc/menu-div0test/skin.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin.qh	2007-11-10 15:44:57 UTC (rev 2938)
+++ trunk/data/qcsrc/menu-div0test/skin.qh	2007-11-10 23:52:08 UTC (rev 2939)
@@ -1,28 +1,58 @@
+const float SKINFONTSIZE_NORMAL = 12;
+const float SKINHEIGHT_NORMAL = 1.5;
+const float SKINHEIGHT_NORMAL_WITHSPACING = 2;
+
 const float SKINFONTSIZE_TITLE = 14;
 const float SKINHEIGHT_TITLE = 1.5;
-const string SKINGFX_DIALOGBORDER = "qcsrc/menu-div0test/baseborder";
-const string SKINGFX_CLOSEBUTTON = "qcsrc/menu-div0test/baseclosebutton";
+
 const string SKINGFX_BUTTON = "qcsrc/menu-div0test/basebutton";
+const vector SKINCOLOR_BUTTON_N = '1 1 1';
+const vector SKINCOLOR_BUTTON_C = '1 1 1';
+const vector SKINCOLOR_BUTTON_F = '1 1 1';
+const vector SKINCOLOR_BUTTON_D = '1 1 1';
+
 const string SKINGFX_BUTTON_GRAY = "qcsrc/menu-div0test/basebuttongray";
-const string SKINGFX_SLIDER = "qcsrc/menu-div0test/baseslider";
+
 const string SKINGFX_CHECKBOX = "qcsrc/menu-div0test/basecheckbox";
-const string SKINGFX_RADIOBUTTON = "qcsrc/menu-div0test/baseradiobutton";
-const string SKINGFX_COLORBUTTON = "qcsrc/menu-div0test/basebutton";
-const string SKINGFX_COLORBUTTON_COLOR = "qcsrc/menu-div0test/color";
-const string SKINGFX_SCROLLBAR = "qcsrc/menu-div0test/basescrollbar";
-const string SKINGFX_INPUTBOX = "qcsrc/menu-div0test/baseinputbox";
+const vector SKINCOLOR_CHECKBOX_N = '1 1 1';
+const vector SKINCOLOR_CHECKBOX_C = '1 1 1';
+const vector SKINCOLOR_CHECKBOX_F = '1 1 1';
+const vector SKINCOLOR_CHECKBOX_D = '1 1 1';
 
+const string SKINGFX_DIALOGBORDER = "qcsrc/menu-div0test/baseborder";
+const string SKINGFX_CLOSEBUTTON = "qcsrc/menu-div0test/baseclosebutton";
 const float SKINMARGIN_TOP = 8;
 const float SKINMARGIN_LEFT = 8;
 const float SKINMARGIN_COLUMNS = 4;
 const float SKINMARGIN_ROWS = 4;
-const float SKINMARGIN_INPUTBOX = 0.01;
+const vector SKINCOLOR_DIALOG_MULTIPLAYER = '0.7 0.7 1';
+const vector SKINCOLOR_DIALOG_SETTINGS = '0.7 0.7 1';
+const vector SKINCOLOR_DIALOG_TEAMSELECT = '1 1 1';
 
-const float SKINFONTSIZE_NORMAL = 12;
-const float SKINHEIGHT_NORMAL = 1.5;
-const float SKINHEIGHT_NORMAL_WITHSPACING = 2;
+const string SKINGFX_SLIDER = "qcsrc/menu-div0test/baseslider";
+const vector SKINCOLOR_SLIDER_N = '1 1 1';
+const vector SKINCOLOR_SLIDER_C = '1 1 1';
+const vector SKINCOLOR_SLIDER_F = '1 1 1';
+const vector SKINCOLOR_SLIDER_D = '1 1 1';
+const vector SKINCOLOR_SLIDER_S = '1 1 1';
+const float SKINWIDTH_SLIDERTEXT = 0.333333333333;
+const vector SKINTOLERANCE_SLIDER = '0.2 2 0';
+
+const string SKINGFX_RADIOBUTTON = "qcsrc/menu-div0test/baseradiobutton";
+const vector SKINCOLOR_RADIOBUTTON_N = '1 1 1';
+const vector SKINCOLOR_RADIOBUTTON_C = '1 1 1';
+const vector SKINCOLOR_RADIOBUTTON_F = '1 1 1';
+const vector SKINCOLOR_RADIOBUTTON_D = '1 1 1';
+
+const string SKINGFX_COLORBUTTON = "qcsrc/menu-div0test/basebutton";
+const string SKINGFX_COLORBUTTON_COLOR = "qcsrc/menu-div0test/color";
+const string SKINGFX_SCROLLBAR = "qcsrc/menu-div0test/basescrollbar";
+const vector SKINCOLOR_SCROLLBAR_N = '1 1 1';
+const vector SKINCOLOR_SCROLLBAR_F = '1 1 1';
+const vector SKINCOLOR_SCROLLBAR_S = '1 1 1';
 const float SKINWIDTH_SCROLLBAR = 16;
 
-const float SKINWIDTH_SLIDERTEXT = 0.333333333333;
-
-const vector SKINTOLERANCE_SLIDER = '0.2 2 0';
+const string SKINGFX_INPUTBOX = "qcsrc/menu-div0test/baseinputbox";
+const vector SKINCOLOR_INPUTBOX_N = '1 1 1';
+const vector SKINCOLOR_INPUTBOX_F = '1 0.5 0.5';
+const float SKINMARGIN_INPUTBOX = 0.02;




More information about the nexuiz-commits mailing list