r2944 - in trunk/data/qcsrc/menu-div0test: . item nexuiz
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Nov 14 05:06:34 EST 2007
Author: div0
Date: 2007-11-14 05:06:21 -0500 (Wed, 14 Nov 2007)
New Revision: 2944
Added:
trunk/data/qcsrc/menu-div0test/basecolorbutton_c.tga
trunk/data/qcsrc/menu-div0test/basecolorbutton_f.tga
trunk/data/qcsrc/menu-div0test/basecolorbutton_n.tga
trunk/data/qcsrc/menu-div0test/color.tga
Removed:
trunk/data/qcsrc/menu-div0test/color0.tga
trunk/data/qcsrc/menu-div0test/color1.tga
trunk/data/qcsrc/menu-div0test/color10.tga
trunk/data/qcsrc/menu-div0test/color11.tga
trunk/data/qcsrc/menu-div0test/color12.tga
trunk/data/qcsrc/menu-div0test/color13.tga
trunk/data/qcsrc/menu-div0test/color14.tga
trunk/data/qcsrc/menu-div0test/color2.tga
trunk/data/qcsrc/menu-div0test/color3.tga
trunk/data/qcsrc/menu-div0test/color4.tga
trunk/data/qcsrc/menu-div0test/color5.tga
trunk/data/qcsrc/menu-div0test/color6.tga
trunk/data/qcsrc/menu-div0test/color7.tga
trunk/data/qcsrc/menu-div0test/color8.tga
trunk/data/qcsrc/menu-div0test/color9.tga
Modified:
trunk/data/qcsrc/menu-div0test/item/dialog.c
trunk/data/qcsrc/menu-div0test/nexuiz/colorbutton.c
trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
trunk/data/qcsrc/menu-div0test/skin.qh
Log:
color buttons
Added: trunk/data/qcsrc/menu-div0test/basecolorbutton_c.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/qcsrc/menu-div0test/basecolorbutton_c.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/qcsrc/menu-div0test/basecolorbutton_f.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/qcsrc/menu-div0test/basecolorbutton_f.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/qcsrc/menu-div0test/basecolorbutton_n.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/qcsrc/menu-div0test/basecolorbutton_n.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/qcsrc/menu-div0test/color.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/qcsrc/menu-div0test/color.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/data/qcsrc/menu-div0test/color0.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color1.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color10.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color11.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color12.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color13.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color14.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color2.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color3.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color4.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color5.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color6.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color7.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color8.tga
===================================================================
(Binary files differ)
Deleted: trunk/data/qcsrc/menu-div0test/color9.tga
===================================================================
(Binary files differ)
Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-14 00:37:29 UTC (rev 2943)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c 2007-11-14 10:06:21 UTC (rev 2944)
@@ -19,9 +19,10 @@
METHOD(Dialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
METHOD(Dialog, keyDown, float(entity, float, float, float))
METHOD(Dialog, close, void(entity))
- METHOD(Dialog, addItemSimple, void(entity, float, float, float, float, entity))
+ METHOD(Dialog, addItemSimple, void(entity, float, float, float, float, entity, vector))
METHOD(Dialog, TD, void(entity, float, float, entity))
+ METHOD(Dialog, TDNoMargin, void(entity, float, float, entity, vector))
METHOD(Dialog, TDempty, void(entity, float))
METHOD(Dialog, setFirstColumn, void(entity, float))
METHOD(Dialog, TR, void(entity))
@@ -70,13 +71,17 @@
{
}
-void addItemSimpleDialog(entity me, float row, float col, float rowspan, float colspan, entity e)
+void addItemSimpleDialog(entity me, float row, float col, float rowspan, float colspan, entity e, vector v)
{
//print(vtos(me.itemSpacing), " ", vtos(me.itemSize), "\n");
- me.addItem(me, e,
- me.itemOrigin + eX * ( col * me.itemSpacing_x) + eY * ( row * me.itemSpacing_y),
- me.itemSize + eX * ((colspan - 1) * me.itemSpacing_x) + eY * ((rowspan - 1) * me.itemSpacing_y),
- 1);
+ vector o, s;
+ o = me.itemOrigin + eX * ( col * me.itemSpacing_x) + eY * ( row * me.itemSpacing_y);
+ s = me.itemSize + eX * ((colspan - 1) * me.itemSpacing_x) + eY * ((rowspan - 1) * me.itemSpacing_y);
+ o_x -= 0.5 * (me.itemSpacing_x - me.itemSize_x) * v_x;
+ s_x += (me.itemSpacing_x - me.itemSize_x) * v_x;
+ o_y -= 0.5 * (me.itemSpacing_y - me.itemSize_y) * v_y;
+ s_y += (me.itemSpacing_y - me.itemSize_y) * v_y;
+ me.addItem(me, e, o, s, 1);
}
void gotoXYDialog(entity me, float row, float col)
@@ -93,10 +98,16 @@
void TDDialog(entity me, float rowspan, float colspan, entity e)
{
- me.addItemSimple(me, me.currentRow, me.currentColumn, rowspan, colspan, e);
+ me.addItemSimple(me, me.currentRow, me.currentColumn, rowspan, colspan, e, '0 0 0');
me.currentColumn += colspan;
}
+void TDNoMarginDialog(entity me, float rowspan, float colspan, entity e, vector v)
+{
+ me.addItemSimple(me, me.currentRow, me.currentColumn, rowspan, colspan, e, v);
+ me.currentColumn += colspan;
+}
+
void setFirstColumnDialog(entity me, float col)
{
me.firstColumn = col;
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/colorbutton.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/colorbutton.c 2007-11-14 00:37:29 UTC (rev 2943)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/colorbutton.c 2007-11-14 10:06:21 UTC (rev 2944)
@@ -2,6 +2,7 @@
CLASS(NexuizColorButton) EXTENDS(RadioButton)
METHOD(NexuizColorButton, configureNexuizColorButton, void(entity, float, float, float))
METHOD(NexuizColorButton, setChecked, void(entity, float))
+ METHOD(NexuizColorButton, draw, void(entity))
ATTRIB(NexuizColorButton, fontSize, float, SKINFONTSIZE_NORMAL)
ATTRIB(NexuizColorButton, image, string, SKINGFX_COLORBUTTON)
ATTRIB(NexuizColorButton, image2, string, SKINGFX_COLORBUTTON_COLOR)
@@ -33,7 +34,7 @@
me.loadCvars(me);
me.configureRadioButton(me, string_null, me.fontSize, me.image, theGroup, 0);
me.srcMulti = 1;
- me.src2 = strzone(strcat(me.image2, ftos(me.cvarValueFloat)));
+ me.src2 = me.image2;
}
void setCheckedNexuizColorButton(entity me, float val)
{
@@ -61,4 +62,9 @@
}
// TODO on an apply button, read _cl_color and execute the color command for it
}
+void drawNexuizColorButton(entity me)
+{
+ me.color2 = colormapPaletteColor(me.cvarValueFloat, me.cvarPart);
+ drawCheckBox(me);
+}
#endif
Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c 2007-11-14 00:37:29 UTC (rev 2943)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c 2007-11-14 10:06:21 UTC (rev 2944)
@@ -20,19 +20,20 @@
void fillNexuizPlayerSettingsTab(entity me)
{
entity e;
- float i;
+ float i, n;
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Player Name:"));
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)
- me.TD(me, 1, 2 / 15, e = makeNexuizColorButton(1, 0, i));
+ n = 16 - !cvar("developer");
+ for(i = 0; i < n; ++i)
+ me.TDNoMargin(me, 1, 2 / n, e = makeNexuizColorButton(1, 0, i), '1 0 0');
me.TR(me);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Pants Color:"));
- for(i = 0; i < 15; ++i)
- me.TD(me, 1, 2 / 15, e = makeNexuizColorButton(2, 1, i));
+ for(i = 0; i < n; ++i)
+ me.TDNoMargin(me, 1, 2 / n, e = makeNexuizColorButton(2, 1, i), '1 0 0');
me.gotoXY(me, 0, 3.5); me.setFirstColumn(me, me.currentColumn);
me.TD(me, 1, 1, e = makeNexuizTextLabel(0, "Field of View:"));
Modified: trunk/data/qcsrc/menu-div0test/skin.qh
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin.qh 2007-11-14 00:37:29 UTC (rev 2943)
+++ trunk/data/qcsrc/menu-div0test/skin.qh 2007-11-14 10:06:21 UTC (rev 2944)
@@ -2,7 +2,7 @@
const float SKINHEIGHT_NORMAL = 1.5;
const float SKINHEIGHT_NORMAL_WITHSPACING = 2;
-const float SKINFONTSIZE_TITLE = 14;
+const float SKINFONTSIZE_TITLE = 24;
const float SKINHEIGHT_TITLE = 1.5;
const string SKINGFX_BUTTON = "qcsrc/menu-div0test/basebutton";
@@ -45,7 +45,7 @@
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 = "qcsrc/menu-div0test/basecolorbutton";
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';
More information about the nexuiz-commits
mailing list