From 9e483ef9c5beff35823adf906401416edc25980a Mon Sep 17 00:00:00 2001 From: niksedk Date: Tue, 30 Apr 2013 13:21:48 +0000 Subject: [PATCH] Compare now show filename of current subtitle (if available) git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@1820 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/Compare.Designer.cs | 3 ++- src/Forms/Compare.cs | 2 +- src/Forms/Main.cs | 2 +- src/Forms/Main.resx | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Forms/Compare.Designer.cs b/src/Forms/Compare.Designer.cs index 25f7391d1..12d8d7246 100644 --- a/src/Forms/Compare.Designer.cs +++ b/src/Forms/Compare.Designer.cs @@ -200,6 +200,7 @@ namespace Nikse.SubtitleEdit.Forms this.subtitleListView2.Size = new System.Drawing.Size(478, 430); this.subtitleListView2.TabIndex = 9; this.subtitleListView2.UseCompatibleStateImageBehavior = false; + this.subtitleListView2.UseSyntaxColoring = true; this.subtitleListView2.View = System.Windows.Forms.View.Details; this.subtitleListView2.SelectedIndexChanged += new System.EventHandler(this.SubtitleListView2SelectedIndexChanged); 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.TabIndex = 7; this.subtitleListView1.UseCompatibleStateImageBehavior = false; + this.subtitleListView1.UseSyntaxColoring = true; this.subtitleListView1.View = System.Windows.Forms.View.Details; 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.Name = "Compare"; this.ShowIcon = false; - this.ShowInTaskbar = false; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Compare subtitles"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Compare_FormClosing); diff --git a/src/Forms/Compare.cs b/src/Forms/Compare.cs index 64b60714a..d2d07b2ce 100644 --- a/src/Forms/Compare.cs +++ b/src/Forms/Compare.cs @@ -61,7 +61,7 @@ namespace Nikse.SubtitleEdit.Forms labelStatus.Text = string.Empty; _subtitle1 = subtitle1; labelSubtitle1.Text = subtitleFileName1; - if (!string.IsNullOrEmpty(title)) + if (string.IsNullOrEmpty(subtitleFileName1)) labelSubtitle1.Text = title; subtitleListView1.Fill(subtitle1); diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index a9979734a..53a389801 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -10408,7 +10408,7 @@ namespace Nikse.SubtitleEdit.Forms compareForm.Initialize(_subtitle, _fileName, _subtitleAlternate, _subtitleAlternateFileName); else compareForm.Initialize(_subtitle, _fileName, Configuration.Settings.Language.General.CurrentSubtitle); - compareForm.Show(); + compareForm.Show(this); } private void ToolStripMenuItemAutoBreakLinesClick(object sender, EventArgs e) diff --git a/src/Forms/Main.resx b/src/Forms/Main.resx index a8461eb1b..06c582fd9 100644 --- a/src/Forms/Main.resx +++ b/src/Forms/Main.resx @@ -681,7 +681,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAD2 - CAAAAk1TRnQBSQFMAgEBAgEAAUgBHgFIAR4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CAAAAk1TRnQBSQFMAgEBAgEAAVABHgFQAR4BEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA