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

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-10-30 11:58:06 -0400 (Tue, 30 Oct 2007)
New Revision: 2871

Added:
   trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c
Modified:
   trunk/data/qcsrc/menu-div0test/classes.c
   trunk/data/qcsrc/menu-div0test/item/dialog.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
Log:
oops... there was a m_goto call in the wrong layer. Fixed.


Modified: trunk/data/qcsrc/menu-div0test/classes.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/classes.c	2007-10-30 15:50:59 UTC (rev 2870)
+++ trunk/data/qcsrc/menu-div0test/classes.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -29,3 +29,4 @@
 #include "nexuiz/radiobutton.c"
 #include "nexuiz/slider_picmip.c"
 #include "nexuiz/nexposee.c"
+#include "nexuiz/rootdialog.c"

Modified: trunk/data/qcsrc/menu-div0test/item/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/item/dialog.c	2007-10-30 15:50:59 UTC (rev 2870)
+++ trunk/data/qcsrc/menu-div0test/item/dialog.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -39,7 +39,6 @@
 
 	// to be customized
 	ATTRIB(Dialog, closable, float, 1)
-	ATTRIB(Dialog, rootDialog, float, 1)
 	ATTRIB(Dialog, title, string, "Form1") // ;)
 	ATTRIB(Dialog, color, vector, '1 0.5 1')
 	ATTRIB(Dialog, intendedWidth, float, 0)
@@ -157,10 +156,6 @@
 	{
 		DialogCloseButton_Click(me, me);
 	}
-	if(me.rootDialog)
-	{
-		m_goto("");
-	}
 }
 
 float keyDownDialog(entity me, float key, float ascii, float shift)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c	2007-10-30 15:50:59 UTC (rev 2870)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -3,7 +3,6 @@
 	// still to be customized by user
 	/*
 	ATTRIB(NexuizDialog, closable, float, 1)
-	ATTRIB(NexuizDialog, rootDialog, float, 1)
 	ATTRIB(NexuizDialog, title, string, "Form1") // ;)
 	ATTRIB(NexuizDialog, color, vector, '1 0.5 1')
 	ATTRIB(NexuizDialog, intendedWidth, float, 0)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-10-30 15:50:59 UTC (rev 2870)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_settings.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -1,7 +1,6 @@
 #ifdef INTERFACE
 CLASS(NexuizSettingsDialog) EXTENDS(NexuizDialog)
 	METHOD(NexuizSettingsDialog, fill, void(entity))
-	ATTRIB(NexuizSettingsDialog, rootDialog, float, 0)
 	ATTRIB(NexuizSettingsDialog, title, string, "Settings")
 	ATTRIB(NexuizSettingsDialog, color, vector, '0.5 0.5 1')
 	ATTRIB(NexuizSettingsDialog, intendedWidth, float, 0.96)

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-10-30 15:50:59 UTC (rev 2870)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_teamselect.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -1,5 +1,5 @@
 #ifdef INTERFACE
-CLASS(NexuizTeamSelectDialog) EXTENDS(NexuizDialog)
+CLASS(NexuizTeamSelectDialog) EXTENDS(NexuizRootDialog)
 	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") // ;)

Added: trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c	                        (rev 0)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/rootdialog.c	2007-10-30 15:58:06 UTC (rev 2871)
@@ -0,0 +1,21 @@
+#ifdef INTERFACE
+CLASS(NexuizRootDialog) EXTENDS(NexuizDialog)
+	// still to be customized by user
+	/*
+	ATTRIB(NexuizDialog, closable, float, 1)
+	ATTRIB(NexuizDialog, title, string, "Form1") // ;)
+	ATTRIB(NexuizDialog, color, vector, '1 0.5 1')
+	ATTRIB(NexuizDialog, intendedWidth, float, 0)
+	ATTRIB(NexuizDialog, rows, float, 3)
+	ATTRIB(NexuizDialog, columns, float, 2)
+	*/
+	METHOD(NexuizRootDialog, close, void(entity))
+ENDCLASS(NexuizRootDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void closeNexuizRootDialog(entity me)
+{
+	m_goto("");
+}
+#endif