r6043 - in trunk/data/qcsrc/menu: . nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2009-03-03 14:09:41 -0500 (Tue, 03 Mar 2009)
New Revision: 6043

Removed:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_names.c
Modified:
   trunk/data/qcsrc/menu/classes.c
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
   trunk/data/qcsrc/menu/nexuiz/mainwindow.c
Log:
remove a weird empty window


Modified: trunk/data/qcsrc/menu/classes.c
===================================================================
--- trunk/data/qcsrc/menu/classes.c	2009-03-03 19:00:56 UTC (rev 6042)
+++ trunk/data/qcsrc/menu/classes.c	2009-03-03 19:09:41 UTC (rev 6043)
@@ -78,4 +78,3 @@
 #include "nexuiz/colorpicker.c"
 #include "nexuiz/cvarlist.c"
 #include "nexuiz/dialog_settings_misc_cvars.c"
-#include "nexuiz/dialog_multiplayer_playersetup_names.c"

Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-03-03 19:00:56 UTC (rev 6042)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup.c	2009-03-03 19:09:41 UTC (rev 6043)
@@ -28,19 +28,26 @@
 		me.playerNameLabel.alpha = me.playerNameLabelAlpha;
 	drawContainer(me);
 }
+string getPlayerName(entity me)
+{
+	return cvar_string("_cl_name");
+}
 void fillNexuizPlayerSettingsTab(entity me)
 {
 	entity e, pms, sl, eName, e0, box;
 	float i, n;
 
+	eName = spawn();
+	eName.toString = getPlayerName;
+
 	me.TR(me);
 		me.TD(me, 1, 0.5, me.playerNameLabel = makeNexuizTextLabel(0, "Name:"));
 			me.playerNameLabelAlpha = me.playerNameLabel.alpha;
-		me.TD(me, 1, 2.5, eName = makeNexuizTextLabel(0, string_null));
-			eName.textEntity = main.namesDialog;
-			eName.allowCut = 1;
-			eName.allowColors = 1;
-			eName.alpha = 1;
+		me.TD(me, 1, 2.5, e = makeNexuizTextLabel(0, string_null));
+			e.textEntity = eName;
+			e.allowCut = 1;
+			e.allowColors = 1;
+			e.alpha = 1;
 	me.TR(me);
 		me.TD(me, 1, 3.0, box = makeNexuizInputBox(1, "_cl_name"));
 			box.forbiddenCharacters = "\r\n\\\"$"; // don't care, isn't getting saved

Deleted: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_names.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_names.c	2009-03-03 19:00:56 UTC (rev 6042)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_playersetup_names.c	2009-03-03 19:09:41 UTC (rev 6043)
@@ -1,18 +0,0 @@
-#ifdef INTERFACE
-CLASS(NexuizNamesDialog) EXTENDS(NexuizDialog)
-	METHOD(NexuizNamesDialog, toString, string(entity))
-	ATTRIB(NexuizNamesDialog, title, string, "Favorite Names")
-	ATTRIB(NexuizNamesDialog, color, vector, SKINCOLOR_DIALOG_MUTATORS) // FIXME: replace SKINCOLOR_DIALOG_MUTATORS with something else
-	ATTRIB(NexuizNamesDialog, intendedWidth, float, 0.45)
-	ATTRIB(NexuizNamesDialog, rows, float, 5)
-	ATTRIB(NexuizNamesDialog, columns, float, 6)
-	ATTRIB(NexuizNamesDialog, refilterEntity, entity, NULL)
-ENDCLASS(NexuizNamesDialog)
-#endif
-
-#ifdef IMPLEMENTATION
-string toStringNexuizNamesDialog(entity me)
-{
-	return cvar_string("_cl_name");
-}
-#endif

Modified: trunk/data/qcsrc/menu/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/mainwindow.c	2009-03-03 19:00:56 UTC (rev 6042)
+++ trunk/data/qcsrc/menu/nexuiz/mainwindow.c	2009-03-03 19:09:41 UTC (rev 6043)
@@ -3,7 +3,6 @@
 	METHOD(MainWindow, configureMainWindow, void(entity))
 	ATTRIB(MainWindow, mutatorsDialog, entity, NULL)
 	ATTRIB(MainWindow, weaponsDialog, entity, NULL)
-	ATTRIB(MainWindow, namesDialog, entity, NULL)
 	ATTRIB(MainWindow, mapInfoDialog, entity, NULL)
 	ATTRIB(MainWindow, userbindEditDialog, entity, NULL)
 	ATTRIB(MainWindow, winnerDialog, entity, NULL)
@@ -53,10 +52,6 @@
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
-	me.namesDialog = i = spawnNexuizNamesDialog();
-	i.configureDialog(i);
-	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-
 	me.radarDialog = i = spawnNexuizRadarDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);