From b2e0ac60f83897ec7c3ec8430fa96a351a71234e Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sun, 6 Aug 2006 20:11:54 +0000 Subject: [PATCH] don't theme BackgroundEffect names --- stepmania/Themes/default/Languages/en.ini | 21 +-------------------- stepmania/src/ScreenEdit.cpp | 6 +++--- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 500efb1ce7..d81275e9d3 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -321,7 +321,7 @@ MaxTextureResolution=Choose the maximum texture resolution. Setting this to any MenuTimer=Turn this &oq;OFF&cq; to disable the time limit in menus. Mines=Mines MoveRandomToEnd=Determines if courses with random songs should be placed at the end of the course select wheel. -MovieColorDepth=Choose the color depth of textures. 32 bit texture use more memory, but look nicer. +MovieColorDepth=Choose the color depth of textures. 32 bit textures use more memory, but look nicer. MusicWheelSwitchSpeed=Adjusts the speed of the music wheel. MusicWheelUsesSections=ALWAYS means sections in group + ABC; NEVER means no sections; ABC ONLY shows sections in just ABC sort. Network Options=Connect to a server or change server options. @@ -468,8 +468,6 @@ C200=C200 C400=C400 CPU-Controlled=CPU-Controlled Centered=Centered -Checkerboard1File2x2=Checkerboard1File2x2 -Checkerboard2File2x2=Checkerboard2File2x2 Choose=Choose Clear Left=Clear Left Clear Right=Clear Right @@ -484,7 +482,6 @@ Copy Right To Left=Copy Right To Left Courses Only=Courses Only Create New=Create New Cross=Cross -CrossFade=CrossFade Dance Points=Dance Points Dark=Dark Default=Default @@ -507,10 +504,6 @@ Expand=Expand Expand 2->3=Expand 2->3 Expand 2x=Expand 2x Expand 3->4=Expand 3->4 -FadeDown=FadeDown -FadeLeft=FadeLeft -FadeRight=FadeRight -FadeUp=FadeUp Fast=Fast Flat=Flat Flip=Flip @@ -537,7 +530,6 @@ Instant=Instant Invert=Invert Joint Premium=Joint Premium Justice=Justice -Kaleidoscope2x2=Kaleidoscope2x2 Left=Left LifeTime=Survival Little=Little @@ -592,12 +584,7 @@ Shuffle=Shuffle Silent=Silent Skip=Skip Skippy=Skippy -SlideDown=SlideDown -SlideLeft=SlideLeft -SlideRight=SlideRight -SlideUp=SlideUp Slow=Slow -SongBgWithMovieViz=SongBgWithMovieViz Song BGAnimation=Song BGAnimation Song Bitmap=Song Bitmap Song Movie=Song Movie @@ -609,11 +596,6 @@ Stealth=Stealth StepMania Style=StepMania Style Stomp=Stomp Stop=Stop -StretchNoLoop=StretchNoLoop -StretchNormal=StretchNormal -StretchNormalAlignLeft=StretchNormalAlignLeft -StretchPaused=StretchPaused -StretchRewind=StretchRewind Subtract=Subtractive Sudden=Sudden SuddenDeath=Sudden Death @@ -627,7 +609,6 @@ Title Only=Title Only Tornado=Tornado Total Feet=Total Feet Twister=Twister -UpperLeft=UpperLeft Use Gameplay Buttons=Use Gameplay Buttons Visible=Visible Wave=Wave diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index ae56f9f1d9..d6393dd2f7 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -550,10 +550,10 @@ static bool EnabledIfSet2GlobalMovieSongGroup(); static bool EnabledIfSet2GlobalMovieSongGroupAndGenre(); static MenuDef g_BackgroundChange( "ScreenMiniMenuBackgroundChange", - MenuRowDef( ScreenEdit::layer, "Layer", false, EditMode_Full, true, true, 0, "" ), + MenuRowDef( ScreenEdit::layer, "Layer", false, EditMode_Full, true, false, 0, "" ), MenuRowDef( ScreenEdit::rate, "Rate", true, EditMode_Full, true, false, 10, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","120%","140%","160%","180%","200%" ), - MenuRowDef( ScreenEdit::transition, "Force Transition", true, EditMode_Full, true, true, 0, NULL ), - MenuRowDef( ScreenEdit::effect, "Force Effect", true, EditMode_Full, true, true, 0, NULL ), + MenuRowDef( ScreenEdit::transition, "Force Transition", true, EditMode_Full, true, false, 0, NULL ), + MenuRowDef( ScreenEdit::effect, "Force Effect", true, EditMode_Full, true, false, 0, NULL ), MenuRowDef( ScreenEdit::color1, "Force Color 1", true, EditMode_Full, true, false, 0, "-","1,1,1,1","0.5,0.5,0.5,1","1,1,1,0.5","0,0,0,1","1,0,0,1","0,1,0,1","0,0,1,1","1,1,0,1","0,1,1,1","1,0,1,1" ), MenuRowDef( ScreenEdit::color2, "Force Color 2", true, EditMode_Full, true, false, 0, "-","1,1,1,1","0.5,0.5,0.5,1","1,1,1,0.5","0,0,0,1","1,0,0,1","0,1,0,1","0,0,1,1","1,1,0,1","0,1,1,1","1,0,1,1" ), MenuRowDef( ScreenEdit::file1_type, "File1 Type", true, EditMode_Full, true, true, 0, "Song BGAnimation", "Song Movie", "Song Bitmap", "Global BGAnimation", "Global Movie", "Global Movie from Song Group", "Global Movie from Song Group and Genre", "Dynamic Random", "Baked Random", "None" ),