From ec1fab1db7c8faca41391ba2aefe7b55f04098fc Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sun, 2 Apr 2006 03:34:56 +0000 Subject: [PATCH] Originally committed to SVN as r288. --- core/dialog_fextracker.cpp | 4 ++-- core/subtitle_format_prs.cpp | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/core/dialog_fextracker.cpp b/core/dialog_fextracker.cpp index 1a0b01920..4225e21a2 100644 --- a/core/dialog_fextracker.cpp +++ b/core/dialog_fextracker.cpp @@ -74,11 +74,11 @@ DialogFexTracker::DialogFexTracker(wxWindow *parent, FexTrackerConfig *_cfg) StdWnd->SetSizer( Sizer ); StdWnd->SetAutoLayout( 1 ); - MainNB->AddPage( StdWnd, _T("Standard Settings") ); + MainNB->AddPage( StdWnd, _("Standard Settings") ); AdvWnd->SetSizer( SizerAdd ); AdvWnd->SetAutoLayout( 1 ); - MainNB->AddPage( AdvWnd, _T("Advanced Settings") ); + MainNB->AddPage( AdvWnd, _("Advanced Settings") ); wxSizer *MainSizer = new wxBoxSizer(wxVERTICAL); MainSizer->Add(MainNB,1,wxEXPAND|wxALL,5); diff --git a/core/subtitle_format_prs.cpp b/core/subtitle_format_prs.cpp index d184c24be..99fadc8d4 100644 --- a/core/subtitle_format_prs.cpp +++ b/core/subtitle_format_prs.cpp @@ -135,8 +135,8 @@ void PRSSubtitleFormat::WriteFile(wxString filename,wxString encoding) { // Update progress progress->SetProgress(drawn,toDraw); - progress->SetText(wxString::Format(_T("Writing PRS file. Line: %i/%i"),framen,totalFrames)); - drawn++; + progress->SetText(wxString::Format(_T("Writing PRS file. Line: %i/%i (%.2f%%)"),framen,totalFrames,MIN(float(drawn)*100/toDraw,100.0))); + if (frames[framen] == 2) drawn++; // Read the frame image PVideoFrame frame1 = clip1->GetFrame(framen,env1); @@ -381,7 +381,7 @@ std::vector PRSSubtitleFormat::GetFrameRanges() { AssDialogue *diag = AssEntry::GetAsDialogue(*cur); // Dialogue found - if (diag) { + if (diag && !diag->Comment) { // Parse tags diag->ParseASSTags(); @@ -412,8 +412,8 @@ std::vector PRSSubtitleFormat::GetFrameRanges() { size_t end = VFR_Output.GetFrameAtTime(diag->End.GetMS(),false); // Ensure that the vector is long enough - // Yes, +2, this is an optimization for something below - if (frames.size() <= end) frames.resize(end+2); + // Yes, +1, this is an optimization for something below + if (frames.size() <= end+1) frames.resize(end+2); // Fill data // 2 = Store this frame