diff --git a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj index 31c8844..9569767 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj +++ b/Advanced Software Engineering/Advanced Software Engineering/Advanced Software Engineering.csproj @@ -66,11 +66,17 @@ + + True + True + Resources.resx + + @@ -144,14 +150,9 @@ ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - SettingsSingleFileGenerator Settings.Designer.cs @@ -179,7 +180,7 @@ - + diff --git a/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.Designer.cs index c7b985d..fc87604 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.Designer.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.Designer.cs @@ -73,9 +73,9 @@ namespace Advanced_Software_Engineering.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap info3 { + internal static System.Drawing.Bitmap info { get { - object obj = ResourceManager.GetObject("info3", resourceCulture); + object obj = ResourceManager.GetObject("info", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } diff --git a/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.resx b/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.resx index ff14d44..a518e6b 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.resx +++ b/Advanced Software Engineering/Advanced Software Engineering/Properties/Resources.resx @@ -1,17 +1,17 @@  - @@ -121,8 +121,8 @@ ..\Resources\error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\info3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\info.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\warning.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/Advanced Software Engineering/Advanced Software Engineering/Resources/info3.png b/Advanced Software Engineering/Advanced Software Engineering/Resources/info.png similarity index 100% rename from Advanced Software Engineering/Advanced Software Engineering/Resources/info3.png rename to Advanced Software Engineering/Advanced Software Engineering/Resources/info.png diff --git a/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs index e3d6dfc..d4a3806 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Windows/ErrorWindow.cs @@ -33,7 +33,7 @@ namespace Advanced_Software_Engineering { protected Dictionary IMAGEDIR = new Dictionary { { ERROR_MESSAGE, Properties.Resources.error }, { WARNING_MESSAGE, Properties.Resources.warning }, - { INFO_MESSAGE, Properties.Resources.info3 } + { INFO_MESSAGE, Properties.Resources.info } }; /// diff --git a/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs b/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs index 30cb327..813b268 100644 --- a/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs +++ b/Advanced Software Engineering/Advanced Software Engineering/Windows/TextEditor.Designer.cs @@ -180,7 +180,7 @@ namespace Advanced_Software_Engineering // this.label1.AutoSize = true; this.label1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label1.Location = new System.Drawing.Point(0, 535); + this.label1.Location = new System.Drawing.Point(0, 548); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(0, 13); this.label1.TabIndex = 2;