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

[splittiming] merge

Browse Source
This commit is contained in:
Thai Pangsakulyanont
2011-05-17 00:02:39 +07:00
parent 5deed76e37 c1b72c1721
commit 2e5b929135
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Themes/_fallback/Languages/en.ini
+2 -5
View File
@@ -847,9 +847,7 @@ Exit Edit Mode=Exit Edit Mode
Edit stop=Edit stop Edit stop=Edit stop
Edit delay=Edit delay Edit delay=Edit delay
Edit Timing Data=Edit Timing Data Edit Timing Data=Edit Timing Data
Edit time signature=Edit time signature (not working yet) Edit time signature=Edit time signature
Edit time signature (top)=Edit time signature (beats per measure)
Edit time signature (bottom)=Edit time signature (single beat note value)
Edit tickcount=Edit tickcount Edit tickcount=Edit tickcount
Edit combo=Edit combo Edit combo=Edit combo
Edit label=Edit label Edit label=Edit label
@@ -1227,8 +1225,7 @@ Do you want to save changes before exiting?=Do you want to save changes before e
Enter a new BPM value.=Enter a new BPM value.\n\nEnter the previous value to remove. Enter a new BPM value.=Enter a new BPM value.\n\nEnter the previous value to remove.
Enter a new Stop value.=Enter a new Stop value.\n\nType "0" to remove. Enter a new Stop value.=Enter a new Stop value.\n\nType "0" to remove.
Enter a new Delay value.=Enter a new Delay value.\n\nType "0" to remove. Enter a new Delay value.=Enter a new Delay value.\n\nType "0" to remove.
Enter a new Time Signature numerator value.=Enter the number of beats per measure. Enter a new Time Signature.=Enter a new time signature.\nUse the format "x/y".\nEnter the previous value to remove.
Enter a new Time Signature denominator value.=Enter the note value that represents one beat.
Enter a new Tickcount value.=Enter a new Tickcount value.\n\nEnter the previous value to remove. Enter a new Tickcount value.=Enter a new Tickcount value.\n\nEnter the previous value to remove.
Enter a new Combo value.=Enter a new Combo value.\n\nEnter the previous value to remove. Enter a new Combo value.=Enter a new Combo value.\n\nEnter the previous value to remove.
Enter a new Label value.=Enter a name for this section of the chart.\n\nEnter a previously used label to remove. Enter a new Label value.=Enter a name for this section of the chart.\n\nEnter a previously used label to remove.
src/ScreenEdit.cpp
+2 -2
View File
@@ -2718,8 +2718,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
int iNum, iDen; int iNum, iDen;
if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 ) if( sscanf( ScreenTextEntry::s_sLastAnswer.c_str(), " %d / %d ", &iNum, &iDen ) == 2 )
{ {
GetAppropriateTiming().SetTimeSignatureNumeratorAtBeat( GetBeat(), iNum ); GetAppropriateTiming().SetTimeSignatureAtBeat( GetBeat(), iNum, iDen );
GetAppropriateTiming().SetTimeSignatureDenominatorAtBeat( GetBeat(), iDen );
} }
SetDirty( true ); SetDirty( true );
} }
@@ -4028,6 +4027,7 @@ void ScreenEdit::HandleTimingDataInformationChoice( TimingDataInformationChoice
ssprintf("%.5f", GetAppropriateTiming().GetFakeAtBeat( GetBeat() ) ), ssprintf("%.5f", GetAppropriateTiming().GetFakeAtBeat( GetBeat() ) ),
10 10
); );
break;
} }
case erase_step_timing: case erase_step_timing:
ScreenPrompt::Prompt( SM_DoEraseStepTiming, CONFIRM_TIMING_ERASE , PROMPT_YES_NO, ANSWER_NO ); ScreenPrompt::Prompt( SM_DoEraseStepTiming, CONFIRM_TIMING_ERASE , PROMPT_YES_NO, ANSWER_NO );