mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Originally committed to SVN as r313.

Browse source
This commit is contained in:
Rodrigo Braz Monteiro 2006-04-13 06:24:36 +00:00
parent 585f9a6409
commit 5181c9e225
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
core/ass_style.cpp
View file

@ -420,25 +420,25 @@ void AssStyle::UpdateData() {
final += outline.GetASSFormatted(true,false,true) + _T(",");
final += shadow.GetASSFormatted(true,false,true) + _T(",");
final += IntToString(bold?-1:0) + _T(",");
final += IntToString(italic?-1:0) + _T(",");
final += IntToString(underline?-1:0) + _T(",");
final += IntToString(strikeout?-1:0) + _T(",");
final += IntegerToString(bold?-1:0) + _T(",");
final += IntegerToString(italic?-1:0) + _T(",");
final += IntegerToString(underline?-1:0) + _T(",");
final += IntegerToString(strikeout?-1:0) + _T(",");
final += FloatToString(scalex) + _T(",");
final += FloatToString(scaley) + _T(",");
final += FloatToString(spacing) + _T(",");
final += FloatToString(angle) + _T(",");
final += IntToString(borderstyle) + _T(",");
final += IntegerToString(borderstyle) + _T(",");
final += FloatToString(outline_w) + _T(",");
final += FloatToString(shadow_w) + _T(",");
final += IntToString(alignment) + _T(",");
final += IntToString(MarginL) + _T(",");
final += IntToString(MarginR) + _T(",");
final += IntToString(MarginV) + _T(",");
final += IntToString(encoding);
final += IntegerToString(alignment) + _T(",");
final += IntegerToString(MarginL) + _T(",");
final += IntegerToString(MarginR) + _T(",");
final += IntegerToString(MarginV) + _T(",");
final += IntegerToString(encoding);
SetEntryData(final);
}
@ -496,10 +496,10 @@ wxString AssStyle::GetSSAText() {
output += _T("0,");
output += shadow.GetSSAFormatted() + _T(",");
output += IntToString(bold?-1:0) + _T(",");
output += IntToString(italic?-1:0) + _T(",");
output += IntegerToString(bold?-1:0) + _T(",");
output += IntegerToString(italic?-1:0) + _T(",");
output += IntToString(borderstyle) + _T(",");
output += IntegerToString(borderstyle) + _T(",");
output += FloatToString(outline_w) + _T(",");
output += FloatToString(shadow_w) + _T(",");
@ -515,13 +515,13 @@ wxString AssStyle::GetSSAText() {
case 8: align = 6; break;
case 9: align = 7; break;
}
output += IntToString(align) + _T(",");
output += IntegerToString(align) + _T(",");
output += IntToString(MarginL) + _T(",");
output += IntToString(MarginR) + _T(",");
output += IntToString(MarginV) + _T(",");
output += IntegerToString(MarginL) + _T(",");
output += IntegerToString(MarginR) + _T(",");
output += IntegerToString(MarginV) + _T(",");
output += _T("0,");
output += IntToString(encoding);
output += IntegerToString(encoding);
return output;
}

2
core/dialog_style_editor.cpp
View file

@ -211,7 +211,7 @@ DialogStyleEditor::DialogStyleEditor (wxWindow *parent, AssStyle *_style, Subtit
ScaleXValue = FloatToString(style->scalex);
ScaleYValue = FloatToString(style->scaley);
AngleValue = FloatToString(style->angle);
EncodingValue = IntToString(style->encoding);
EncodingValue = IntegerToString(style->encoding);
SpacingValue = FloatToString(style->spacing);
ScaleX = new wxTextCtrl(this,-1,_T(""),wxDefaultPosition, wxSize(70,20),0,wxTextValidator(wxFILTER_NUMERIC,&ScaleXValue));
ScaleY = new wxTextCtrl(this,-1,_T(""),wxDefaultPosition, wxSize(70,20),0,wxTextValidator(wxFILTER_NUMERIC,&ScaleYValue));

2
core/utils.cpp
View file

@ -141,6 +141,6 @@ wxString FloatToString(double value) {
/////////////////
// Int to string
wxString IntToString(int value) {
wxString IntegerToString(int value) {
return wxString::Format(_T("%i"),value);
}

2
core/utils.h
View file

@ -46,7 +46,7 @@ wxString MakeRelativePath(wxString path,wxString reference);
wxString DecodeRelativePath(wxString path,wxString reference);
wxString PrettyFloat(wxString src);
wxString FloatToString(double value);
wxString IntToString(int value);
wxString IntegerToString(int value);
//////////