diff --git a/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj b/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj index 7847dfc5..62aed37c 100644 --- a/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj +++ b/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj @@ -1,7 +1,8 @@  - anx.ico + + @@ -137,6 +138,11 @@ FirstStartScreen.cs + + True + True + Resources.resx + @@ -171,22 +177,11 @@ - - ErrorLogScreen.cs - - - MainWindow.cs - ResXFileCodeGenerator - Resources.Designer.cs Designer + Resources.Designer.cs - - True - Resources.resx - True - ResXFileCodeGenerator ShowStrings.Designer.cs @@ -219,7 +214,7 @@ - + diff --git a/Tools/ANXContentCompilerGUI/Dialogues/ErrorLogScreen.resx b/Tools/ANXContentCompilerGUI/Dialogues/ErrorLogScreen.resx deleted file mode 100644 index 29dcb1b3..00000000 --- a/Tools/ANXContentCompilerGUI/Dialogues/ErrorLogScreen.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs b/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs index 62c8d97b..4f21e251 100644 --- a/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs +++ b/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs @@ -428,7 +428,7 @@ namespace ANX.ContentCompiler.GUI this.splitContainerProperties.Panel2.Controls.Add(this.propertyGrid); this.splitContainerProperties.Panel2.ForeColor = System.Drawing.Color.White; this.splitContainerProperties.Size = new System.Drawing.Size(640, 549); - this.splitContainerProperties.SplitterDistance = 366; + this.splitContainerProperties.SplitterDistance = 395; this.splitContainerProperties.TabIndex = 0; // // show_labelDesc @@ -471,7 +471,7 @@ namespace ANX.ContentCompiler.GUI this.editingState.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.editingState.Location = new System.Drawing.Point(0, 0); this.editingState.Name = "editingState"; - this.editingState.Size = new System.Drawing.Size(364, 547); + this.editingState.Size = new System.Drawing.Size(393, 547); this.editingState.TabIndex = 1; this.editingState.Visible = false; // @@ -481,7 +481,7 @@ namespace ANX.ContentCompiler.GUI this.startState.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.startState.Location = new System.Drawing.Point(0, 0); this.startState.Name = "startState"; - this.startState.Size = new System.Drawing.Size(364, 547); + this.startState.Size = new System.Drawing.Size(393, 547); this.startState.TabIndex = 0; this.startState.Visible = false; // @@ -504,7 +504,7 @@ namespace ANX.ContentCompiler.GUI this.labelProperties.ForeColor = System.Drawing.Color.White; this.labelProperties.Location = new System.Drawing.Point(3, 0); this.labelProperties.Name = "labelProperties"; - this.labelProperties.Size = new System.Drawing.Size(264, 19); + this.labelProperties.Size = new System.Drawing.Size(235, 19); this.labelProperties.TabIndex = 2; this.labelProperties.Text = "Properties"; this.labelProperties.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -525,7 +525,7 @@ namespace ANX.ContentCompiler.GUI this.propertyGrid.LineColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.propertyGrid.Location = new System.Drawing.Point(3, 22); this.propertyGrid.Name = "propertyGrid"; - this.propertyGrid.Size = new System.Drawing.Size(264, 503); + this.propertyGrid.Size = new System.Drawing.Size(235, 503); this.propertyGrid.TabIndex = 0; this.propertyGrid.ViewBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(44)))), ((int)(((byte)(44))))); this.propertyGrid.ViewForeColor = System.Drawing.Color.White; @@ -560,7 +560,6 @@ namespace ANX.ContentCompiler.GUI this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Name = "MainWindow"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; this.Text = "ANX Content Compiler"; diff --git a/Tools/ANXContentCompilerGUI/MainWindow.cs b/Tools/ANXContentCompilerGUI/MainWindow.cs index 55674000..92af644b 100644 --- a/Tools/ANXContentCompilerGUI/MainWindow.cs +++ b/Tools/ANXContentCompilerGUI/MainWindow.cs @@ -5,6 +5,7 @@ using System.IO; using System.Linq; using System.Windows.Forms; using ANX.ContentCompiler.GUI.Dialogues; +using ANX.ContentCompiler.GUI.Properties; using ANX.Framework.Content.Pipeline; using ANX.Framework.Content.Pipeline.Tasks; using ANX.Framework.NonXNA.Development; @@ -24,7 +25,7 @@ namespace ANX.ContentCompiler.GUI Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "ANX Content Compiler" + Path.DirectorySeparatorChar + "settings.ees"); - private readonly bool _firstStart = true; + private bool _firstStart = true; private ContentProject _contentProject; private Point _lastPos; @@ -52,6 +53,7 @@ namespace ANX.ContentCompiler.GUI public MainWindow(string[] args) { InitializeComponent(); + Icon = Resources.anx; Instance = this; _args = args; _firstStart = !File.Exists(SettingsFile); @@ -76,6 +78,9 @@ namespace ANX.ContentCompiler.GUI private void MainWindowShown(object sender, EventArgs e) { + + if (!_firstStart && Settings.ShowFirstStartScreen) + _firstStart = true; if (_firstStart) ShowFirstStartStuff(); ChangeEnvironmentStartState(); @@ -750,6 +755,7 @@ namespace ANX.ContentCompiler.GUI ribbonButtonWeb.Enabled = true; ribbonTextBox.Enabled = true; buttonMenu.Enabled = true; + Settings.ShowFirstStartScreen = false; } private void ShowTimerTick(object sender, EventArgs e) diff --git a/Tools/ANXContentCompilerGUI/MainWindow.resx b/Tools/ANXContentCompilerGUI/MainWindow.resx deleted file mode 100644 index 8fd19cb6..00000000 --- a/Tools/ANXContentCompilerGUI/MainWindow.resx +++ /dev/null @@ -1,203 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 17, 17 - - - 190, 17 - - - - - AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AAAA - AAoHK0S5BytEuQAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wAAAAAKBy1EwhWS5P8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8AAAAACgctRMIVkuT/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AAAAAAoHLUTCFZLk/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wAAAAAKBy1EwhWS5P8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA - AAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed - 9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AAAAAAoHLUTCFZLk/xed9f8XnfX/F531/xed9f8XnfX/F531/xed - 9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wAAAAAKBy1EwhWS5P8XnfX/F531/xed9f8XnfX/F531/xed - 9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xed9f8XnfX/F531/xed - 9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AAAAAAoHLUTCDFOb/wcvjP8HL4z/By+M/wg3 - iP8Vjt3/EXe6/xJ7wP8VkeL/EG6r/xN/x/8Tf8f/E3/H/xSH0v8XnfX/F531/xed9f8VkuT/By1EwgAA - AAr///8A////AP///wD///8A////AP///wD///8A////AP///wAAAAAKBy1EwhWS5P8OYaz/AACA/wAA - gP8AAID/AAF7/xJ7yf8Se7//F531/xJ8wv8Rd7r/F531/xed9f8XnfX/E3/G/xed9f8XnfX/F531/xed - 9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8AAAAACgctRMIVkuT/F531/xWR - 4/8CCnT/AACA/wAAgP8AAID/DFKj/xJ6vv8XnfX/Enq+/xF3uf8XnfX/F531/xed9f8SfsT/F531/xed - 9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AAAAAAoHLUTCFZLk/xed - 9f8XnfX/F531/wYogf8AAID/AACA/wAAgP8GLYj/FY7e/xN/x/8UhtH/FpPm/xJ7wf8Se8H/EnvB/xJ9 - w/8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wAAAAAKBy1EwhWS - 5P8XnfX/F531/xed9f8XnfX/C0ma/wAAgP8AAID/AACA/wIMc/8Wluv/F531/xed9f8Wk+b/AxFi/wIL - cf8CC3H/Agtx/xBstv8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8AAAAACgct - RMIVkuT/F531/xed9f8XnfX/F531/xed9f8Qbrj/AAB9/wAAgP8AAID/AAB//w5ksP8XnfX/F531/xed - 9f8FJH3/AACA/wAAgP8AAID/C0mb/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA - AAoHK0S5FZLk/xed9f8XnfX/F531/xed9f8XnfX/F531/xaZ7/8CEXT/AACA/wAAgP8AAID/BSd//wpE - l/8KQ5b/CUKV/wUeev8AAID/AACA/wAAgP8GKoP/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed - 9f8VkuT/BytEuQcrRLkVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/wcxif8AAID/AACA/wAA - gP8AAID/AACA/wAAgP8AAID/AACA/wAAgP8AAID/AACA/wILdP8Wkub/F531/xed9f8XnfX/F531/xed - 9f8XnfX/F531/xWS5P8HK0S5AAAACgcrRMIVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/DFKi/wAA - gP8AAID/AACA/wAAf/8DF3f/BB18/wUhf/8GJID/AQZ6/wAAgP8AAID/AACA/w9lr/8XnfX/F531/xed - 9f8XnfX/F531/xed9f8VkuT/By1EwgAAAAr///8AAAAACgcrRMIVkuT/F531/xed9f8XnfX/F531/xed - 9f8Se8j/AAF5/wAAgP8AAID/AACA/w5dp/8XnfX/F531/xed9f8FI37/AACA/wAAgP8AAID/CkSW/xed - 9f8XnfX/F531/xed9f8XnfX/FZLk/wctRMIAAAAK////AP///wD///8AAAAACgcrQ8MVkuT/F531/xed - 9f8XnfX/F531/xed9f8EGHf/AACA/wAAgP8AAID/Bid9/xeb8v8XnfX/F531/wlAlf8AAID/AACA/wAA - gP8FJH7/F531/xed9f8XnfX/F531/xWS5P8HLUTCAAAACv///wD///8A////AP///wD///8AAAAACgcr - Q8MVkuT/F531/xed9f8XnfX/F531/wtJmf8AAID/AACA/wAAgP8AAH7/BSOA/wk9lf8JP5f/BimA/wAA - gP8AAID/AACA/wEHdv8VjNv/F531/xed9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP// - /wD///8AAAAACgcrQ8MVkuT/F531/xed9f8XnfX/FpLm/wITd/8AAID/AACA/wAAgP8AAID/AACA/wAA - gP8AAID/AACA/wAAgP8AAID/AACA/w5eqf8XnfX/FZLk/wctRMIAAAAK////AP///wD///8A////AP// - /wD///8A////AP///wD///8AAAAACgcrQ8MVkuT/F531/xed9f8XnfX/DFOh/wEHdv8AAID/AACA/wAA - gP8AAID/AACA/wAAgP8AAID/AACA/wAAgP8AAID/CT6S/xWS5P8HLUTCAAAACv///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8AAAAACwcrQ8MVkuT/F531/xed9f8XnfX/FY/h/w5f - q/8JQZT/CTuQ/wk6kP8JOY7/CDeN/wg2jP8IN43/CTmP/wk7kP8KRo7/By1EwgAAAAr///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAACwcrQ8MVkuT/F531/xed - 9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/FZLk/wctRMIAAAAK////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAACwcr - QsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xWS5P8HLUTCAAAACv// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8AAAAACwcrQsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/F531/xed9f8VkuT/By1EwgAA - AAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8AAAAACwcrQsQVkuT/F531/xed9f8XnfX/F531/xed9f8XnfX/FZLk/wct - RMIAAAAK////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8AAAAACwcqQcQVkuT/F531/xed9f8XnfX/F531/xWS - 5P8HLUTCAAAACv///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAADAcqQcQVkuT/F531/xed - 9f8VkuT/By1EwgAAAAr///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AAAAADAYp - QcUVkuT/FZLk/wctRMIAAAAK////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8AAAAADAcpQLsHK0S5AAAACv///wD///8A////AP///wD///8A////AP///wD///8A////AP// - /wD///8A////AP///wD///8A//5////8P///+B////AP///gB///wAP//4AB//8AAP/+AAB//AAAP/gA - AB/wAAAP4AAAB8AAAAOAAAABAAAAAAAAAACAAAABwAAAA+AAAAfwAAAP+AAAH/wAAD/+AAB//wAA//+A - Af//wAP//+AH///wD///+B////w////+f/8= - - - \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/Properties/AssemblyInfo.cs b/Tools/ANXContentCompilerGUI/Properties/AssemblyInfo.cs index 98aad866..4d94d63b 100644 --- a/Tools/ANXContentCompilerGUI/Properties/AssemblyInfo.cs +++ b/Tools/ANXContentCompilerGUI/Properties/AssemblyInfo.cs @@ -36,4 +36,4 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] [assembly: AssemblyVersion("4.0.*")] -[assembly: AssemblyFileVersion("0.7.0.0")] \ No newline at end of file +[assembly: AssemblyFileVersion("0.9.0.0")] \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs b/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs index fb8affc8..43b1ab76 100644 --- a/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs +++ b/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs @@ -61,12 +61,12 @@ namespace ANX.ContentCompiler.GUI.Properties { } /// - /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol). /// - internal static System.Drawing.Bitmap appbar_arrow_right { + internal static System.Drawing.Icon anx { get { - object obj = ResourceManager.GetObject("appbar_arrow_right", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + object obj = ResourceManager.GetObject("anx", resourceCulture); + return ((System.Drawing.Icon)(obj)); } } diff --git a/Tools/ANXContentCompilerGUI/Properties/Resources.resx b/Tools/ANXContentCompilerGUI/Properties/Resources.resx index 127ef322..5272b3f8 100644 --- a/Tools/ANXContentCompilerGUI/Properties/Resources.resx +++ b/Tools/ANXContentCompilerGUI/Properties/Resources.resx @@ -118,9 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\appbar.arrow.right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\appbar.question.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -163,4 +160,7 @@ ..\Resources\red-arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\anx.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/anx.ico b/Tools/ANXContentCompilerGUI/Resources/anx.ico similarity index 100% rename from Tools/ANXContentCompilerGUI/anx.ico rename to Tools/ANXContentCompilerGUI/Resources/anx.ico diff --git a/Tools/ANXContentCompilerGUI/Settings.cs b/Tools/ANXContentCompilerGUI/Settings.cs index 5b36a88f..234670d5 100644 --- a/Tools/ANXContentCompilerGUI/Settings.cs +++ b/Tools/ANXContentCompilerGUI/Settings.cs @@ -9,7 +9,7 @@ using ANX.Framework.NonXNA.Development; namespace ANX.ContentCompiler.GUI { [Developer("SilentWarrior/Eagle Eye Studios")] - [PercentageComplete(90)] + [PercentageComplete(100)] [TestState(TestStateAttribute.TestState.Tested)] public static class Settings { @@ -22,6 +22,7 @@ namespace ANX.ContentCompiler.GUI public static Color AccentColor2 { get; set; } public static Color AccentColor3 { get; set; } public static List RecentProjects { get; set; } + public static bool ShowFirstStartScreen { get; set; } public static void Defaults() { @@ -88,6 +89,10 @@ namespace ANX.ContentCompiler.GUI if (reader.NodeType == XmlNodeType.Element) RecentProjects.Add(reader.ReadElementContentAsString()); break; + case "ShowFirstStartScreen": + if (reader.NodeType == XmlNodeType.Element) + ShowFirstStartScreen = reader.ReadElementContentAsBoolean(); + break; default: reader.Read(); break; @@ -139,6 +144,9 @@ namespace ANX.ContentCompiler.GUI writer.WriteEndElement(); } writer.WriteEndElement(); + writer.WriteStartElement("ShowFirstStartScreen"); + writer.WriteValue(ShowFirstStartScreen); + writer.WriteEndElement(); writer.WriteEndElement(); writer.WriteEndDocument(); writer.Flush(); diff --git a/Tools/ANXContentCompilerGUI/States/MenuState.Designer.cs b/Tools/ANXContentCompilerGUI/States/MenuState.Designer.cs index bfa81e9b..21c4e62c 100644 --- a/Tools/ANXContentCompilerGUI/States/MenuState.Designer.cs +++ b/Tools/ANXContentCompilerGUI/States/MenuState.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MenuState)); this.panel1 = new System.Windows.Forms.Panel(); this.buttonExit = new System.Windows.Forms.Button(); this.buttonSettings = new System.Windows.Forms.Button(); @@ -55,6 +54,7 @@ this.arrowButtonSaveAsCproj = new ANX.ContentCompiler.GUI.Controls.ArrowButton(); this.labelHeading = new System.Windows.Forms.Label(); this.panelSettings = new System.Windows.Forms.Panel(); + this.checkBoxShowWelcomeScreen = new System.Windows.Forms.CheckBox(); this.labelSettings = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); this.panelNew.SuspendLayout(); @@ -263,7 +263,8 @@ this.labelOpenDesc.Name = "labelOpenDesc"; this.labelOpenDesc.Size = new System.Drawing.Size(687, 70); this.labelOpenDesc.TabIndex = 3; - this.labelOpenDesc.Text = "If you want to import Content Projects from XNA or previous Content Compiler versions, you can do that by clicking the import button."; + this.labelOpenDesc.Text = "If you want to import Content Projects from XNA or previous Content Compiler vers" + + "ions, you can do that by clicking the import button."; // // arrowButtonImport // @@ -362,6 +363,7 @@ this.panelSettings.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); + this.panelSettings.Controls.Add(this.checkBoxShowWelcomeScreen); this.panelSettings.Controls.Add(this.labelSettings); this.panelSettings.Location = new System.Drawing.Point(95, 0); this.panelSettings.Name = "panelSettings"; @@ -369,6 +371,17 @@ this.panelSettings.TabIndex = 6; this.panelSettings.Visible = false; // + // checkBoxShowWelcomeScreen + // + this.checkBoxShowWelcomeScreen.AutoSize = true; + this.checkBoxShowWelcomeScreen.Location = new System.Drawing.Point(26, 55); + this.checkBoxShowWelcomeScreen.Name = "checkBoxShowWelcomeScreen"; + this.checkBoxShowWelcomeScreen.Size = new System.Drawing.Size(191, 17); + this.checkBoxShowWelcomeScreen.TabIndex = 2; + this.checkBoxShowWelcomeScreen.Text = "Show Welcomescreen at startup"; + this.checkBoxShowWelcomeScreen.UseVisualStyleBackColor = true; + this.checkBoxShowWelcomeScreen.CheckedChanged += new System.EventHandler(this.CheckBoxShowWelcomeScreenCheckedChanged); + // // labelSettings // this.labelSettings.Font = new System.Drawing.Font("Segoe UI", 15.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); @@ -385,11 +398,11 @@ this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.Controls.Add(this.labelVersion); - this.Controls.Add(this.panelOpen); this.Controls.Add(this.panel1); + this.Controls.Add(this.panelSettings); + this.Controls.Add(this.panelOpen); this.Controls.Add(this.panelSaveAs); this.Controls.Add(this.panelNew); - this.Controls.Add(this.panelSettings); this.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.Color.White; this.Name = "MenuState"; @@ -403,6 +416,7 @@ this.panelSaveAs.ResumeLayout(false); this.panelSaveAs.PerformLayout(); this.panelSettings.ResumeLayout(false); + this.panelSettings.PerformLayout(); this.ResumeLayout(false); } @@ -436,5 +450,6 @@ private System.Windows.Forms.Label labelOpenDesc; private System.Windows.Forms.Panel panelSettings; private System.Windows.Forms.Label labelSettings; + private System.Windows.Forms.CheckBox checkBoxShowWelcomeScreen; } } diff --git a/Tools/ANXContentCompilerGUI/States/MenuState.cs b/Tools/ANXContentCompilerGUI/States/MenuState.cs index e2250268..22a98f52 100644 --- a/Tools/ANXContentCompilerGUI/States/MenuState.cs +++ b/Tools/ANXContentCompilerGUI/States/MenuState.cs @@ -43,6 +43,7 @@ namespace ANX.ContentCompiler.GUI.States buttonSave.FlatAppearance.MouseOverBackColor = Settings.AccentColor2; buttonSaveAs.FlatAppearance.MouseOverBackColor = Settings.AccentColor2; buttonSettings.FlatAppearance.MouseDownBackColor = Settings.AccentColor2; + checkBoxShowWelcomeScreen.Checked = Settings.ShowFirstStartScreen; } private void ResetMenuState() @@ -187,5 +188,13 @@ namespace ANX.ContentCompiler.GUI.States panelNew.Visible = true; } #endregion + + #region Options Stuff + private void CheckBoxShowWelcomeScreenCheckedChanged(object sender, EventArgs e) + { + Settings.ShowFirstStartScreen = ((CheckBox)sender).Checked; + } + + #endregion } } \ No newline at end of file