mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 14:32:35 +01:00
Added setting to always convert to UTF-8
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2125 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
fc6f149faf
commit
b44ec4eb4a
@ -2671,6 +2671,8 @@ namespace Nikse.SubtitleEdit.Forms
|
||||
_converted = true;
|
||||
ShowStatus(string.Format(_language.LoadedSubtitleX, _fileName) + " - " + string.Format(_language.ConvertedToX, format.FriendlyName));
|
||||
}
|
||||
if (Configuration.Settings.General.AutoConvertToUtf8)
|
||||
encoding = Encoding.UTF8;
|
||||
SetEncoding(encoding);
|
||||
|
||||
if (format.GetType() == typeof(SubStationAlpha))
|
||||
|
@ -381,6 +381,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
public double CurrentFrameRate { get; set; }
|
||||
public string DefaultSubtitleFormat { get; set; }
|
||||
public string DefaultEncoding { get; set; }
|
||||
public bool AutoConvertToUtf8 { get; set; }
|
||||
public bool AutoGuessAnsiEncoding { get; set; }
|
||||
public string SubtitleFontName { get; set; }
|
||||
public int SubtitleFontSize { get; set; }
|
||||
@ -481,6 +482,7 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
CenterSubtitleInTextBox = false;
|
||||
DefaultSubtitleFormat = "SubRip";
|
||||
DefaultEncoding = Encoding.UTF8.EncodingName;
|
||||
AutoConvertToUtf8 = false;
|
||||
AutoGuessAnsiEncoding = false;
|
||||
ShowRecentFiles = true;
|
||||
RememberSelectedLine = true;
|
||||
@ -945,6 +947,8 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
{
|
||||
settings = CustomDeserialize(settingsFileName); // 15 msecs
|
||||
|
||||
if (settings.General.AutoConvertToUtf8)
|
||||
settings.General.DefaultEncoding = Encoding.UTF8.EncodingName;
|
||||
//too slow... :( - settings = Deserialize(Configuration.BaseDirectory + "Settings.xml"); // 688 msecs
|
||||
}
|
||||
//catch
|
||||
@ -1089,6 +1093,9 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
subNode = node.SelectSingleNode("DefaultEncoding");
|
||||
if (subNode != null)
|
||||
settings.General.DefaultEncoding = subNode.InnerText;
|
||||
subNode = node.SelectSingleNode("AutoConvertToUtf8");
|
||||
if (subNode != null)
|
||||
settings.General.AutoConvertToUtf8 = Convert.ToBoolean(subNode.InnerText);
|
||||
subNode = node.SelectSingleNode("AutoGuessAnsiEncoding");
|
||||
if (subNode != null)
|
||||
settings.General.AutoGuessAnsiEncoding = Convert.ToBoolean(subNode.InnerText);
|
||||
@ -2248,8 +2255,9 @@ namespace Nikse.SubtitleEdit.Logic
|
||||
textWriter.WriteElementString("ShowWaveform", settings.General.ShowWaveform.ToString());
|
||||
textWriter.WriteElementString("ShowSpectrogram", settings.General.ShowSpectrogram.ToString());
|
||||
textWriter.WriteElementString("DefaultFrameRate", settings.General.DefaultFrameRate.ToString(CultureInfo.InvariantCulture));
|
||||
textWriter.WriteElementString("DefaultSubtitleFormat", settings.General.DefaultSubtitleFormat);
|
||||
textWriter.WriteElementString("DefaultSubtitleFormat", settings.General.DefaultSubtitleFormat);
|
||||
textWriter.WriteElementString("DefaultEncoding", settings.General.DefaultEncoding);
|
||||
textWriter.WriteElementString("AutoConvertToUtf8", settings.General.AutoConvertToUtf8.ToString());
|
||||
textWriter.WriteElementString("AutoGuessAnsiEncoding", settings.General.AutoGuessAnsiEncoding.ToString());
|
||||
textWriter.WriteElementString("SubtitleFontName", settings.General.SubtitleFontName);
|
||||
textWriter.WriteElementString("SubtitleFontSize", settings.General.SubtitleFontSize.ToString());
|
||||
|
Loading…
Reference in New Issue
Block a user