From 833fc3f4279d10eb039a9c5a13fcd15eeb47618e Mon Sep 17 00:00:00 2001 From: black Date: Thu, 8 Dec 2005 21:05:27 +0000 Subject: [PATCH] Removed menu/options/game.menu since it has never been used apparently. Moved the table background out of the suboption panels into the main option panel (yes, it is a bit hackish but it works and it's no big change). git-svn-id: svn://svn.icculus.org/nexuiz/trunk@636 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/menu/options.menu | 42 +++++++++++++++++++++------------- data/menu/options/color.menu | 8 ------- data/menu/options/effects.menu | 11 ++------- data/menu/options/game.menu | 9 -------- data/menu/options/input.menu | 9 +------- data/menu/options/key.menu | 9 +------- data/menu/options/player.menu | 7 ------ data/menu/options/sound.menu | 7 ------ data/menu/options/video.menu | 7 ------ 9 files changed, 30 insertions(+), 79 deletions(-) delete mode 100644 data/menu/options/game.menu diff --git a/data/menu/options.menu b/data/menu/options.menu index 562c69ad9..37bc3c8b1 100644 --- a/data/menu/options.menu +++ b/data/menu/options.menu @@ -21,7 +21,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::Player" + target "Dummy::Panel::Player" } Derive PictureButton Controls { @@ -30,7 +30,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::KeyControl" + target "Dummy::Panel::KeyControl" } Derive PictureButton Audio { @@ -39,7 +39,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::Sound" + target "Dummy::Panel::Sound" } Derive PictureButton Video { @@ -48,7 +48,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::Video" + target "Dummy::Panel::Video" } Derive PictureButton ColorControl { @@ -57,7 +57,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::ColorControl" + target "Dummy::Panel::ColorControl" } Derive PictureButton Effects { @@ -66,7 +66,7 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::Effects" + target "Dummy::Panel::Effects" } Derive PictureButton Input { @@ -75,19 +75,29 @@ Item Layout Options size '118 47' init Nex_Action_JumpToPage - target "Panel::Input" + target "Dummy::Panel::Input" } } - Item EventWindow Panel + Item Window Dummy { - reinit Nex_Action_MakeFirstVisible + Derive Picture Table6 + { + picture "gfx/options_background" + size '734 540' + pos '146 35' + } - #include "menu/options/player.menu" - #include "menu/options/key.menu" - #include "menu/options/sound.menu" - #include "menu/options/video.menu" - #include "menu/options/color.menu" - #include "menu/options/effects.menu" - #include "menu/options/input.menu" + Item EventWindow Panel + { + reinit Nex_Action_MakeFirstVisible + + #include "menu/options/player.menu" + #include "menu/options/key.menu" + #include "menu/options/sound.menu" + #include "menu/options/video.menu" + #include "menu/options/color.menu" + #include "menu/options/effects.menu" + #include "menu/options/input.menu" + } } } diff --git a/data/menu/options/color.menu b/data/menu/options/color.menu index 00d8fb736..bed493ca6 100644 --- a/data/menu/options/color.menu +++ b/data/menu/options/color.menu @@ -2,14 +2,6 @@ // options/color.menu Item Window ColorControl { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - - Item Layout Layout { pos '156 45' diff --git a/data/menu/options/effects.menu b/data/menu/options/effects.menu index 6bc20ce84..14124e538 100644 --- a/data/menu/options/effects.menu +++ b/data/menu/options/effects.menu @@ -2,13 +2,6 @@ // options/key.menu Item Window Effects { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Derive MultiLabel Description { size '600 100' @@ -52,7 +45,7 @@ Item Window Effects } Derive Nex_Line SeperatorRTLights - {} + {} Derive Nex_Option_Switch RealtimeLights { text "Realtime World Lights" @@ -75,7 +68,7 @@ Item Window Effects } Derive Nex_Line SeperatorGFXFeatures - {} + {} Derive Nex_Option_Switch GLSL { text "OpenGL 2.0 Shaders" diff --git a/data/menu/options/game.menu b/data/menu/options/game.menu deleted file mode 100644 index 0c4905dcf..000000000 --- a/data/menu/options/game.menu +++ /dev/null @@ -1,9 +0,0 @@ -// Property of Alientrap/AK -// options/game.menu -Item Window Game -{ - direction [Nex_DefaultVertDirection] - size '600 600' - origin '300 0' - alignment [AlignFirst] -} diff --git a/data/menu/options/input.menu b/data/menu/options/input.menu index bfe4a61ca..da3a79305 100644 --- a/data/menu/options/input.menu +++ b/data/menu/options/input.menu @@ -2,13 +2,6 @@ // options/input.menu Item Window Input { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Item Layout Layout { pos '156 45' @@ -32,7 +25,7 @@ Item Window Input { text "Mouse Filter" target "::Data::Input::MouseFilter::Switch" - } + } Derive Nex_Line Seperator {} Derive TextButton Reset diff --git a/data/menu/options/key.menu b/data/menu/options/key.menu index c27acbcc0..e3ce9ae72 100644 --- a/data/menu/options/key.menu +++ b/data/menu/options/key.menu @@ -2,13 +2,6 @@ // options/key.menu Item Window KeyControl { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Derive MultiLabel Description { pos '156 45' @@ -81,7 +74,7 @@ Item Window KeyControl flag [FlagEmbedded] Item Arrangement Keys - { + { direction [Nex_DefaultVertDirection] flag [FlagEmbedded] diff --git a/data/menu/options/player.menu b/data/menu/options/player.menu index ab8df1908..b91ab5dee 100644 --- a/data/menu/options/player.menu +++ b/data/menu/options/player.menu @@ -2,13 +2,6 @@ // options/player.menu Item Window Player { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Item Window Avatar { size '300 600' diff --git a/data/menu/options/sound.menu b/data/menu/options/sound.menu index f67fd1d45..15b8901e8 100644 --- a/data/menu/options/sound.menu +++ b/data/menu/options/sound.menu @@ -2,13 +2,6 @@ // options/sound.menu Item Window Sound { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Item Layout Layout { pos '156 45' diff --git a/data/menu/options/video.menu b/data/menu/options/video.menu index 30a1bc2a1..43818f8ef 100644 --- a/data/menu/options/video.menu +++ b/data/menu/options/video.menu @@ -2,13 +2,6 @@ // options/key.menu Item Window Video { - Derive Picture Table6 - { - picture "gfx/options_background" - size '734 540' - pos '146 35' - } - Item Layout Layout { pos '156 45' -- 2.39.2