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

DONOTREPLY at icculus.org DONOTREPLY at icculus.org
Sat Oct 27 14:22:43 EDT 2007


Author: div0
Date: 2007-10-27 14:22:43 -0400 (Sat, 27 Oct 2007)
New Revision: 2858

Added:
   trunk/data/qcsrc/menu-div0test/baseslider_c.tga
   trunk/data/qcsrc/menu-div0test/baseslider_f.tga
   trunk/data/qcsrc/menu-div0test/baseslider_n.tga
   trunk/data/qcsrc/menu-div0test/baseslider_s.tga
Modified:
   trunk/data/qcsrc/menu-div0test/classes.c
   trunk/data/qcsrc/menu-div0test/item/label.c
   trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
Log:
sliders (thanks to Morphed, again)


Added: trunk/data/qcsrc/menu-div0test/baseslider_c.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseslider_c.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/qcsrc/menu-div0test/baseslider_f.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseslider_f.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/qcsrc/menu-div0test/baseslider_n.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseslider_n.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: trunk/data/qcsrc/menu-div0test/baseslider_s.tga
===================================================================
(Binary files differ)


Property changes on: trunk/data/qcsrc/menu-div0test/baseslider_s.tga
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c	2007-10-27 16:25:22 UTC (rev 2857)
+++ trunk/data/qcsrc/menu-div0test/classes.c	2007-10-27 18:22:43 UTC (rev 2858)
@@ -9,4 +9,5 @@
 #include "item/checkbox.c"
 #include "item/radiobutton.c"
 #include "item/borderimage.c"
+#include "item/slider.c"
 #include "nexuiz/mainwindow.c"

Modified: trunk/data/qcsrc/menu-div0test/item/label.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/label.c	2007-10-27 16:25:22 UTC (rev 2857)
+++ trunk/data/qcsrc/menu-div0test/item/label.c	2007-10-27 18:22:43 UTC (rev 2858)
@@ -37,6 +37,7 @@
 }
 void drawLabel(entity me)
 {
-	draw_Text(me.realOrigin, me.text, me.realFontSize, '1 1 1', me.alpha);
+	if(me.text)
+		draw_Text(me.realOrigin, me.text, me.realFontSize, '1 1 1', me.alpha);
 }
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2007-10-27 16:25:22 UTC (rev 2857)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2007-10-27 18:22:43 UTC (rev 2858)
@@ -44,10 +44,15 @@
 		i.configureRadioButton(i, "RadioButton2", 12, "qcsrc/menu-div0test/baseradiobutton", 1, 1);
 		dlg.addItem(dlg, i, '0.5 0.4 0', '0.8 0.1 0', 1);
 
+		i = spawnSlider();
+		i.configureSliderVisuals(i, "", " fps", 12, 0.2, "qcsrc/menu-div0test/baseslider");
+		i.configureSliderValues(i, 1, 50, 200, 1, 1, 20);
+		dlg.addItem(dlg, i, '0.1 0.5 0', '0.8 0.1 0', 1);
+
 		i = spawnCheckBox();
 		i.configureCheckBox(i, "Do not show this dialog again", 12, "qcsrc/menu-div0test/basecheckbox");
 		i.checked = 1;
-		dlg.addItem(dlg, i, '0.1 0.5 0', '0.8 0.1 0', 1);
+		dlg.addItem(dlg, i, '0.1 0.6 0', '0.8 0.1 0', 1);
 
 		i = spawnButton();
 		i.configureButton(i, "Close", 12, "qcsrc/menu-div0test/basebutton");




More information about the nexuiz-commits mailing list