actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix many missing themed strings

Browse Source
This commit is contained in:
Chris Danford
2005-12-01 09:43:21 +00:00
parent e655c93bf3
commit bf24714529
9 changed files with 97 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+82 -82
View File
@@ -444,71 +444,71 @@ static MenuDef g_PracticeHelp(
static MenuDef g_MainMenu( static MenuDef g_MainMenu(
"ScreenMiniMenuMainMenu", "ScreenMiniMenuMainMenu",
MenuRowDef( ScreenEdit::edit_steps_information, "Edit Steps Information", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::edit_steps_information, "Edit Steps Information", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::play_whole_song, "Play Whole Song", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::play_whole_song, "Play Whole Song", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::play_current_beat_to_end, "Play Current Beat to End", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::play_current_beat_to_end, "Play Current Beat to End", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::save, "Save", true, EDIT_MODE_HOME, 0, NULL ), MenuRowDef( ScreenEdit::save, "Save", true, EDIT_MODE_HOME, true, 0, NULL ),
MenuRowDef( ScreenEdit::revert_to_last_save, "Revert to Last Save", true, EDIT_MODE_HOME, 0, NULL ), MenuRowDef( ScreenEdit::revert_to_last_save, "Revert to Last Save", true, EDIT_MODE_HOME, true, 0, NULL ),
MenuRowDef( ScreenEdit::revert_from_disk, "Revert from Disk", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::revert_from_disk, "Revert from Disk", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::options, "Editor Options", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::options, "Editor Options", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::edit_song_info, "Edit Song Info", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::edit_song_info, "Edit Song Info", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::edit_bpm, "Edit BPM Change", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::edit_bpm, "Edit BPM Change", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::edit_stop, "Edit Stop", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::edit_stop, "Edit Stop", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::play_preview_music, "Play Preview Music", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::play_preview_music, "Play Preview Music", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::exit, "Exit", true, EDIT_MODE_PRACTICE, 0, NULL ) MenuRowDef( ScreenEdit::exit, "Exit", true, EDIT_MODE_PRACTICE, true, 0, NULL )
); );
static MenuDef g_AreaMenu( static MenuDef g_AreaMenu(
"ScreenMiniMenuAreaMenu", "ScreenMiniMenuAreaMenu",
MenuRowDef( ScreenEdit::cut, "Cut", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::cut, "Cut", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::copy, "Copy", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::copy, "Copy", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::paste_at_current_beat, "Paste at current beat", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::paste_at_current_beat, "Paste at current beat", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::paste_at_begin_marker, "Paste at begin marker", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::paste_at_begin_marker, "Paste at begin marker", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::clear, "Clear area", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::clear, "Clear area", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::quantize, "Quantize", true, EDIT_MODE_PRACTICE, 0, "4th","8th","12th","16th","24th","32nd","48th","64th","192nd"), MenuRowDef( ScreenEdit::quantize, "Quantize", true, EDIT_MODE_PRACTICE, true, 0, "4th","8th","12th","16th","24th","32nd","48th","64th","192nd"),
MenuRowDef( ScreenEdit::turn, "Turn", true, EDIT_MODE_PRACTICE, 0, "Left","Right","Mirror","Shuffle","SuperShuffle" ), MenuRowDef( ScreenEdit::turn, "Turn", true, EDIT_MODE_PRACTICE, true, 0, "Left","Right","Mirror","Shuffle","SuperShuffle" ),
MenuRowDef( ScreenEdit::transform, "Transform", true, EDIT_MODE_PRACTICE, 0, "NoHolds","NoMines","Little","Wide","Big","Quick","Skippy","Mines","Echo","Stomp","Planted","Floored","Twister","NoJumps","NoHands","NoQuads","NoStretch" ), MenuRowDef( ScreenEdit::transform, "Transform", true, EDIT_MODE_PRACTICE, true, 0, "NoHolds","NoMines","Little","Wide","Big","Quick","Skippy","Mines","Echo","Stomp","Planted","Floored","Twister","NoJumps","NoHands","NoQuads","NoStretch" ),
MenuRowDef( ScreenEdit::alter, "Alter", true, EDIT_MODE_PRACTICE, 0, "Autogen To Fill Width","Backwards","Swap Sides","Copy Left To Right","Copy Right To Left","Clear Left","Clear Right","Collapse To One","Collapse Left","Shift Left","Shift Right" ), MenuRowDef( ScreenEdit::alter, "Alter", true, EDIT_MODE_PRACTICE, true, 0, "Autogen To Fill Width","Backwards","Swap Sides","Copy Left To Right","Copy Right To Left","Clear Left","Clear Right","Collapse To One","Collapse Left","Shift Left","Shift Right" ),
MenuRowDef( ScreenEdit::tempo, "Tempo", true, EDIT_MODE_FULL, 0, "Compress 2x","Compress 3->2","Compress 4->3","Expand 3->4","Expand 2->3","Expand 2x" ), MenuRowDef( ScreenEdit::tempo, "Tempo", true, EDIT_MODE_FULL, true, 0, "Compress 2x","Compress 3->2","Compress 4->3","Expand 3->4","Expand 2->3","Expand 2x" ),
MenuRowDef( ScreenEdit::play, "Play selection", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::play, "Play selection", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::record, "Record in selection", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::record, "Record in selection", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::insert_and_shift, "Insert beat and shift down", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::insert_and_shift, "Insert beat and shift down", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::delete_and_shift, "Delete beat and shift up", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::delete_and_shift, "Delete beat and shift up", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::shift_pauses_forward, "Shift pauses and BPM changes down",true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::shift_pauses_forward, "Shift pauses and BPM changes down",true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::shift_pauses_backward, "Shift pauses and BPM changes up", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::shift_pauses_backward, "Shift pauses and BPM changes up", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::convert_beat_to_pause, "Convert beats to pause", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::convert_beat_to_pause, "Convert beats to pause", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::convert_pause_to_beat, "Convert pause to beats", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::convert_pause_to_beat, "Convert pause to beats", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::undo, "Undo", true, EDIT_MODE_PRACTICE, 0, NULL ) MenuRowDef( ScreenEdit::undo, "Undo", true, EDIT_MODE_PRACTICE, true, 0, NULL )
); );
static MenuDef g_StepsInformation( static MenuDef g_StepsInformation(
"ScreenMiniMenuStepsInformation", "ScreenMiniMenuStepsInformation",
MenuRowDef( ScreenEdit::difficulty, "Difficulty", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::difficulty, "Difficulty", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::meter, "Meter", true, EDIT_MODE_PRACTICE, 0, "1","2","3","4","5","6","7","8","9","10","11","12","13" ), MenuRowDef( ScreenEdit::meter, "Meter", true, EDIT_MODE_PRACTICE, false, 0, "1","2","3","4","5","6","7","8","9","10","11","12","13" ),
MenuRowDef( ScreenEdit::description, "Description", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::description, "Description", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::predict_meter, "Predicted Meter", false, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::predict_meter, "Predicted Meter", false, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::tap_notes, "Tap Steps", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::tap_notes, "Tap Steps", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::jumps, "Jumps", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::jumps, "Jumps", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::hands, "Hands", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::hands, "Hands", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::quads, "Quads", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::quads, "Quads", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::holds, "Holds", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::holds, "Holds", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::mines, "Mines", false, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::mines, "Mines", false, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::stream, "Stream", false, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::stream, "Stream", false, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::voltage, "Voltage", false, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::voltage, "Voltage", false, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::air, "Air", false, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::air, "Air", false, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::freeze, "Freeze", false, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::freeze, "Freeze", false, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::chaos, "Chaos", false, EDIT_MODE_FULL, 0, NULL ) MenuRowDef( ScreenEdit::chaos, "Chaos", false, EDIT_MODE_FULL, true, 0, NULL )
); );
static MenuDef g_SongInformation( static MenuDef g_SongInformation(
"ScreenMiniMenuSongInformation", "ScreenMiniMenuSongInformation",
MenuRowDef( ScreenEdit::main_title, "Main title", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::main_title, "Main title", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::sub_title, "Sub title", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::sub_title, "Sub title", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::artist, "Artist", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::artist, "Artist", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::credit, "Credit", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::credit, "Credit", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::main_title_transliteration, "Main title transliteration", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::main_title_transliteration, "Main title transliteration", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::sub_title_transliteration, "Sub title transliteration", true, EDIT_MODE_PRACTICE, 0, NULL ), MenuRowDef( ScreenEdit::sub_title_transliteration, "Sub title transliteration", true, EDIT_MODE_PRACTICE, true, 0, NULL ),
MenuRowDef( ScreenEdit::artist_transliteration, "Artist transliteration", true, EDIT_MODE_PRACTICE, 0, NULL ) MenuRowDef( ScreenEdit::artist_transliteration, "Artist transliteration", true, EDIT_MODE_PRACTICE, true, 0, NULL )
); );
enum { song_bganimation, song_movie, song_bitmap, global_bganimation, global_movie, global_movie_song_group, global_movie_song_group_and_genre, dynamic_random, baked_random, none }; enum { song_bganimation, song_movie, song_bitmap, global_bganimation, global_movie, global_movie_song_group, global_movie_song_group_and_genre, dynamic_random, baked_random, none };
@@ -528,29 +528,29 @@ static bool EnabledIfSet2GlobalMovieSongGroup();
static bool EnabledIfSet2GlobalMovieSongGroupAndGenre(); static bool EnabledIfSet2GlobalMovieSongGroupAndGenre();
static MenuDef g_BackgroundChange( static MenuDef g_BackgroundChange(
"ScreenMiniMenuBackgroundChange", "ScreenMiniMenuBackgroundChange",
MenuRowDef( ScreenEdit::layer, "Layer", false, EDIT_MODE_FULL, 0, "" ), MenuRowDef( ScreenEdit::layer, "Layer", false, EDIT_MODE_FULL, true, 0, "" ),
MenuRowDef( ScreenEdit::rate, "Rate", true, EDIT_MODE_FULL, 10, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","120%","140%","160%","180%","200%" ), MenuRowDef( ScreenEdit::rate, "Rate", true, EDIT_MODE_FULL, false, 10, "0%","10%","20%","30%","40%","50%","60%","70%","80%","90%","100%","120%","140%","160%","180%","200%" ),
MenuRowDef( ScreenEdit::transition, "Force Transition", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::transition, "Force Transition", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::effect, "Force Effect", true, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::effect, "Force Effect", true, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::color1, "Force Color 1", true, EDIT_MODE_FULL, 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::color1, "Force Color 1", true, EDIT_MODE_FULL, 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, EDIT_MODE_FULL, 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, EDIT_MODE_FULL, 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, EDIT_MODE_FULL, 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" ), MenuRowDef( ScreenEdit::file1_type, "File1 Type", true, EDIT_MODE_FULL, 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" ),
MenuRowDef( ScreenEdit::file1_song_bganimation, "File1 Song BGAnimation", EnabledIfSet1SongBGAnimation, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_song_bganimation, "File1 Song BGAnimation", EnabledIfSet1SongBGAnimation, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_song_movie, "File1 Song Movie", EnabledIfSet1SongMovie, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_song_movie, "File1 Song Movie", EnabledIfSet1SongMovie, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_song_still, "File1 Song Still", EnabledIfSet1SongBitmap, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_song_still, "File1 Song Still", EnabledIfSet1SongBitmap, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_global_bganimation, "File1 Global BGAnimation", EnabledIfSet1GlobalBGAnimation, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_global_bganimation, "File1 Global BGAnimation", EnabledIfSet1GlobalBGAnimation, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_global_movie, "File1 Global Movie", EnabledIfSet1GlobalMovie, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_global_movie, "File1 Global Movie", EnabledIfSet1GlobalMovie, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_global_movie_song_group, "File1 Global Movie (Group)", EnabledIfSet1GlobalMovieSongGroup, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_global_movie_song_group, "File1 Global Movie (Group)", EnabledIfSet1GlobalMovieSongGroup, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file1_global_movie_song_group_and_genre, "File1 Global Movie (Group + Genre)", EnabledIfSet1GlobalMovieSongGroupAndGenre, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file1_global_movie_song_group_and_genre, "File1 Global Movie (Group + Genre)", EnabledIfSet1GlobalMovieSongGroupAndGenre, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_type, "File2 Type", true, EDIT_MODE_FULL, 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" ), MenuRowDef( ScreenEdit::file2_type, "File2 Type", true, EDIT_MODE_FULL, 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" ),
MenuRowDef( ScreenEdit::file2_song_bganimation, "File2 Song BGAnimation", EnabledIfSet2SongBGAnimation, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_song_bganimation, "File2 Song BGAnimation", EnabledIfSet2SongBGAnimation, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_song_movie, "File2 Song Movie", EnabledIfSet2SongMovie, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_song_movie, "File2 Song Movie", EnabledIfSet2SongMovie, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_song_still, "File2 Song Still", EnabledIfSet2SongBitmap, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_song_still, "File2 Song Still", EnabledIfSet2SongBitmap, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_global_bganimation, "File2 Global BGAnimation", EnabledIfSet2GlobalBGAnimation, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_global_bganimation, "File2 Global BGAnimation", EnabledIfSet2GlobalBGAnimation, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_global_movie, "File2 Global Movie", EnabledIfSet2GlobalMovie, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_global_movie, "File2 Global Movie", EnabledIfSet2GlobalMovie, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_global_movie_song_group, "File2 Global Movie (Group)", EnabledIfSet2GlobalMovieSongGroup, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_global_movie_song_group, "File2 Global Movie (Group)", EnabledIfSet2GlobalMovieSongGroup, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::file2_global_movie_song_group_and_genre, "File2 Global Movie (Group + Genre)", EnabledIfSet2GlobalMovieSongGroupAndGenre, EDIT_MODE_FULL, 0, NULL ), MenuRowDef( ScreenEdit::file2_global_movie_song_group_and_genre, "File2 Global Movie (Group + Genre)", EnabledIfSet2GlobalMovieSongGroupAndGenre, EDIT_MODE_FULL, true, 0, NULL ),
MenuRowDef( ScreenEdit::delete_change, "Remove Change", true, EDIT_MODE_FULL, 0, NULL ) MenuRowDef( ScreenEdit::delete_change, "Remove Change", true, EDIT_MODE_FULL, true, 0, NULL )
); );
static bool EnabledIfSet1SongBGAnimation() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_bganimation && !g_BackgroundChange.rows[ScreenEdit::file1_song_bganimation].choices.empty(); } static bool EnabledIfSet1SongBGAnimation() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_bganimation && !g_BackgroundChange.rows[ScreenEdit::file1_song_bganimation].choices.empty(); }
static bool EnabledIfSet1SongMovie() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_movie && !g_BackgroundChange.rows[ScreenEdit::file1_song_movie].choices.empty(); } static bool EnabledIfSet1SongMovie() { return ScreenMiniMenu::s_viLastAnswers[ScreenEdit::file1_type] == song_movie && !g_BackgroundChange.rows[ScreenEdit::file1_song_movie].choices.empty(); }
@@ -585,20 +585,20 @@ static CString GetOneBakedRandomFile( Song *pSong, bool bTryGenre = true )
static MenuDef g_InsertTapAttack( static MenuDef g_InsertTapAttack(
"ScreenMiniMenuInsertTapAttack", "ScreenMiniMenuInsertTapAttack",
MenuRowDef( -1, "Duration seconds", true, EDIT_MODE_PRACTICE, 3, "5","10","15","20","25","30","35","40","45" ), MenuRowDef( -1, "Duration seconds", true, EDIT_MODE_PRACTICE, false, 3, "5","10","15","20","25","30","35","40","45" ),
MenuRowDef( -1, "Set modifiers", true, EDIT_MODE_PRACTICE, 0, "PRESS START" ) MenuRowDef( -1, "Set modifiers", true, EDIT_MODE_PRACTICE, true, 0, "Press Start" )
); );
static MenuDef g_InsertCourseAttack( static MenuDef g_InsertCourseAttack(
"ScreenMiniMenuInsertCourseAttack", "ScreenMiniMenuInsertCourseAttack",
MenuRowDef( ScreenEdit::duration, "Duration seconds", true, EDIT_MODE_PRACTICE, 3, "5","10","15","20","25","30","35","40","45" ), MenuRowDef( ScreenEdit::duration, "Duration seconds", true, EDIT_MODE_PRACTICE, false, 3, "5","10","15","20","25","30","35","40","45" ),
MenuRowDef( ScreenEdit::set_mods, "Set modifiers", true, EDIT_MODE_PRACTICE, 0, "PRESS START" ), MenuRowDef( ScreenEdit::set_mods, "Set modifiers", true, EDIT_MODE_PRACTICE, true, 0, "Press Start" ),
MenuRowDef( ScreenEdit::remove, "Remove", true, EDIT_MODE_PRACTICE, 0, "PRESS START" ) MenuRowDef( ScreenEdit::remove, "Remove", true, EDIT_MODE_PRACTICE, true, 0, "Press Start" )
); );
static MenuDef g_CourseMode( static MenuDef g_CourseMode(
"ScreenMiniMenuCourseDisplay", "ScreenMiniMenuCourseDisplay",
MenuRowDef( -1, "Play mods from course", true, EDIT_MODE_PRACTICE, 0, NULL ) MenuRowDef( -1, "Play mods from course", true, EDIT_MODE_PRACTICE, true, 0, NULL )
); );
// HACK: need to remember the track we're inserting on so // HACK: need to remember the track we're inserting on so
stepmania/src/ScreenMiniMenu.cpp
+1
View File
@@ -64,6 +64,7 @@ void ScreenMiniMenu::LoadMenu( const MenuDef* pDef )
def.m_bExportOnChange = false; def.m_bExportOnChange = false;
def.m_vsChoices = mr.choices; def.m_vsChoices = mr.choices;
def.m_bAllowThemeItems = mr.bThemeItems;
FOREACH( CString, def.m_vsChoices, c ) FOREACH( CString, def.m_vsChoices, c )
FontCharAliases::ReplaceMarkers( *c ); // Allow special characters FontCharAliases::ReplaceMarkers( *c ); // Allow special characters
stepmania/src/ScreenMiniMenu.h
+5 -2
View File
@@ -17,27 +17,30 @@ struct MenuRowDef
EditMode emShowIn; EditMode emShowIn;
int iDefaultChoice; int iDefaultChoice;
vector<CString> choices; vector<CString> choices;
bool bThemeItems;
MenuRowDef() {} MenuRowDef() {}
MenuRowDef( int r, CString n, MenuRowUpdateEnabled pe, EditMode s, int d, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL ) MenuRowDef( int r, CString n, MenuRowUpdateEnabled pe, EditMode s, bool b, int d, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL )
{ {
iRowCode = r; iRowCode = r;
sName = n; sName = n;
bEnabled = true; bEnabled = true;
pfnEnabled = pe; pfnEnabled = pe;
emShowIn = s; emShowIn = s;
bThemeItems = b;
iDefaultChoice = d; iDefaultChoice = d;
#define PUSH( c ) if(c) choices.push_back(c); #define PUSH( c ) if(c) choices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19); PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
#undef PUSH #undef PUSH
} }
MenuRowDef( int r, CString n, bool e, EditMode s, int d, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL ) MenuRowDef( int r, CString n, bool e, EditMode s, bool b, int d, const char *c0=NULL, const char *c1=NULL, const char *c2=NULL, const char *c3=NULL, const char *c4=NULL, const char *c5=NULL, const char *c6=NULL, const char *c7=NULL, const char *c8=NULL, const char *c9=NULL, const char *c10=NULL, const char *c11=NULL, const char *c12=NULL, const char *c13=NULL, const char *c14=NULL, const char *c15=NULL, const char *c16=NULL, const char *c17=NULL, const char *c18=NULL, const char *c19=NULL )
{ {
iRowCode = r; iRowCode = r;
sName = n; sName = n;
bEnabled = e; bEnabled = e;
pfnEnabled = NULL; pfnEnabled = NULL;
emShowIn = s; emShowIn = s;
bThemeItems = b;
iDefaultChoice = d; iDefaultChoice = d;
#define PUSH( c ) if(c) choices.push_back(c); #define PUSH( c ) if(c) choices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19); PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);PUSH(c15);PUSH(c16);PUSH(c17);PUSH(c18);PUSH(c19);
stepmania/src/ScreenNetworkOptions.cpp
+4 -4
View File
@@ -32,10 +32,10 @@ enum
}; };
OptionRowDefinition g_NetworkOptionsLines[NUM_NETWORK_OPTIONS_LINES] = { OptionRowDefinition g_NetworkOptionsLines[NUM_NETWORK_OPTIONS_LINES] = {
OptionRowDefinition( "Connection", true, "PRESS START" ), OptionRowDefinition( "Connection", true, "Press Start" ),
OptionRowDefinition( "Server", true, "PRESS START" ), OptionRowDefinition( "Server", true, "Press Start" ),
OptionRowDefinition( "Scoreboard", true, "PRESS START" ), OptionRowDefinition( "Scoreboard", true, "Press Start" ),
OptionRowDefinition( "Servers", true, "PRESS START" ) OptionRowDefinition( "Servers", true, "Press Start" )
}; };
AutoScreenMessage( SM_DoneConnecting ) AutoScreenMessage( SM_DoneConnecting )
stepmania/src/ScreenOptionsEditCourse.cpp
+1 -1
View File
@@ -270,7 +270,7 @@ void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input )
g_TempMenu.rows.clear(); g_TempMenu.rows.clear();
FOREACH_CourseEntryAction( i ) FOREACH_CourseEntryAction( i )
{ {
MenuRowDef mrd( i, CourseEntryActionToString(i), true, EDIT_MODE_HOME, 0, "" ); MenuRowDef mrd( i, CourseEntryActionToString(i), true, EDIT_MODE_HOME, true, 0, "" );
g_TempMenu.rows.push_back( mrd ); g_TempMenu.rows.push_back( mrd );
} }
stepmania/src/ScreenOptionsManageCourses.cpp
+1 -1
View File
@@ -383,7 +383,7 @@ void ScreenOptionsManageCourses::ProcessMenuStart( const InputEventPlus &input )
g_TempMenu.rows.clear(); g_TempMenu.rows.clear();
FOREACH_CourseAction( i ) FOREACH_CourseAction( i )
{ {
MenuRowDef mrd( i, CourseActionToString(i), true, EDIT_MODE_HOME, 0, "" ); MenuRowDef mrd( i, CourseActionToString(i), true, EDIT_MODE_HOME, true, 0, "" );
g_TempMenu.rows.push_back( mrd ); g_TempMenu.rows.push_back( mrd );
} }
stepmania/src/ScreenOptionsManageEditSteps.cpp
+1 -1
View File
@@ -251,7 +251,7 @@ void ScreenOptionsManageEditSteps::ProcessMenuStart( const InputEventPlus &input
g_TempMenu.rows.clear(); g_TempMenu.rows.clear();
FOREACH_StepsEditAction( i ) FOREACH_StepsEditAction( i )
{ {
MenuRowDef mrd( i, StepsEditActionToString(i), true, EDIT_MODE_HOME, 0, "" ); MenuRowDef mrd( i, StepsEditActionToString(i), true, EDIT_MODE_HOME, true, 0, "" );
g_TempMenu.rows.push_back( mrd ); g_TempMenu.rows.push_back( mrd );
} }
stepmania/src/ScreenOptionsManageProfiles.cpp
+1 -1
View File
@@ -370,7 +370,7 @@ void ScreenOptionsManageProfiles::ProcessMenuStart( const InputEventPlus &input
g_TempMenu.rows.clear(); g_TempMenu.rows.clear();
#define ADD_ACTION( i ) \ #define ADD_ACTION( i ) \
g_TempMenu.rows.push_back( MenuRowDef( i, ProfileActionToThemedString(i), true, EDIT_MODE_HOME, 0, "" ) ); g_TempMenu.rows.push_back( MenuRowDef( i, ProfileActionToThemedString(i), true, EDIT_MODE_HOME, true, 0, "" ) );
ADD_ACTION( ProfileAction_SetDefaultP1 ); ADD_ACTION( ProfileAction_SetDefaultP1 );
ADD_ACTION( ProfileAction_SetDefaultP2 ); ADD_ACTION( ProfileAction_SetDefaultP2 );
stepmania/src/ScreenProfileOptions.cpp
+1 -1
View File
@@ -27,7 +27,7 @@ enum {
OptionRowDefinition g_ProfileOptionsLines[NUM_PROFILE_OPTIONS_LINES] = { OptionRowDefinition g_ProfileOptionsLines[NUM_PROFILE_OPTIONS_LINES] = {
OptionRowDefinition( "Player1Profile", true ), OptionRowDefinition( "Player1Profile", true ),
OptionRowDefinition( "Player2Profile", true ), OptionRowDefinition( "Player2Profile", true ),
OptionRowDefinition( "CreateNew", true, "PRESS START" ), OptionRowDefinition( "CreateNew", true, "Press Start" ),
OptionRowDefinition( "Delete", true ), OptionRowDefinition( "Delete", true ),
OptionRowDefinition( "Rename", true ), OptionRowDefinition( "Rename", true ),
OptionRowDefinition( "OsMountPlayer1", true, "" ), OptionRowDefinition( "OsMountPlayer1", true, "" ),