From 7be84752a1baf7d7e4f8b2bfb98f94a5a316833c Mon Sep 17 00:00:00 2001 From: Abed Haque Date: Fri, 6 Feb 2015 11:28:57 -0600 Subject: [PATCH] Added FDV installer. --- pc/CODEC2 GUI/CODEC2 GUI.sln | 8 +- pc/CODEC2 GUI/CODEC2 GUI/CODEC2 GUI.csproj | 134 ------------------ pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs | 2 +- .../Properties/Resources.Designer.cs | 46 +++--- .../Properties/Settings.Designer.cs | 22 ++- 5 files changed, 36 insertions(+), 176 deletions(-) delete mode 100644 pc/CODEC2 GUI/CODEC2 GUI/CODEC2 GUI.csproj diff --git a/pc/CODEC2 GUI/CODEC2 GUI.sln b/pc/CODEC2 GUI/CODEC2 GUI.sln index 2272084..17462e8 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI.sln +++ b/pc/CODEC2 GUI/CODEC2 GUI.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CODEC2 GUI", "CODEC2 GUI\CODEC2 GUI.csproj", "{19634B34-7569-4D1D-8182-B10AC27E13FF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FreeDV", "CODEC2 GUI\FreeDV.csproj", "{19634B34-7569-4D1D-8182-B10AC27E13FF}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FlexLib", "..\..\..\smartsdr-win\FlexLib\FlexLib.csproj", "{7927817C-D5EF-4A9E-B38E-29668F308343}" EndProject @@ -11,6 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util", "..\..\..\smartsdr-w EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Vita", "..\..\..\smartsdr-win\Vita\Vita.csproj", "{6ED364FB-7444-44DA-9196-1D8679425B3E}" EndProject +Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "CODEC2_GUI_INSTALLER", "CODEC2_GUI_INSTALLER\CODEC2_GUI_INSTALLER.vdproj", "{AABE6A3C-F038-4448-981F-F68A6D5069C3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -59,6 +61,10 @@ Global {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|Any CPU.Build.0 = Release|Any CPU {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.ActiveCfg = Release|x86 {6ED364FB-7444-44DA-9196-1D8679425B3E}.Release|x86.Build.0 = Release|x86 + {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|Any CPU.ActiveCfg = Debug + {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Debug|x86.ActiveCfg = Debug + {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Release|Any CPU.ActiveCfg = Release + {AABE6A3C-F038-4448-981F-F68A6D5069C3}.Release|x86.ActiveCfg = Release EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/pc/CODEC2 GUI/CODEC2 GUI/CODEC2 GUI.csproj b/pc/CODEC2 GUI/CODEC2 GUI/CODEC2 GUI.csproj deleted file mode 100644 index f61efd0..0000000 --- a/pc/CODEC2 GUI/CODEC2 GUI/CODEC2 GUI.csproj +++ /dev/null @@ -1,134 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {19634B34-7569-4D1D-8182-B10AC27E13FF} - WinExe - Properties - CODEC2_GUI - CODEC2 GUI - v4.0 - Client - 512 - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - x86 - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - Form - - - Form1.cs - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - - - - - {7927817C-D5EF-4A9E-B38E-29668F308343} - FlexLib - - - {9C0AD871-92FD-461B-84FF-3738D701814F} - UiWpfFramework - - - - - False - Microsoft .NET Framework 4 Client Profile %28x86 and x64%29 - true - - - False - .NET Framework 3.5 SP1 Client Profile - false - - - False - .NET Framework 3.5 SP1 - false - - - False - Windows Installer 3.1 - true - - - - - \ No newline at end of file diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs b/pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs index a8de104..2ab430e 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Form1.Designer.cs @@ -47,7 +47,7 @@ this.ClientSize = new System.Drawing.Size(284, 112); this.Controls.Add(this.label1); this.Name = "Form1"; - this.Text = "CODEC2 GUI"; + this.Text = "FreeDV"; this.Load += new System.EventHandler(this.Form1_Load); this.ResumeLayout(false); this.PerformLayout(); diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/Resources.Designer.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/Resources.Designer.cs index d14b3d0..5d29ea5 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/Resources.Designer.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1022 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace CODEC2_GUI.Properties -{ - - +namespace FreeDV.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -22,48 +22,40 @@ namespace CODEC2_GUI.Properties [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - internal class Resources - { - + internal class Resources { + private static global::System.Resources.ResourceManager resourceMan; - + private static global::System.Globalization.CultureInfo resourceCulture; - + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] - internal Resources() - { + internal Resources() { } - + /// /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager - { - get - { - if ((resourceMan == null)) - { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("CODEC2_GUI.Properties.Resources", typeof(Resources).Assembly); + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("FreeDV.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture - { - get - { + internal static global::System.Globalization.CultureInfo Culture { + get { return resourceCulture; } - set - { + set { resourceCulture = value; } } diff --git a/pc/CODEC2 GUI/CODEC2 GUI/Properties/Settings.Designer.cs b/pc/CODEC2 GUI/CODEC2 GUI/Properties/Settings.Designer.cs index ee662b3..d958bdb 100644 --- a/pc/CODEC2 GUI/CODEC2 GUI/Properties/Settings.Designer.cs +++ b/pc/CODEC2 GUI/CODEC2 GUI/Properties/Settings.Designer.cs @@ -1,28 +1,24 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.1022 +// Runtime Version:4.0.30319.34209 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace CODEC2_GUI.Properties -{ - - +namespace FreeDV.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default - { - get - { + + public static Settings Default { + get { return defaultInstance; } }