r2569 - branches/nexuiz-2.0/data/menu/options trunk/data/menu/options

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2007-05-15 16:53:49 -0400 (Tue, 15 May 2007)
New Revision: 2569

Modified:
   branches/nexuiz-2.0/data/menu/options/player.menu
   branches/nexuiz-2.0/data/menu/options/video.menu
   trunk/data/menu/options/player.menu
   trunk/data/menu/options/video.menu
Log:
the 'reset' in the player menu was pushed too far down
put non-applyable options to the top in the video menu


Modified: branches/nexuiz-2.0/data/menu/options/player.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/player.menu	2007-05-15 18:33:27 UTC (rev 2568)
+++ branches/nexuiz-2.0/data/menu/options/player.menu	2007-05-15 20:53:49 UTC (rev 2569)
@@ -207,8 +207,6 @@
 			text	"Download Speed"
 			target	"::Data::Player::MapDLSpeed::Value"
 		}
-		Derive Nex_Void Seperator1
-		{}
 		Derive PictureButton Apply
 		{
 			normal		"$gfx/options_b_apply"

Modified: branches/nexuiz-2.0/data/menu/options/video.menu
===================================================================
--- branches/nexuiz-2.0/data/menu/options/video.menu	2007-05-15 18:33:27 UTC (rev 2568)
+++ branches/nexuiz-2.0/data/menu/options/video.menu	2007-05-15 20:53:49 UTC (rev 2569)
@@ -21,6 +21,23 @@
 			DeriveTemplate SwitchButton	Switch
 			{}
 		}
+		Derive Nex_Option_Switch GLSL
+		{
+			text	"OpenGL 2.0 Shaders"
+			target	"::Data::Video::GLSL::Switch"
+		}
+		Derive Nex_Option_Switch VBO
+		{
+			text	"Vertex Buffer Objects"
+			target	"::Data::Video::VBO::Switch"
+		}
+		Derive Nex_Option_Switch ShowFPS
+		{
+			text	"Show FPS"
+			target	"::Data::Video::ShowFPS::Switch"
+		}
+		Derive Nex_Line Seperator1
+		{}
 		Derive Nex_Video_Option_Switch Resolution
 		{
 			text	"Resolution"
@@ -57,25 +74,8 @@
 			text	"Texture Quality Reduction"
 			target	"::Data::Video::PicmipWorld::Switch"
 		}
-		Derive Nex_Line	SeperatorGFXFeatures
+		Derive Nex_Void Seperator2
 		{}
-		Derive Nex_Option_Switch GLSL
-		{
-			text	"OpenGL 2.0 Shaders"
-			target	"::Data::Video::GLSL::Switch"
-		}
-		Derive Nex_Option_Switch VBO
-		{
-			text	"Vertex Buffer Objects"
-			target	"::Data::Video::VBO::Switch"
-		}
-		Derive Nex_Option_Switch ShowFPS
-		{
-			text	"Show FPS"
-			target	"::Data::Video::ShowFPS::Switch"
-		}
-		Derive Nex_Void Seperator1
-		{}
 		Derive PictureButton Apply
 		{
 			normal		"$gfx/options_b_apply"
@@ -88,7 +88,7 @@
 			init	Nex_Action_ResetData
 			target	"::Data::Video"
 		}
-		Derive Nex_Void Seperator2
+		Derive Nex_Line Seperator3
 		{}
 		Derive Label Presets
 		{

Modified: trunk/data/menu/options/player.menu
===================================================================
--- trunk/data/menu/options/player.menu	2007-05-15 18:33:27 UTC (rev 2568)
+++ trunk/data/menu/options/player.menu	2007-05-15 20:53:49 UTC (rev 2569)
@@ -207,8 +207,6 @@
 			text	"Download Speed"
 			target	"::Data::Player::MapDLSpeed::Value"
 		}
-		Derive Nex_Void Seperator1
-		{}
 		Derive PictureButton Apply
 		{
 			normal		"$gfx/options_b_apply"

Modified: trunk/data/menu/options/video.menu
===================================================================
--- trunk/data/menu/options/video.menu	2007-05-15 18:33:27 UTC (rev 2568)
+++ trunk/data/menu/options/video.menu	2007-05-15 20:53:49 UTC (rev 2569)
@@ -21,6 +21,23 @@
 			DeriveTemplate SwitchButton	Switch
 			{}
 		}
+		Derive Nex_Option_Switch GLSL
+		{
+			text	"OpenGL 2.0 Shaders"
+			target	"::Data::Video::GLSL::Switch"
+		}
+		Derive Nex_Option_Switch VBO
+		{
+			text	"Vertex Buffer Objects"
+			target	"::Data::Video::VBO::Switch"
+		}
+		Derive Nex_Option_Switch ShowFPS
+		{
+			text	"Show FPS"
+			target	"::Data::Video::ShowFPS::Switch"
+		}
+		Derive Nex_Line Seperator1
+		{}
 		Derive Nex_Video_Option_Switch Resolution
 		{
 			text	"Resolution"
@@ -57,25 +74,8 @@
 			text	"Texture Quality Reduction"
 			target	"::Data::Video::PicmipWorld::Switch"
 		}
-		Derive Nex_Line	SeperatorGFXFeatures
+		Derive Nex_Void Seperator2
 		{}
-		Derive Nex_Option_Switch GLSL
-		{
-			text	"OpenGL 2.0 Shaders"
-			target	"::Data::Video::GLSL::Switch"
-		}
-		Derive Nex_Option_Switch VBO
-		{
-			text	"Vertex Buffer Objects"
-			target	"::Data::Video::VBO::Switch"
-		}
-		Derive Nex_Option_Switch ShowFPS
-		{
-			text	"Show FPS"
-			target	"::Data::Video::ShowFPS::Switch"
-		}
-		Derive Nex_Void Seperator1
-		{}
 		Derive PictureButton Apply
 		{
 			normal		"$gfx/options_b_apply"
@@ -88,7 +88,7 @@
 			init	Nex_Action_ResetData
 			target	"::Data::Video"
 		}
-		Derive Nex_Void Seperator2
+		Derive Nex_Line Seperator3
 		{}
 		Derive Label Presets
 		{