mirror of
https://github.com/SubtitleEdit/subtitleedit.git
synced 2024-10-27 22:42:38 +01:00
Compare now show filename of current subtitle (if available)
git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1820 99eadd0c-20b8-1223-b5c4-2a2b2df33de2
This commit is contained in:
parent
8ad2ceb7b3
commit
9e483ef9c5
3
src/Forms/Compare.Designer.cs
generated
3
src/Forms/Compare.Designer.cs
generated
@ -200,6 +200,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.subtitleListView2.Size = new System.Drawing.Size(478, 430);
|
this.subtitleListView2.Size = new System.Drawing.Size(478, 430);
|
||||||
this.subtitleListView2.TabIndex = 9;
|
this.subtitleListView2.TabIndex = 9;
|
||||||
this.subtitleListView2.UseCompatibleStateImageBehavior = false;
|
this.subtitleListView2.UseCompatibleStateImageBehavior = false;
|
||||||
|
this.subtitleListView2.UseSyntaxColoring = true;
|
||||||
this.subtitleListView2.View = System.Windows.Forms.View.Details;
|
this.subtitleListView2.View = System.Windows.Forms.View.Details;
|
||||||
this.subtitleListView2.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView2SelectedIndexChanged);
|
this.subtitleListView2.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView2SelectedIndexChanged);
|
||||||
this.subtitleListView2.Enter += new System.EventHandler(this.SubtitleListView2Enter);
|
this.subtitleListView2.Enter += new System.EventHandler(this.SubtitleListView2Enter);
|
||||||
@ -219,6 +220,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.subtitleListView1.Size = new System.Drawing.Size(476, 430);
|
this.subtitleListView1.Size = new System.Drawing.Size(476, 430);
|
||||||
this.subtitleListView1.TabIndex = 7;
|
this.subtitleListView1.TabIndex = 7;
|
||||||
this.subtitleListView1.UseCompatibleStateImageBehavior = false;
|
this.subtitleListView1.UseCompatibleStateImageBehavior = false;
|
||||||
|
this.subtitleListView1.UseSyntaxColoring = true;
|
||||||
this.subtitleListView1.View = System.Windows.Forms.View.Details;
|
this.subtitleListView1.View = System.Windows.Forms.View.Details;
|
||||||
this.subtitleListView1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView1SelectedIndexChanged);
|
this.subtitleListView1.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView1SelectedIndexChanged);
|
||||||
//
|
//
|
||||||
@ -246,7 +248,6 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
this.MinimumSize = new System.Drawing.Size(800, 400);
|
this.MinimumSize = new System.Drawing.Size(800, 400);
|
||||||
this.Name = "Compare";
|
this.Name = "Compare";
|
||||||
this.ShowIcon = false;
|
this.ShowIcon = false;
|
||||||
this.ShowInTaskbar = false;
|
|
||||||
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
|
||||||
this.Text = "Compare subtitles";
|
this.Text = "Compare subtitles";
|
||||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Compare_FormClosing);
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Compare_FormClosing);
|
||||||
|
@ -61,7 +61,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
labelStatus.Text = string.Empty;
|
labelStatus.Text = string.Empty;
|
||||||
_subtitle1 = subtitle1;
|
_subtitle1 = subtitle1;
|
||||||
labelSubtitle1.Text = subtitleFileName1;
|
labelSubtitle1.Text = subtitleFileName1;
|
||||||
if (!string.IsNullOrEmpty(title))
|
if (string.IsNullOrEmpty(subtitleFileName1))
|
||||||
labelSubtitle1.Text = title;
|
labelSubtitle1.Text = title;
|
||||||
subtitleListView1.Fill(subtitle1);
|
subtitleListView1.Fill(subtitle1);
|
||||||
|
|
||||||
|
@ -10408,7 +10408,7 @@ namespace Nikse.SubtitleEdit.Forms
|
|||||||
compareForm.Initialize(_subtitle, _fileName, _subtitleAlternate, _subtitleAlternateFileName);
|
compareForm.Initialize(_subtitle, _fileName, _subtitleAlternate, _subtitleAlternateFileName);
|
||||||
else
|
else
|
||||||
compareForm.Initialize(_subtitle, _fileName, Configuration.Settings.Language.General.CurrentSubtitle);
|
compareForm.Initialize(_subtitle, _fileName, Configuration.Settings.Language.General.CurrentSubtitle);
|
||||||
compareForm.Show();
|
compareForm.Show(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ToolStripMenuItemAutoBreakLinesClick(object sender, EventArgs e)
|
private void ToolStripMenuItemAutoBreakLinesClick(object sender, EventArgs e)
|
||||||
|
@ -681,7 +681,7 @@
|
|||||||
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
|
||||||
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
|
||||||
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2
|
||||||
CAAAAk1TRnQBSQFMAgEBAgEAAUgBHgFIAR4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
CAAAAk1TRnQBSQFMAgEBAgEAAVABHgFQAR4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
|
||||||
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
|
||||||
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
|
||||||
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
|
||||||
|
Loading…
Reference in New Issue
Block a user