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

"Save as..." now remembers subtitle format

Browse Source 
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@2309 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-12-17 16:56:43 +00:00
parent 2ab7e4b0b2
commit d81b6e2608
4 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Changelog.txt
View File

@ -4,6 +4,7 @@
* NEW:
* Added "File -> Import images"
* Added "Tools -> Merge lines with same text"
* "Save as..." now remembers subtitle format
* IMPROVED:
* Updated Portuguese language file - thx moob
* Updated Vietnamese language file - thx everytime

10
src/Forms/Main.cs
View File

@ -3217,7 +3217,12 @@ namespace Nikse.SubtitleEdit.Forms
private DialogResult FileSaveAs()
{
SubtitleFormat currentFormat = GetCurrentSubtitleFormat();
SubtitleFormat currentFormat = null;
if (!string.IsNullOrEmpty(Configuration.Settings.General.LastSaveAsFormat))
currentFormat = Utilities.GetSubtitleFormatByFriendlyName(Configuration.Settings.General.LastSaveAsFormat);
if (currentFormat == null)
currentFormat = GetCurrentSubtitleFormat();
Utilities.SetSaveDialogFilter(saveFileDialog1, currentFormat);
saveFileDialog1.Title = _language.SaveSubtitleAs;
@ -3260,7 +3265,10 @@ namespace Nikse.SubtitleEdit.Forms
}
if (SaveSubtitle(format) == DialogResult.OK)
{
Configuration.Settings.General.LastSaveAsFormat = format.Name;
SetCurrentFormat(format);
}
}
index++;
}

6
src/Logic/Settings.cs
View File

@ -465,6 +465,7 @@ namespace Nikse.SubtitleEdit.Logic
public bool DisableVideoAutoLoading { get; set; }
public int NewEmptyDefaultMs { get; set; }
public bool RightToLeftMode { get; set; }
public string LastSaveAsFormat { get; set; }
public bool ShowBetaStuff { get; set; }
public GeneralSettings()
@ -544,6 +545,7 @@ namespace Nikse.SubtitleEdit.Logic
MoveVideo100Or500MsPlaySmallSample = false;
DisableVideoAutoLoading = false;
RightToLeftMode = false;
LastSaveAsFormat = string.Empty;
ShowBetaStuff = false;
NewEmptyDefaultMs = 2000;
}
@ -1353,6 +1355,9 @@ namespace Nikse.SubtitleEdit.Logic
subNode = node.SelectSingleNode("RightToLeftMode");
if (subNode != null)
settings.General.RightToLeftMode = Convert.ToBoolean(subNode.InnerText.Trim());
subNode = node.SelectSingleNode("LastSaveAsFormat");
if (subNode != null)
settings.General.LastSaveAsFormat = subNode.InnerText.Trim();
subNode = node.SelectSingleNode("ShowBetaStuff");
if (subNode != null)
settings.General.ShowBetaStuff = Convert.ToBoolean(subNode.InnerText.Trim());
@ -2456,6 +2461,7 @@ namespace Nikse.SubtitleEdit.Logic
textWriter.WriteElementString("MoveVideo100Or500MsPlaySmallSample", settings.General.MoveVideo100Or500MsPlaySmallSample.ToString());
textWriter.WriteElementString("DisableVideoAutoLoading", settings.General.DisableVideoAutoLoading.ToString());
textWriter.WriteElementString("RightToLeftMode", settings.General.RightToLeftMode.ToString());
textWriter.WriteElementString("LastSaveAsFormat", settings.General.LastSaveAsFormat);
textWriter.WriteElementString("ShowBetaStuff", settings.General.ShowBetaStuff.ToString());
textWriter.WriteElementString("NewEmptyDefaultMs", settings.General.NewEmptyDefaultMs.ToString(CultureInfo.InvariantCulture));

2
src/Logic/Utilities.cs
View File

@ -190,7 +190,7 @@ namespace Nikse.SubtitleEdit.Logic
{
foreach (SubtitleFormat format in SubtitleFormat.AllSubtitleFormats)
{
if (format.FriendlyName == friendlyName)
if (format.FriendlyName == friendlyName || format.Name == friendlyName)
return format;
}
return null;