From 311eace2b6e7dbcf555282d26f340132e3a8f3bc Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 11 Apr 2009 19:16:10 +0000 Subject: [PATCH] ScreenOptionsEditPlaylist -> ScreenOptionsEditCourse --- stepmania/Themes/default/Languages/en.ini | 2 +- stepmania/Themes/default/Languages/es.ini | 2 +- ...aylist.cpp => ScreenOptionsEditCourse.cpp} | 44 +++++++++---------- ...itPlaylist.h => ScreenOptionsEditCourse.h} | 8 ++-- stepmania/src/StepMania-net2003.vcproj | 4 +- 5 files changed, 30 insertions(+), 30 deletions(-) rename stepmania/src/{ScreenOptionsEditPlaylist.cpp => ScreenOptionsEditCourse.cpp} (89%) rename stepmania/src/{ScreenOptionsEditPlaylist.h => ScreenOptionsEditCourse.h} (92%) diff --git a/stepmania/Themes/default/Languages/en.ini b/stepmania/Themes/default/Languages/en.ini index 312876548b..7e768b672e 100644 --- a/stepmania/Themes/default/Languages/en.ini +++ b/stepmania/Themes/default/Languages/en.ini @@ -1762,7 +1762,7 @@ Tier08=D Failed=E NoData=NO DATA -[ScreenOptionsEditPlaylist] +[ScreenOptionsEditCourse] -Empty-=-Empty- Song=Song Steps=Steps diff --git a/stepmania/Themes/default/Languages/es.ini b/stepmania/Themes/default/Languages/es.ini index 69d96c52ef..ced9fee91d 100644 --- a/stepmania/Themes/default/Languages/es.ini +++ b/stepmania/Themes/default/Languages/es.ini @@ -290,7 +290,7 @@ Tier08=D Failed=E NoData=SIN DATOS -[ScreenOptionsEditPlaylist] +[ScreenOptionsEditCourse] -Empty-=-Vacía- Song=Canción Steps=Dificultad diff --git a/stepmania/src/ScreenOptionsEditPlaylist.cpp b/stepmania/src/ScreenOptionsEditCourse.cpp similarity index 89% rename from stepmania/src/ScreenOptionsEditPlaylist.cpp rename to stepmania/src/ScreenOptionsEditCourse.cpp index 1d43e0240f..f157248e2b 100644 --- a/stepmania/src/ScreenOptionsEditPlaylist.cpp +++ b/stepmania/src/ScreenOptionsEditCourse.cpp @@ -1,6 +1,6 @@ #include "global.h" -#include "ScreenOptionsEditPlaylist.h" +#include "ScreenOptionsEditCourse.h" #include "ScreenMiniMenu.h" #include "SongUtil.h" #include "SongManager.h" @@ -99,7 +99,7 @@ protected: const int NUM_SONG_ROWS = 20; -REGISTER_SCREEN_CLASS( ScreenOptionsEditPlaylist ); +REGISTER_SCREEN_CLASS( ScreenOptionsEditCourse ); enum WorkoutDetailsRow { @@ -132,7 +132,7 @@ static int EntryIndexAndRowTypeToRow( int iEntryIndex, RowType rowType ) return NUM_WorkoutDetailsRow + iEntryIndex*NUM_RowType + rowType; } -void ScreenOptionsEditPlaylist::Init() +void ScreenOptionsEditCourse::Init() { ScreenOptions::Init(); SONGMAN->GetPreferredSortSongs( m_vpSongs ); @@ -144,10 +144,10 @@ const MenuRowDef g_MenuRows[] = MenuRowDef( -1, "Workout Minutes", true, EditMode_Practice, true, false, 0, NULL ), }; -static LocalizedString EMPTY ("ScreenOptionsEditPlaylist","-Empty-"); -static LocalizedString SONG ("ScreenOptionsEditPlaylist","Song"); -static LocalizedString STEPS ("ScreenOptionsEditPlaylist","Steps"); -static LocalizedString MINUTES ("ScreenOptionsEditPlaylist","minutes"); +static LocalizedString EMPTY ("ScreenOptionsEditCourse","-Empty-"); +static LocalizedString SONG ("ScreenOptionsEditCourse","Song"); +static LocalizedString STEPS ("ScreenOptionsEditCourse","Steps"); +static LocalizedString MINUTES ("ScreenOptionsEditCourse","minutes"); static RString MakeMinutesString( int mins ) { @@ -156,7 +156,7 @@ static RString MakeMinutesString( int mins ) return ssprintf( "%d", mins ) + " " + MINUTES.GetValue(); } -void ScreenOptionsEditPlaylist::BeginScreen() +void ScreenOptionsEditCourse::BeginScreen() { vector vHands; @@ -236,12 +236,12 @@ void ScreenOptionsEditPlaylist::BeginScreen() //this->AfterChangeRow( PLAYER_1 ); } -ScreenOptionsEditPlaylist::~ScreenOptionsEditPlaylist() +ScreenOptionsEditCourse::~ScreenOptionsEditCourse() { } -void ScreenOptionsEditPlaylist::ImportOptions( int iRow, const vector &vpns ) +void ScreenOptionsEditCourse::ImportOptions( int iRow, const vector &vpns ) { OptionRow &row = *m_pRows[iRow]; if( row.GetRowType() == OptionRow::RowType_Exit ) @@ -283,7 +283,7 @@ void ScreenOptionsEditPlaylist::ImportOptions( int iRow, const vector &vpns ) +void ScreenOptionsEditCourse::ExportOptions( int iRow, const vector &vpns ) { FOREACH_ENUM( WorkoutDetailsRow, i ) { @@ -343,15 +343,15 @@ void ScreenOptionsEditPlaylist::ExportOptions( int iRow, const vectorm_pCurSong; if( pSong ) @@ -408,7 +408,7 @@ void ScreenOptionsEditPlaylist::SetCurrentSteps() } } -Song *ScreenOptionsEditPlaylist::GetSongForEntry( int iEntryIndex ) +Song *ScreenOptionsEditCourse::GetSongForEntry( int iEntryIndex ) { int iRow = EntryIndexAndRowTypeToRow( iEntryIndex, RowType_Song ); OptionRow &row = *m_pRows[iRow]; @@ -419,7 +419,7 @@ Song *ScreenOptionsEditPlaylist::GetSongForEntry( int iEntryIndex ) return m_vpSongs[ index - 1 ]; } -Steps *ScreenOptionsEditPlaylist::GetStepsForEntry( int iEntryIndex ) +Steps *ScreenOptionsEditCourse::GetStepsForEntry( int iEntryIndex ) { int iRow = EntryIndexAndRowTypeToRow( iEntryIndex, RowType_Steps ); OptionRow &row = *m_pRows[iRow]; @@ -430,14 +430,14 @@ Steps *ScreenOptionsEditPlaylist::GetStepsForEntry( int iEntryIndex ) return vpSteps[index]; } -void ScreenOptionsEditPlaylist::AfterChangeRow( PlayerNumber pn ) +void ScreenOptionsEditCourse::AfterChangeRow( PlayerNumber pn ) { ScreenOptions::AfterChangeRow( pn ); SetCurrentSong(); } -void ScreenOptionsEditPlaylist::AfterChangeValueInRow( int iRow, PlayerNumber pn ) +void ScreenOptionsEditCourse::AfterChangeValueInRow( int iRow, PlayerNumber pn ) { ScreenOptions::AfterChangeValueInRow( iRow, pn ); @@ -462,8 +462,8 @@ void ScreenOptionsEditPlaylist::AfterChangeValueInRow( int iRow, PlayerNumber pn const int MIN_ENABLED_SONGS = 2; -static LocalizedString MUST_ENABLE_AT_LEAST("ScreenOptionsEditPlaylist","You must enable at least %d songs."); -void ScreenOptionsEditPlaylist::ProcessMenuStart( const InputEventPlus &input ) +static LocalizedString MUST_ENABLE_AT_LEAST("ScreenOptionsEditCourse","You must enable at least %d songs."); +void ScreenOptionsEditCourse::ProcessMenuStart( const InputEventPlus &input ) { if( IsTransitioning() ) return; diff --git a/stepmania/src/ScreenOptionsEditPlaylist.h b/stepmania/src/ScreenOptionsEditCourse.h similarity index 92% rename from stepmania/src/ScreenOptionsEditPlaylist.h rename to stepmania/src/ScreenOptionsEditCourse.h index 1465f6c7bc..cd21e23fe4 100644 --- a/stepmania/src/ScreenOptionsEditPlaylist.h +++ b/stepmania/src/ScreenOptionsEditCourse.h @@ -1,14 +1,14 @@ -#ifndef ScreenOptionsEditPlaylist_H -#define ScreenOptionsEditPlaylist_H +#ifndef ScreenOptionsEditCourse_H +#define ScreenOptionsEditCourse_H #include "ScreenOptions.h" class Song; class Steps; -class ScreenOptionsEditPlaylist : public ScreenOptions +class ScreenOptionsEditCourse : public ScreenOptions { public: - virtual ~ScreenOptionsEditPlaylist(); + virtual ~ScreenOptionsEditCourse(); virtual void Init(); virtual void BeginScreen(); diff --git a/stepmania/src/StepMania-net2003.vcproj b/stepmania/src/StepMania-net2003.vcproj index cb6106f470..f9461f550e 100644 --- a/stepmania/src/StepMania-net2003.vcproj +++ b/stepmania/src/StepMania-net2003.vcproj @@ -443,10 +443,10 @@ cl /Zl /nologo /c verstub.cpp /Fo"$(IntDir)"\ RelativePath="ScreenOptions.h"> + RelativePath=".\ScreenOptionsEditCourse.cpp"> + RelativePath=".\ScreenOptionsEditCourse.h">