From f6127e717ab83d0903a4b74d085750ebd6ccde39 Mon Sep 17 00:00:00 2001 From: Rodrigo Braz Monteiro Date: Sat, 1 Jul 2006 05:15:56 +0000 Subject: [PATCH] Originally committed to SVN as r450. --- core/ass_file.cpp | 5 +++++ core/changelog.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/core/ass_file.cpp b/core/ass_file.cpp index 716f04a59..78601cd1d 100644 --- a/core/ass_file.cpp +++ b/core/ass_file.cpp @@ -195,6 +195,7 @@ bool AssFile::CanSave() { AssStyle defstyle; AssStyle *curstyle; AssDialogue *curdiag; + AssAttachment *attach; for (entryIter cur=Line.begin();cur!=Line.end();cur++) { // Check style, if anything non-default is found, return false curstyle = AssEntry::GetAsStyle(*cur); @@ -202,6 +203,10 @@ bool AssFile::CanSave() { if (curstyle->GetEntryData() != defstyle.GetEntryData()) return false; } + // Check for attachments, if any is found, return false + attach = AssEntry::GetAsAttachment(*cur); + if (attach) return false; + // Check dialog curdiag = AssEntry::GetAsDialogue(*cur); if (curdiag) { diff --git a/core/changelog.txt b/core/changelog.txt index 40eb5ae13..34995391d 100644 --- a/core/changelog.txt +++ b/core/changelog.txt @@ -56,7 +56,6 @@ Please visit http://aegisub.net to download latest version - Better error reporting when loading Automation scripts (jfs) - Attempting to load a file which does not exist no longer unloads previous subtitles. (AMZ) - Dragging timecode files into the Aegisub window will now work as expected (instead of attempting to load it as subtitles). (AMZ) -- The line timing extending in timing post-processor is now governed by the "timing processor adjascent bias" option (1.0 [default] = move end, 0.0 = move start, 0.5 = move to halfway point, etc) (AMZ) - Middle clicking the video seek bar and audio display will now focus them. (AMZ) - Search and Replace dialogue made modeless. (Pomyk) - Fixed bug related to moving elements up and down in File Export dialog. (Pomyk) @@ -84,6 +83,7 @@ Please visit http://aegisub.net to download latest version - The manual has been extensively re-written and extended to include documentation about a lot of new (and some not so new) features. It's reasonably complete... for the moment. (TheFluff, Motoko-chan, AMZ, others) - Text edit boxes in the subtitle editing area will now revert to unmodified if you restore the original text. (AMZ) - Re-arranged the controls in the subtitle editing area. (AMZ) +- Added a text box in subtitle editing area to edit the "Effect" field. (AMZ) - Right-clicking on the header of the subtitles grid will now bring up a popup menu that allows you to disable columns. (AMZ) - Saving back to SRT directly (that is, via "save", not "export" or "save as") is now allowed, as long as no data will be lost. (AMZ) - Aegisub now supports file attachments, which are stored decoded (to save memory) and are not part of the undo stack (for the same reason). Previously, they were simply left ignored in the file as unknown lines. (AMZ)