Fixed paste over.

Originally committed to SVN as r959.
This commit is contained in:
Rodrigo Braz Monteiro 2007-03-28 01:37:13 +00:00
parent 58f4dae158
commit af757cf6fe
2 changed files with 5 additions and 5 deletions

View File

@ -124,8 +124,8 @@ END_EVENT_TABLE()
// OK pressed // OK pressed
void DialogPasteOver::OnOK(wxCommandEvent &event) { void DialogPasteOver::OnOK(wxCommandEvent &event) {
// Set options // Set options
options.SetCount(11); options.SetCount(10);
for (int i=0;i<11;i++) { for (int i=0;i<10;i++) {
options[i] = ListBox->IsChecked(i) ? 1 : 0; options[i] = ListBox->IsChecked(i) ? 1 : 0;
Options.SetBool(wxString::Format(_T("Paste Over #%i"),i),options[i]==1); Options.SetBool(wxString::Format(_T("Paste Over #%i"),i),options[i]==1);
} }

View File

@ -963,9 +963,9 @@ void SubtitlesGrid::PasteLines(int n,bool pasteOver) {
if (pasteOverOptions[5]) target->Margin[0] = curdiag->Margin[0]; if (pasteOverOptions[5]) target->Margin[0] = curdiag->Margin[0];
if (pasteOverOptions[6]) target->Margin[1] = curdiag->Margin[1]; if (pasteOverOptions[6]) target->Margin[1] = curdiag->Margin[1];
if (pasteOverOptions[7]) target->Margin[2] = curdiag->Margin[2]; if (pasteOverOptions[7]) target->Margin[2] = curdiag->Margin[2];
if (pasteOverOptions[8]) target->Margin[3] = curdiag->Margin[3]; //if (pasteOverOptions[8]) target->Margin[3] = curdiag->Margin[3];
if (pasteOverOptions[9]) target->Effect = curdiag->Effect; if (pasteOverOptions[8]) target->Effect = curdiag->Effect;
if (pasteOverOptions[10]) target->Text = curdiag->Text; if (pasteOverOptions[9]) target->Text = curdiag->Text;
} }
delete curdiag; delete curdiag;
} }