From 2c726452803f8acf16b8a1c83b9e52ae4a448482 Mon Sep 17 00:00:00 2001
From: esteel <esteel@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Mon, 5 Jun 2006 00:05:15 +0000
Subject: [PATCH] Demo menu is much better now. Scrollbar still missing

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@1499 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/menu/campaign.menu |  7 -------
 data/menu/demos.menu    | 22 ++++++----------------
 data/menu/main.menu     |  4 ++--
 3 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/data/menu/campaign.menu b/data/menu/campaign.menu
index e3f92c5bb..f329c49a2 100644
--- a/data/menu/campaign.menu
+++ b/data/menu/campaign.menu
@@ -9,13 +9,6 @@ Item Layout Campaign
 		picture "gfx/join_border"
 		size	'910 610'
 	}
-	Item Layout Campaign
-	{
-		size		'872 501'
-		direction	'0 8'
-		alignment	[AlignCenter]
-		origin		'460 44'
-	}
 	Item Window Dummy
 	{
 		Derive Picture Table6
diff --git a/data/menu/demos.menu b/data/menu/demos.menu
index 4fab57bb2..00d967505 100644
--- a/data/menu/demos.menu
+++ b/data/menu/demos.menu
@@ -30,11 +30,11 @@ Item Window Demos
 
 		Item ScrollWindow Scroll
 		{
-			size	'800 450'
+			size	'800 390'
 
 			Derive List FileList
 			{
-				size	'800 450'
+				size	'800 390'
 				target	"::Data::Demos::FileList::Demos"
 		
 				action 	Nex_Demos_Start
@@ -46,31 +46,22 @@ Item Window Demos
 			size	'20 450'
 			target	"##prev"
 		}
-	}
-	Item Layout Button
-	{
-		size		'872 901'
-		alignment	[AlignCenter]
-		origin		'395 552'
-		direction	'30 0'
-		
 		Derive PictureButton Start
 		{
 			normal	"$gfx/create_b_start"
 			action	Nex_Demos_Start
 		}
 	}
-Ignore {
 	Item Layout Settings
 	{
-		size		'600 801'
+		size		'1000 200'
 		alignment	[AlignLeft]
-		origin		'195 552'
+		pos		'50 540'
 		direction	'0 10'
 		
 		Derive Nex_Option_Switch AutoDemo
 		{
-			text	"Record a Demo"
+			text	"Automaticly record a Demo when playing"
 			target	"Data::Demos::AutoDemo::Switch"
 		}
 		DeriveTemplate Nex_Composition Option_EditBox
@@ -81,7 +72,7 @@ Ignore {
 			{}
 			DeriveTemplate EditBox EditBox
 			{
-				size 	'200 12'
+				size 	'600 12'
 				action  Nex_Action_TestOnChange
 				select  Nex_Action_TestOnSelect
 			}
@@ -93,4 +84,3 @@ Ignore {
 		}
 	}
 }
-}
diff --git a/data/menu/main.menu b/data/menu/main.menu
index 8296da8a7..7b38e38bd 100644
--- a/data/menu/main.menu
+++ b/data/menu/main.menu
@@ -87,8 +87,8 @@ Item Layout Main
 			normal		"$gfx/b_demos"
 			selected	"$gfx/b_demos_u"
 	
-			target 	"Demos"
-			action		Nex_Action_SetNormalPanelLink
+			target	"Demos"
+			init	Nex_Action_SetNormalPanelLink
 		}
 	}
 }
-- 
2.39.2