r2894 - in trunk/data/qcsrc/menu-div0test: . nexuiz

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-11-03 09:39:44 -0400 (Sat, 03 Nov 2007)
New Revision: 2894

Added:
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
Modified:
   trunk/data/qcsrc/menu-div0test/classes.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
   trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
Log:
moved player options menu to multiplayer and added some dummies there


Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c	2007-11-03 13:17:25 UTC (rev 2893)
+++ trunk/data/qcsrc/menu-div0test/classes.c	2007-11-03 13:39:44 UTC (rev 2894)
@@ -22,6 +22,7 @@
 #include "nexuiz/dialog_settings.c"
 #include "nexuiz/dialog_settings_video.c"
 #include "nexuiz/dialog_settings_effects.c"
+#include "nexuiz/dialog_multiplayer.c"
 #include "nexuiz/dialog_settings_player.c"
 #include "nexuiz/tabcontroller.c"
 #include "nexuiz/textlabel.c"

Added: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	                        (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	2007-11-03 13:39:44 UTC (rev 2894)
@@ -0,0 +1,25 @@
+#ifdef INTERFACE
+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, intendedWidth, float, 0.96)
+	ATTRIB(NexuizMultiplayerDialog, rows, float, 17)
+	ATTRIB(NexuizMultiplayerDialog, columns, float, 6)
+ENDCLASS(NexuizMultiplayerDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void fillNexuizMultiplayerDialog(entity me)
+{
+	entity mc;
+	mc = makeNexuizTabController(me.rows - 2);
+	me.TR(me);
+		me.TD(me, 1, 1, mc.makeTabButton(mc, "Serverlist",  makeNexuizPlayerSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, "Player Setup",  makeNexuizPlayerSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, "Server Setup",  makeNexuizPlayerSettingsTab()));
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, me.rows - 2, me.columns, mc);
+}
+#endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-03 13:17:25 UTC (rev 2893)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-11-03 13:39:44 UTC (rev 2894)
@@ -19,7 +19,6 @@
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Video",   makeNexuizVideoSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Effects", makeNexuizEffectsSettingsTab()));
 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Audio",   makeNexuizVideoSettingsTab()));
-		me.TD(me, 1, 1, mc.makeTabButton(mc, "Player",  makeNexuizPlayerSettingsTab()));
 	me.TR(me);
 	me.TR(me);
 		me.TD(me, me.rows - 2, me.columns, mc);

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2007-11-03 13:17:25 UTC (rev 2893)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2007-11-03 13:39:44 UTC (rev 2894)
@@ -29,7 +29,7 @@
 	i.configureImage(i, "gfx/0.tga");
 	n.addItem(n, i, '0.4 0.45 0', '0.2 0.1 0', 1);
 	n.setNexposee(n, i, '0.5 0.5 0', 0.2, 0.5);
-	
+
 	c = spawnInputContainer();
 
 		i = spawnImage();
@@ -67,17 +67,17 @@
 
 	n.addItem(n, c, '0.03 0.06 0', '0.9 0.9 0', 0.5);
 	n.setNexposee(n, c, '0.1 0.2 0', 0.2, 0.5);
-	
+
 	i = spawnNexuizSettingsDialog();
 	i.configureDialog(i);
 	n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
 	n.setNexposee(n, i, '0.95 0.8 0', 0.2, 0.5);
-	
-	i = spawnImage();
-	i.configureImage(i, "gfx/3.tga");
-	n.addItem(n, i, '0.02 0.03 0', '0.9 0.9 0', 1);
+
+	i = spawnNexuizMultiplayerDialog();
+	i.configureDialog(i);
+	n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, 1);
 	n.setNexposee(n, i, '0.99 0.1 0', 0.2, 0.5);
-	
+
 	i = spawnImage();
 	i.configureImage(i, "gfx/4.tga");
 	n.addItem(n, i, '0.01 0.09 0', '0.9 0.9 0', 1);