Menu item in "File" for Import/OCR xsubs

git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1637 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
niksedk 2013-02-18 20:14:46 +00:00
parent bb35e32fea
commit 2e57f30927
5 changed files with 41 additions and 2 deletions

View File

@ -416,6 +416,7 @@
this.imageListPlayRate = new System.Windows.Forms.ImageList(this.components);
this.timerTextUndo = new System.Windows.Forms.Timer(this.components);
this.timerAlternateTextUndo = new System.Windows.Forms.Timer(this.components);
this.toolStripMenuItemImportXSub = new System.Windows.Forms.ToolStripMenuItem();
this.statusStrip1.SuspendLayout();
this.toolStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
@ -832,6 +833,7 @@
this.toolStripMenuItemImportDvdSubtitles,
this.toolStripMenuItemSubIdx,
this.toolStripMenuItemImportBluRaySup,
this.toolStripMenuItemImportXSub,
this.matroskaImportStripMenuItem,
this.toolStripMenuItemManualAnsi,
this.toolStripMenuItemImportText,
@ -4104,6 +4106,13 @@
this.timerAlternateTextUndo.Interval = 700;
this.timerAlternateTextUndo.Tick += new System.EventHandler(this.TimerAlternateTextUndoTick);
//
// toolStripMenuItemImportXSub
//
this.toolStripMenuItemImportXSub.Name = "toolStripMenuItemImportXSub";
this.toolStripMenuItemImportXSub.Size = new System.Drawing.Size(334, 22);
this.toolStripMenuItemImportXSub.Text = "Import/OCR xsub from divx/avi...";
this.toolStripMenuItemImportXSub.Click += new System.EventHandler(this.toolStripMenuItemImportXSub_Click);
//
// Main
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -4570,6 +4579,7 @@
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemModifySelection;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemInverseSelection;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemSpellCheckFromCurrentLine;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItemImportXSub;
}
}

View File

@ -11968,8 +11968,10 @@ namespace Nikse.SubtitleEdit.Forms
{
toolStripMenuItemTTProperties.Visible = false;
}
toolStripSeparator20.Visible = subtitleLoaded;
toolStripMenuItemImportXSub.Visible = !string.IsNullOrEmpty(_language.OpenXSubFiles) && !string.IsNullOrEmpty(_language.XSubFiles);
}
private void toolStripMenuItemOpenContainingFolder_Click(object sender, EventArgs e)
@ -16616,5 +16618,28 @@ namespace Nikse.SubtitleEdit.Forms
SpellCheck(true, FirstSelectedIndex);
}
private void toolStripMenuItemImportXSub_Click(object sender, EventArgs e)
{
if (ContinueNewOrExit())
{
openFileDialog1.Title = _language.OpenXSubFiles;
openFileDialog1.FileName = string.Empty;
openFileDialog1.Filter = _language.XSubFiles + "|*.divx;*.avi";
if (openFileDialog1.ShowDialog(this) == DialogResult.OK)
{
ShowStatus(Configuration.Settings.Language.General.PleaseWait);
if (ImportSubtitleFromDivX(openFileDialog1.FileName))
{
ShowStatus(string.Format(_language.LoadedSubtitleX, openFileDialog1.FileName));
}
else
{
ShowStatus(string.Empty);
MessageBox.Show("Not a valid xsub file!");
}
}
}
}
}
}

View File

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

View File

@ -876,6 +876,8 @@ namespace Nikse.SubtitleEdit.Logic
VobSubFiles = "VobSub subtitle files",
OpenBluRaySupFile = "Open Blu-ray .sup file...",
BluRaySupFiles = "Blu-ray .sup files",
OpenXSubFiles = "Open xsub file...",
XSubFiles = "xsub files",
BeforeImportingVobSubFile = "Before importing VobSub subtitle",
BeforeImportingBluRaySupFile = "Before importing Blu-ray sup file",
BeforeImportingBdnXml = "Before importing BDN xml file",

View File

@ -776,6 +776,8 @@
public string VobSubFiles { get; set; }
public string OpenBluRaySupFile { get; set; }
public string BluRaySupFiles { get; set; }
public string OpenXSubFiles { get; set; }
public string XSubFiles { get; set; }
public string BeforeImportingVobSubFile { get; set; }
public string BeforeImportingBluRaySupFile { get; set; }
public string BeforeImportingBdnXml { get; set; }