From 159f31e1d178b198e4acacee41c421759ee94552 Mon Sep 17 00:00:00 2001 From: niksedk Date: Tue, 12 Oct 2010 17:48:52 +0000 Subject: [PATCH] readying for se 3.0... trying again - unstable inet connection :( git-svn-id: https://subtitleedit.googlecode.com/svn/trunk@27 99eadd0c-20b8-1223-b5c4-2a2b2df33de2 --- src/Forms/Main.cs | 3 ++- src/Icons/SE.ico | Bin 0 -> 25214 bytes src/Properties/AssemblyInfo.cs | 8 ++++---- src/SubtitleEdit.csproj | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/Icons/SE.ico diff --git a/src/Forms/Main.cs b/src/Forms/Main.cs index 92dbe3cbb..5855f4b6a 100644 --- a/src/Forms/Main.cs +++ b/src/Forms/Main.cs @@ -87,7 +87,7 @@ namespace Nikse.SubtitleEdit.Forms if (versionInfo.Length >= 3 && versionInfo[2] != "0") _title += "." + versionInfo[2]; - _title = "Subtitle Edit 3.0 RC1"; + _title = "Subtitle Edit 3.0 RC2"; } return _title; @@ -176,6 +176,7 @@ namespace Nikse.SubtitleEdit.Forms panelWaveFormControls.Visible = Configuration.Settings.General.ShowWaveForm; trackBarWaveFormPosition.Visible = Configuration.Settings.General.ShowWaveForm; toolStripButtonToogleWaveForm.Checked = Configuration.Settings.General.ShowWaveForm; + toolStripButtonToogleVideo.Checked = Configuration.Settings.General.ShowVideoPlayer; string fileName = string.Empty; string[] args = Environment.GetCommandLineArgs(); diff --git a/src/Icons/SE.ico b/src/Icons/SE.ico new file mode 100644 index 0000000000000000000000000000000000000000..9acdc480b115480a272038be24f9eb9cdce6ae2d GIT binary patch literal 25214 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 literal 0 HcmV?d00001 diff --git a/src/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs index f53f00e11..2657c85b8 100644 --- a/src/Properties/AssemblyInfo.cs +++ b/src/Properties/AssemblyInfo.cs @@ -6,11 +6,11 @@ using System.Runtime.InteropServices; // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("SubtitleEdit")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Subtitle Edit")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("Nikse")] [assembly: AssemblyProduct("SubtitleEdit")] -[assembly: AssemblyCopyright("")] +[assembly: AssemblyCopyright("Nikse")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,4 +31,4 @@ using System.Runtime.InteropServices; // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -//[assembly: AssemblyVersion("3.0.0.*")] +[assembly: AssemblyVersion("3.0.0.*")] diff --git a/src/SubtitleEdit.csproj b/src/SubtitleEdit.csproj index 2a91977bf..15792b935 100644 --- a/src/SubtitleEdit.csproj +++ b/src/SubtitleEdit.csproj @@ -13,7 +13,7 @@ v2.0 512 false - SE.ico + Icons\SE.ico DCCE7922B5E425ADB221E06DC2FB405664CF8F63 SubtitleEdit_TemporaryKey.pfx true @@ -794,7 +794,7 @@ Designer - +