From 337177bf8cc7ac332c679b20fbfce03bad7a0884 Mon Sep 17 00:00:00 2001 From: Nathan Crawford Date: Sun, 13 Feb 2011 02:07:37 +0000 Subject: [PATCH] Fixed build error, lots of changes for VS2010 files --- PesFile/PesFile-2010.csproj | 40 +++++++++++++++-- PesFile/Properties/AssemblyInfo.cs | 4 +- embroideryInfo/embroideryInfo-2010.csproj | 45 +++++++++++++++++-- embroideryReader-2010.sln | 38 +++------------- embroideryReader/EmbroideryReaderSettings.cs | 42 ++++++++++------- embroideryReader/Properties/AssemblyInfo.cs | 8 ++-- .../Properties/Resources-2010.Designer.cs | 4 +- .../Properties/Settings-2010.Designer.cs | 4 +- embroideryReader/embroideryReader-2010.csproj | 43 ++++++++++++++++-- .../Properties/Resources-2010.Designer.cs | 4 +- .../Properties/Settings-2010.Designer.cs | 4 +- embroideryTester/embroideryTester-2010.csproj | 43 ++++++++++++++++-- embroideryThumbs/embroideryThumbs-2010.csproj | 42 +++++++++++++++-- 13 files changed, 242 insertions(+), 79 deletions(-) diff --git a/PesFile/PesFile-2010.csproj b/PesFile/PesFile-2010.csproj index c894659..9ce723d 100644 --- a/PesFile/PesFile-2010.csproj +++ b/PesFile/PesFile-2010.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,10 +12,26 @@ PesFile - 2.0 - v3.5 + 3.5 + v2.0 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -43,6 +60,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + - + \ No newline at end of file diff --git a/embroideryReader-2010.sln b/embroideryReader-2010.sln index 5f47124..efd700a 100644 --- a/embroideryReader-2010.sln +++ b/embroideryReader-2010.sln @@ -1,41 +1,17 @@  -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual C# Express 2008 +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{1BA749B5-4B20-4C6A-AAE0-57F3A718B6E7}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryReader", "embroideryReader\embroideryReader-2010.csproj", "{0A9A24AD-60F0-4664-BCC6-2B98B3E8B565}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryReader-2010", "embroideryReader\embroideryReader-2010.csproj", "{0A9A24AD-60F0-4664-BCC6-2B98B3E8B565}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryTester", "embroideryTester\embroideryTester-2010.csproj", "{A80DF4D8-967D-4352-9E1D-F22D23236BE2}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryTester-2010", "embroideryTester\embroideryTester-2010.csproj", "{A80DF4D8-967D-4352-9E1D-F22D23236BE2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryInfo", "embroideryInfo\embroideryInfo-2010.csproj", "{1E3B0E33-E0BC-41C1-B1B3-7CADD39BE362}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryInfo-2010", "embroideryInfo\embroideryInfo-2010.csproj", "{1E3B0E33-E0BC-41C1-B1B3-7CADD39BE362}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PesFile", "PesFile\PesFile-2010.csproj", "{66EF662E-F52C-4104-9C15-A14266D8F3B8}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PesFile-2010", "PesFile\PesFile-2010.csproj", "{66EF662E-F52C-4104-9C15-A14266D8F3B8}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryThumbs", "embroideryThumbs\embroideryThumbs-2010.csproj", "{978B855C-C9CD-4A5E-A335-9ED8DD3E001A}" - ProjectSection(WebsiteProperties) = preProject - Debug.AspNetCompiler.Debug = "True" - Release.AspNetCompiler.Debug = "False" - EndProjectSection +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "embroideryThumbs-2010", "embroideryThumbs\embroideryThumbs-2010.csproj", "{978B855C-C9CD-4A5E-A335-9ED8DD3E001A}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/embroideryReader/EmbroideryReaderSettings.cs b/embroideryReader/EmbroideryReaderSettings.cs index ff6698b..c0fb728 100644 --- a/embroideryReader/EmbroideryReaderSettings.cs +++ b/embroideryReader/EmbroideryReaderSettings.cs @@ -51,8 +51,8 @@ namespace embroideryReader private const String SETTING_LAST_SAVE_IMAGE_LOCATION = "last save image location"; - private const String SETTING_WINDOW_WIDTH = "window width"; - private const String SETTING_WINDOW_HEIGHT = "window height"; + private const String SETTING_WINDOW_WIDTH = "window width"; + private const String SETTING_WINDOW_HEIGHT = "window height"; private const String VALUE_YES = "yes"; private const String VALUE_NO = "no"; @@ -283,27 +283,39 @@ namespace embroideryReader } } - public int windowWidth - { + public int windowWidth + { get - { - return settings.getValue(SETTING_WINDOW_WIDTH); - } - set - { - settings.setValue(SETTING_WINDOW_WIDTH, value); - } - } + { + Int32 retval; + string temp = settings.getValue(SETTING_WINDOW_WIDTH); + if(!Int32.TryParse(temp, out retval)) + { + retval = 300; + } + return retval; + } + set + { + settings.setValue(SETTING_WINDOW_WIDTH, value.ToString()); + } + } - public int windowHeight + public int windowHeight { get { - return settings.getValue(SETTING_WINDOW_HEIGHT); + Int32 retval; + string temp = settings.getValue(SETTING_WINDOW_HEIGHT); + if (!Int32.TryParse(temp, out retval)) + { + retval = 300; + } + return retval; } set { - settings.setValue(SETTING_WINDOW_HEIGHT, value); + settings.setValue(SETTING_WINDOW_HEIGHT, value.ToString()); } } } diff --git a/embroideryReader/Properties/AssemblyInfo.cs b/embroideryReader/Properties/AssemblyInfo.cs index 91c896e..f755d9c 100644 --- a/embroideryReader/Properties/AssemblyInfo.cs +++ b/embroideryReader/Properties/AssemblyInfo.cs @@ -1,7 +1,7 @@ /* Embridery Reader - an application to view .pes embroidery designs -Copyright (C) 2009 Nathan Crawford +Copyright (C) 2011 Nathan Crawford This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -35,7 +35,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] [assembly: AssemblyProduct("Embroidery Reader")] -[assembly: AssemblyCopyright("Copyright © Nathan Crawford 2010")] +[assembly: AssemblyCopyright("Copyright © Nathan Crawford 2011")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -54,5 +54,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("1.3.0.18")] -[assembly: AssemblyFileVersion("1.3.0.18")] +[assembly: AssemblyVersion("1.5.0.0")] +[assembly: AssemblyFileVersion("1.5.0.0")] diff --git a/embroideryReader/Properties/Resources-2010.Designer.cs b/embroideryReader/Properties/Resources-2010.Designer.cs index 981f63b..beccfdb 100644 --- a/embroideryReader/Properties/Resources-2010.Designer.cs +++ b/embroideryReader/Properties/Resources-2010.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -19,7 +19,7 @@ namespace embroideryReader.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [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 { diff --git a/embroideryReader/Properties/Settings-2010.Designer.cs b/embroideryReader/Properties/Settings-2010.Designer.cs index 51bc166..4cec02e 100644 --- a/embroideryReader/Properties/Settings-2010.Designer.cs +++ b/embroideryReader/Properties/Settings-2010.Designer.cs @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:2.0.50727.4200 +// Runtime Version:4.0.30319.1 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -12,7 +12,7 @@ namespace embroideryReader.Properties { [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "9.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "10.0.0.0")] internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); diff --git a/embroideryReader/embroideryReader-2010.csproj b/embroideryReader/embroideryReader-2010.csproj index 9838349..c9c17df 100644 --- a/embroideryReader/embroideryReader-2010.csproj +++ b/embroideryReader/embroideryReader-2010.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -12,10 +13,26 @@ icon.ico - 2.0 - v3.5 + 3.5 + v2.0 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -95,6 +112,7 @@ Resources.resx True + SettingsSingleFileGenerator Settings-2010.Designer.cs @@ -114,6 +132,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + + - + \ No newline at end of file diff --git a/embroideryThumbs/embroideryThumbs-2010.csproj b/embroideryThumbs/embroideryThumbs-2010.csproj index 9305146..d6ec89a 100644 --- a/embroideryThumbs/embroideryThumbs-2010.csproj +++ b/embroideryThumbs/embroideryThumbs-2010.csproj @@ -1,4 +1,5 @@ - + + Debug AnyCPU @@ -11,10 +12,26 @@ embroideryThumbs - 2.0 - v3.5 + 3.5 + v2.0 + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true @@ -52,6 +69,23 @@ PesFile + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +