From c48c3993a574588b938e651851b8568a82a0c823 Mon Sep 17 00:00:00 2001 From: Niko Ehrenfeuchter <nikolaus.ehrenfeuchter@unibas.ch> Date: Thu, 1 Feb 2018 01:20:06 +0100 Subject: [PATCH] Rename "ATXTray" to "ATxTray". --- {ATXTray => ATxTray}/ATXTray.csproj | 5 ++- {ATXTray => ATxTray}/AutoTxTray.cs | 2 +- {ATXTray => ATxTray}/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/Resources.Designer.cs | 44 ++++++++----------- .../Properties/Settings.Designer.cs | 22 ++++------ AutoTx.sln | 2 +- 7 files changed, 35 insertions(+), 46 deletions(-) rename {ATXTray => ATxTray}/ATXTray.csproj (97%) rename {ATXTray => ATxTray}/AutoTxTray.cs (99%) rename {ATXTray => ATxTray}/Program.cs (95%) rename {ATXTray => ATxTray}/Properties/AssemblyInfo.cs (94%) rename {ATXTray => ATxTray}/Properties/Resources.Designer.cs (86%) rename {ATXTray => ATxTray}/Properties/Settings.Designer.cs (83%) diff --git a/ATXTray/ATXTray.csproj b/ATxTray/ATXTray.csproj similarity index 97% rename from ATXTray/ATXTray.csproj rename to ATxTray/ATXTray.csproj index d3f0902..50ac413 100644 --- a/ATXTray/ATXTray.csproj +++ b/ATxTray/ATXTray.csproj @@ -7,8 +7,8 @@ <ProjectGuid>{0CEB80C5-65DB-406B-BCFA-4D0474C2309B}</ProjectGuid> <OutputType>WinExe</OutputType> <AppDesignerFolder>Properties</AppDesignerFolder> - <RootNamespace>ATXTray</RootNamespace> - <AssemblyName>ATXTray</AssemblyName> + <RootNamespace>ATxTray</RootNamespace> + <AssemblyName>ATxTray</AssemblyName> <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileAlignment>512</FileAlignment> </PropertyGroup> @@ -74,6 +74,7 @@ <Compile Include="Properties\Resources.Designer.cs"> <AutoGen>True</AutoGen> <DependentUpon>Resources.resx</DependentUpon> + <DesignTime>True</DesignTime> </Compile> <None Include="packages.config" /> <None Include="Properties\Settings.settings"> diff --git a/ATXTray/AutoTxTray.cs b/ATxTray/AutoTxTray.cs similarity index 99% rename from ATXTray/AutoTxTray.cs rename to ATxTray/AutoTxTray.cs index 311fa6c..256b62c 100644 --- a/ATXTray/AutoTxTray.cs +++ b/ATxTray/AutoTxTray.cs @@ -11,7 +11,7 @@ using NLog.Config; using NLog.Targets; using Timer = System.Timers.Timer; -namespace ATXTray +namespace ATxTray { public class AutoTxTray : ApplicationContext { diff --git a/ATXTray/Program.cs b/ATxTray/Program.cs similarity index 95% rename from ATXTray/Program.cs rename to ATxTray/Program.cs index adc49d6..33d4380 100644 --- a/ATXTray/Program.cs +++ b/ATxTray/Program.cs @@ -1,7 +1,7 @@ using System; using System.Windows.Forms; -namespace ATXTray +namespace ATxTray { internal static class Program { diff --git a/ATXTray/Properties/AssemblyInfo.cs b/ATxTray/Properties/AssemblyInfo.cs similarity index 94% rename from ATXTray/Properties/AssemblyInfo.cs rename to ATxTray/Properties/AssemblyInfo.cs index 0dfbe94..e309ac8 100644 --- a/ATXTray/Properties/AssemblyInfo.cs +++ b/ATxTray/Properties/AssemblyInfo.cs @@ -5,11 +5,11 @@ using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. -[assembly: AssemblyTitle("ATXTray")] +[assembly: AssemblyTitle("ATxTray")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Universitaet Basel")] -[assembly: AssemblyProduct("ATXTray")] +[assembly: AssemblyProduct("ATxTray")] [assembly: AssemblyCopyright("Copyright © Universitaet Basel 2018")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/ATXTray/Properties/Resources.Designer.cs b/ATxTray/Properties/Resources.Designer.cs similarity index 86% rename from ATXTray/Properties/Resources.Designer.cs rename to ATxTray/Properties/Resources.Designer.cs index 5d0d9dc..394274b 100644 --- a/ATXTray/Properties/Resources.Designer.cs +++ b/ATxTray/Properties/Resources.Designer.cs @@ -8,10 +8,10 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace ATXTray.Properties -{ - - +namespace ATxTray.Properties { + using System; + + /// <summary> /// A strongly-typed resource class, for looking up localized strings, etc. /// </summary> @@ -22,48 +22,40 @@ namespace ATXTray.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() { } - + /// <summary> /// Returns the cached ResourceManager instance used by this class. /// </summary> [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("ATXTray.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("ATxTray.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; } } - + /// <summary> /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// </summary> [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/ATXTray/Properties/Settings.Designer.cs b/ATxTray/Properties/Settings.Designer.cs similarity index 83% rename from ATXTray/Properties/Settings.Designer.cs rename to ATxTray/Properties/Settings.Designer.cs index 6eec4f8..d42e625 100644 --- a/ATXTray/Properties/Settings.Designer.cs +++ b/ATxTray/Properties/Settings.Designer.cs @@ -8,21 +8,17 @@ // </auto-generated> //------------------------------------------------------------------------------ -namespace ATXTray.Properties -{ - - +namespace ATxTray.Properties { + + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase - { - + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "12.0.0.0")] + 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; } } diff --git a/AutoTx.sln b/AutoTx.sln index 20e2018..35e8ffc 100644 --- a/AutoTx.sln +++ b/AutoTx.sln @@ -9,7 +9,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxCommon", "ATxCommon\ATxC EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxConfigTest", "ATxConfigTest\ATxConfigTest.csproj", "{81E0A5AC-0E0D-4F98-B399-41A58612EF33}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATXTray", "ATXTray\ATXTray.csproj", "{0CEB80C5-65DB-406B-BCFA-4D0474C2309B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ATxTray", "ATxTray\ATxTray.csproj", "{0CEB80C5-65DB-406B-BCFA-4D0474C2309B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution -- GitLab