Mirrors/SubtitleEdit
1
0
Fork 0
mirror of https://github.com/SubtitleEdit/subtitleedit.git synced 2024-10-27 14:32:35 +01:00
Code Issues Projects Releases Wiki Activity

3.2.7

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1120 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2012-04-14 11:18:27 +00:00
parent f53c79a69d
commit abb19c62b3
4 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ChangeLog.txt
View File

@ -1,6 +1,6 @@
Subtitle Edit Changelog
3.2.7 (xth April 2012)
3.2.7 (14th April 2012)
* NEW:
* Added Finnish language - thx Veikko
* Can now import binary subtitle format Cheetah Caption
@ -11,12 +11,13 @@ Subtitle Edit Changelog
* Unbreak/auto-break buttons now also work on selected lines - thx XhmikosR
* EBU stl now also accepts STL 2.4 (besides STL25/STL30) - Thx Axel
* Added shortcut for split line at cursor position - Thx Daniela
* Basque language file updated - thx Xabier Aramendi
* FIXED:
* Crash in "Fix common errors" - thx Dragan B
* New-line character in Final Cut Pro Xml format - thx Axel Schmidt
* Bug in "Import plain text" regarding "Auto split text"
* Crash in AutoBr line
* Crash/bug in vobsub reading - thx T.S.
* Crash/skip-subtitle-bug in vobsub reading - thx T.S.
* Crash when reading vobsub files with errors - thx Sofiaguy
* EBU stl format reading now skips user data - thx Peter
* Fixed crash in MPlayer due to unknown frame rate

21
src/Forms/Main.cs
View File

@ -2266,6 +2266,8 @@ namespace Nikse.SubtitleEdit.Forms
File.Delete(_fileName);
}
if (Control.ModifierKeys == (Keys.Control | Keys.Shift))
allText = allText.Replace("\r\n", "\n");
File.WriteAllText(_fileName, allText, currentEncoding);
_fileDateTime = File.GetLastWriteTime(_fileName);
ShowStatus(string.Format(_language.SavedSubtitleX, _fileName));
@ -10310,6 +10312,25 @@ namespace Nikse.SubtitleEdit.Forms
_timerDoSyntaxColoring.Interval = 100;
_timerDoSyntaxColoring.Tick +=_timerDoSyntaxColoring_Tick;
if (Configuration.Settings.General.ShowBetaStuff)
{
generateDatetimeInfoFromVideoToolStripMenuItem.Visible = true;
toolStripMenuItemApplyDurationLimits.Visible = true;
toolStripMenuItemAlignTop.Visible = true;
toolStripMenuItemAlignMiddle.Visible = true;
toolStripMenuItemLeft.Visible = true;
toolStripMenuItemRight.Visible = true;
}
else
{
generateDatetimeInfoFromVideoToolStripMenuItem.Visible = false;
toolStripMenuItemApplyDurationLimits.Visible = false;
toolStripMenuItemAlignTop.Visible = false;
toolStripMenuItemAlignMiddle.Visible = false;
toolStripMenuItemLeft.Visible = false;
toolStripMenuItemRight.Visible = false;
}
}
void _timerDoSyntaxColoring_Tick(object sender, EventArgs e)

2
src/Forms/Main.resx
View File

@ -681,7 +681,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
CAAAAk1TRnQBSQFMAgEBAgEAAQgBEgEIARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
CAAAAk1TRnQBSQFMAgEBAgEAARABEgEQARIBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

6
src/Logic/Settings.cs
View File

@ -307,6 +307,7 @@ namespace Nikse.SubtitleEdit.Logic
public int ListViewTextWidth { get; set; }
public string VlcWaveTranscodeSettings { get; set; }
public bool UseTimeFormatHHMMSSFF { get; set; }
public bool ShowBetaStuff { get; set; }
public GeneralSettings()
{
@ -375,6 +376,7 @@ namespace Nikse.SubtitleEdit.Logic
ListViewColumsRememberSize = true;
VlcWaveTranscodeSettings = "acodec=s16l,channels=1,ab=64,samplerate=8000";
UseTimeFormatHHMMSSFF = false;
ShowBetaStuff = false;
}
}
@ -998,6 +1000,9 @@ namespace Nikse.SubtitleEdit.Logic
subNode = node.SelectSingleNode("VlcWaveTranscodeSettings");
if (subNode != null)
settings.General.VlcWaveTranscodeSettings = subNode.InnerText.Trim();
subNode = node.SelectSingleNode("ShowBetaStuff");
if (subNode != null)
settings.General.ShowBetaStuff = Convert.ToBoolean(subNode.InnerText.Trim());
settings.Tools = new ToolsSettings();
@ -1671,6 +1676,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("ListViewDurationWidth", settings.General.ListViewDurationWidth.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("ListViewTextWidth", settings.General.ListViewTextWidth.ToString(CultureInfo.InvariantCulture));
textWriter.WriteElementString("VlcWaveTranscodeSettings", settings.General.VlcWaveTranscodeSettings);
textWriter.WriteElementString("ShowBetaStuff", settings.General.ShowBetaStuff.ToString());
textWriter.WriteEndElement();