From fe33fff12c5430a092aeeea5f1f2bb7fd455f617 Mon Sep 17 00:00:00 2001
From: esteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Sun, 4 Jun 2006 15:13:03 +0000
Subject: [PATCH] demo menu now easier, need to recompile menu.dat still have
 to investigate why the scrollbar does not work and the demo button has to be
 clicked twice

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1497 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/menu/data/demos.menu   | 27 ++++++++++-----
 data/menu/demos.menu        | 69 +++++++++++++++++++++++++------------
 data/menuqc/custom/demos.qm | 34 +++---------------
 3 files changed, 70 insertions(+), 60 deletions(-)

diff --git a/data/menu/data/demos.menu b/data/menu/data/demos.menu
index 2e6c7e6d4..c1c99851b 100644
--- a/data/menu/data/demos.menu
+++ b/data/menu/data/demos.menu
@@ -4,22 +4,31 @@
 
 Item DataContainer Demos
 {
-	Item Data_Container Filename
+	Item DataContainer FileList
 	{
-		Item DataLink_Text Text
+		Item DataLink_Nex_FileList Demos
 		{
-			maxValue	26
-			link		"##up"
+			normal		"dem"
+			selected	"demos/"
 		}
 	}
+	Item Data_Cvar AutoDemo
+	{
+		cvarName	"cl_autodemo"
+		defValue	0
 
-	Item DataContainer FileList
+		[DataLink_OnOffSwitch]
+	}
+
+	Item Data_Cvar AutoDemoFormat
 	{
-		Item DataLink_Nex_FileList Demos
+		cvarName	"cl_autodemo_nameformat"
+		defValue	"%Y-%m-%d_%H-%M"
+
+		Item DataLink_Text Text
 		{
-			normal		"dem"
-			selected	"demos/"
+			link		"##up"
+			maxValue	64
 		}
 	}
 }
-
diff --git a/data/menu/demos.menu b/data/menu/demos.menu
index 7c2a9edbe..4fab57bb2 100644
--- a/data/menu/demos.menu
+++ b/data/menu/demos.menu
@@ -25,35 +25,27 @@ Item Window Demos
 		Item Task_Job SyncCategory
 		{
 			update 	Nex_Demos_SyncData
+			init 	Nex_Demos_SyncData
 		}
 
-		Derive List FileList
+		Item ScrollWindow Scroll
 		{
-			size	'300 340'
-			target	"::Data::Demos::FileList::Demos"
-	
-			action 	Nex_Demos_CopyToFilename
-		}
+			size	'800 450'
 
-		Item Arrangement Filename
-		{
-			flag		[FlagEmbedded]
-			direction	[Nex_DefaultHorzDirection]
-	
-			Derive TextButton Label
-			{
-				normal	"Demo Name :"
-				link	"##next"
-			}
-			Derive EditBox Name
+			Derive List FileList
 			{
-				//size	'260 11'
-				target	"::Data::Demos::Filename::Text"
-	
-				action  Nex_Action_TestOnChange
-				select  Nex_Action_TestOnSelect
+				size	'800 450'
+				target	"::Data::Demos::FileList::Demos"
+		
+				action 	Nex_Demos_Start
 			}
 		}
+		Item VScrollBar Scroller
+		{
+			pos	'100 0'
+			size	'20 450'
+			target	"##prev"
+		}
 	}
 	Item Layout Button
 	{
@@ -68,4 +60,37 @@ Item Window Demos
 			action	Nex_Demos_Start
 		}
 	}
+Ignore {
+	Item Layout Settings
+	{
+		size		'600 801'
+		alignment	[AlignLeft]
+		origin		'195 552'
+		direction	'0 10'
+		
+		Derive Nex_Option_Switch AutoDemo
+		{
+			text	"Record a Demo"
+			target	"Data::Demos::AutoDemo::Switch"
+		}
+		DeriveTemplate Nex_Composition Option_EditBox
+		{
+			DeriveTemplate Nex_Automation_Option_EditBox Automation
+			{}
+			DeriveTemplate TextButton Description
+			{}
+			DeriveTemplate EditBox EditBox
+			{
+				size 	'200 12'
+				action  Nex_Action_TestOnChange
+				select  Nex_Action_TestOnSelect
+			}
+		}
+		Derive Option_EditBox AutoDemoFormat
+		{
+			text	"Demo Name Format"
+			target	"Data::Demos::AutoDemoFormat::Text"
+		}
+	}
+}
 }
diff --git a/data/menuqc/custom/demos.qm b/data/menuqc/custom/demos.qm
index b2b2fbe41..75f471af0 100644
--- a/data/menuqc/custom/demos.qm
+++ b/data/menuqc/custom/demos.qm
@@ -1,41 +1,17 @@
 // Property of Alientrap
 // custom/demos.qm
 
-void() Nex_Demos_CopyToFilename =
-{
-	local entity lItem;
-
-	if( !self._target ) {
-		return;
-	}
-
-	Raise_DataEvent( self._target, ITEM_DATALINK_GET );
-
-	lItem = Menu_GetItem( "::Data::Demos::Filename::Text" );
-	String_EntitySet( lItem, value, self._target.value );
-	Raise_DataEvent( lItem, ITEM_DATALINK_SET );
-};
-
 void() Nex_Demos_Start =
 {
 	local entity lFileList;
-	local entity lFilenameData;
-
 	lFileList = Menu_GetItem( "::Data::Demos::FileList::Demos" );
-	lFilenameData = Menu_GetItem( "::Data::Demos::Filename" );
-
-	cmd( strcat( "playdemo \"", lFileList.selected, lFilenameData.value, ".", lFileList.normal, "\"\n" ) );
-
-	// force the menu to hide
-	m_hide();
-};
 
-void() Nex_Demos_Refresh =
-{
-	local entity lItem;
+	if (lFileList.value) {
+		cmd( strcat( "playdemo \"", lFileList.selected, lFileList.value, ".", lFileList.normal, "\"\n" ) );
 
-	lItem = Menu_GetItem( "::Data::Demos::FileList" );
-	Raise_DataEvent( lItem, ITEM_DATA_SYNC );
+		// force the menu to hide
+		m_hide();
+	}
 };
 
 void() Nex_Demos_SyncData =
-- 
2.39.2