diff --git a/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj b/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj index 9cdf8e61..a1280c30 100644 --- a/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj +++ b/Tools/ANXContentCompilerGUI/ANX.ContentCompiler.GUI.csproj @@ -180,15 +180,6 @@ Resources.resx True - - SettingsSingleFileGenerator - Settings.Designer.cs - - - True - Settings.settings - True - @@ -204,6 +195,17 @@ + + + + + + + + + + + diff --git a/Tools/ANXContentCompilerGUI/Controls/ArrowButton.Designer.cs b/Tools/ANXContentCompilerGUI/Controls/ArrowButton.Designer.cs index 84e5a1db..d6907903 100644 --- a/Tools/ANXContentCompilerGUI/Controls/ArrowButton.Designer.cs +++ b/Tools/ANXContentCompilerGUI/Controls/ArrowButton.Designer.cs @@ -29,12 +29,13 @@ private void InitializeComponent() { this.labelText = new System.Windows.Forms.Label(); - this.pictureBox1 = new System.Windows.Forms.PictureBox(); this.splitContainer = new System.Windows.Forms.SplitContainer(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); this.splitContainer.Panel1.SuspendLayout(); this.splitContainer.Panel2.SuspendLayout(); this.splitContainer.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); this.SuspendLayout(); // // labelText @@ -53,22 +54,6 @@ this.labelText.MouseLeave += new System.EventHandler(this.ArrowButtonMouseLeave); this.labelText.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseUp); // - // pictureBox1 - // - this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBox1.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.arrow; - this.pictureBox1.Location = new System.Drawing.Point(0, 0); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(47, 48); - this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pictureBox1.TabIndex = 1; - this.pictureBox1.TabStop = false; - this.pictureBox1.Click += new System.EventHandler(this.PictureBox1Click); - this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseDown); - this.pictureBox1.MouseEnter += new System.EventHandler(this.ArrowButtonMouseEnter); - this.pictureBox1.MouseLeave += new System.EventHandler(this.ArrowButtonMouseLeave); - this.pictureBox1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseUp); - // // splitContainer // this.splitContainer.Dock = System.Windows.Forms.DockStyle.Fill; @@ -87,6 +72,22 @@ this.splitContainer.SplitterDistance = 47; this.splitContainer.TabIndex = 2; // + // pictureBox1 + // + this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill; + this.pictureBox1.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.arrow1; + this.pictureBox1.Location = new System.Drawing.Point(0, 0); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(47, 48); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 1; + this.pictureBox1.TabStop = false; + this.pictureBox1.Click += new System.EventHandler(this.PictureBox1Click); + this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseDown); + this.pictureBox1.MouseEnter += new System.EventHandler(this.ArrowButtonMouseEnter); + this.pictureBox1.MouseLeave += new System.EventHandler(this.ArrowButtonMouseLeave); + this.pictureBox1.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseUp); + // // ArrowButton // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); @@ -104,10 +105,11 @@ this.MouseEnter += new System.EventHandler(this.ArrowButtonMouseEnter); this.MouseLeave += new System.EventHandler(this.ArrowButtonMouseLeave); this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ArrowButtonMouseUp); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.splitContainer.Panel1.ResumeLayout(false); this.splitContainer.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); this.splitContainer.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); this.ResumeLayout(false); } diff --git a/Tools/ANXContentCompilerGUI/Controls/ArrowButton.resx b/Tools/ANXContentCompilerGUI/Controls/ArrowButton.resx index 5ea0895e..29dcb1b3 100644 --- a/Tools/ANXContentCompilerGUI/Controls/ArrowButton.resx +++ b/Tools/ANXContentCompilerGUI/Controls/ArrowButton.resx @@ -112,9 +112,9 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.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/Dialogues/NewFolderScreen.Designer.cs b/Tools/ANXContentCompilerGUI/Dialogues/NewFolderScreen.Designer.cs new file mode 100644 index 00000000..73dd780e --- /dev/null +++ b/Tools/ANXContentCompilerGUI/Dialogues/NewFolderScreen.Designer.cs @@ -0,0 +1,162 @@ +namespace ANX.ContentCompiler.GUI.Dialogues +{ + partial class NewFolderScreen + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.buttonCancel = new System.Windows.Forms.Button(); + this.buttonNext = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.panel1 = new System.Windows.Forms.Panel(); + this.textBoxName = new System.Windows.Forms.TextBox(); + this.labelName = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // buttonCancel + // + this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); + this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel; + this.buttonCancel.FlatAppearance.BorderColor = System.Drawing.Color.Gray; + this.buttonCancel.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Green; + this.buttonCancel.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Gray; + this.buttonCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonCancel.Location = new System.Drawing.Point(16, 129); + this.buttonCancel.Name = "buttonCancel"; + this.buttonCancel.Size = new System.Drawing.Size(75, 30); + this.buttonCancel.TabIndex = 5; + this.buttonCancel.Text = "Cancel"; + this.buttonCancel.UseVisualStyleBackColor = true; + // + // buttonNext + // + this.buttonNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.buttonNext.FlatAppearance.BorderColor = System.Drawing.Color.Gray; + this.buttonNext.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Green; + this.buttonNext.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Gray; + this.buttonNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.buttonNext.Location = new System.Drawing.Point(503, 129); + this.buttonNext.Name = "buttonNext"; + this.buttonNext.Size = new System.Drawing.Size(84, 30); + this.buttonNext.TabIndex = 6; + this.buttonNext.Text = "OK"; + this.buttonNext.UseVisualStyleBackColor = true; + this.buttonNext.Click += new System.EventHandler(this.ButtonNextClick); + // + // button3 + // + this.button3.DialogResult = System.Windows.Forms.DialogResult.Abort; + this.button3.FlatAppearance.BorderSize = 0; + this.button3.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Green; + this.button3.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Gray; + this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button3.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.button3.Location = new System.Drawing.Point(572, -1); + this.button3.Name = "button3"; + this.button3.Size = new System.Drawing.Size(26, 23); + this.button3.TabIndex = 7; + this.button3.Text = "X"; + this.button3.UseVisualStyleBackColor = true; + // + // panel1 + // + this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.panel1.Controls.Add(this.textBoxName); + this.panel1.Controls.Add(this.labelName); + this.panel1.Controls.Add(this.label1); + this.panel1.Controls.Add(this.buttonNext); + this.panel1.Controls.Add(this.button3); + this.panel1.Controls.Add(this.buttonCancel); + this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.panel1.Location = new System.Drawing.Point(0, 0); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(600, 172); + this.panel1.TabIndex = 14; + // + // textBoxName + // + this.textBoxName.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.textBoxName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.textBoxName.ForeColor = System.Drawing.Color.White; + this.textBoxName.Location = new System.Drawing.Point(85, 77); + this.textBoxName.Name = "textBoxName"; + this.textBoxName.Size = new System.Drawing.Size(402, 22); + this.textBoxName.TabIndex = 19; + // + // labelName + // + this.labelName.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.labelName.Location = new System.Drawing.Point(12, 47); + this.labelName.Name = "labelName"; + this.labelName.Size = new System.Drawing.Size(554, 27); + this.labelName.TabIndex = 18; + this.labelName.Text = "Enter a name for your folder"; + this.labelName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(-4, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(570, 22); + this.label1.TabIndex = 14; + this.label1.Text = "New Folder"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // NewFolderScreen + // + this.AcceptButton = this.buttonNext; + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.ClientSize = new System.Drawing.Size(600, 172); + this.Controls.Add(this.panel1); + 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.Name = "NewFolderScreen"; + this.ShowInTaskbar = false; + this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; + this.Text = "FirstStartScreen"; + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.Button buttonCancel; + private System.Windows.Forms.Button buttonNext; + private System.Windows.Forms.Button button3; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label labelName; + public System.Windows.Forms.TextBox textBoxName; + } +} \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/Dialogues/NewFolderScreen.cs b/Tools/ANXContentCompilerGUI/Dialogues/NewFolderScreen.cs new file mode 100644 index 00000000..43cc107a --- /dev/null +++ b/Tools/ANXContentCompilerGUI/Dialogues/NewFolderScreen.cs @@ -0,0 +1,40 @@ +using System; +using System.IO; +using System.Windows.Forms; + +namespace ANX.ContentCompiler.GUI.Dialogues +{ + public partial class NewFolderScreen : Form + { + public NewFolderScreen() + { + InitializeComponent(); + SetUpColors(); + } + + private void SetUpColors() + { + BackColor = Settings.MainColor; + ForeColor = Settings.ForeColor; + button3.FlatAppearance.MouseOverBackColor = Settings.LightMainColor; + buttonCancel.FlatAppearance.MouseOverBackColor = Settings.LightMainColor; + buttonNext.FlatAppearance.MouseOverBackColor = Settings.LightMainColor; + button3.FlatAppearance.MouseDownBackColor = Settings.AccentColor3; + buttonCancel.FlatAppearance.MouseDownBackColor = Settings.AccentColor3; + buttonNext.FlatAppearance.MouseDownBackColor = Settings.AccentColor3; + buttonNext.FlatAppearance.BorderColor = Settings.LightMainColor; + button3.FlatAppearance.BorderColor = Settings.LightMainColor; + buttonCancel.FlatAppearance.BorderColor = Settings.LightMainColor; + textBoxName.BackColor = Settings.DarkMainColor; + textBoxName.ForeColor = Settings.ForeColor; + } + + private void ButtonNextClick(object sender, EventArgs e) + { + if (String.IsNullOrEmpty(textBoxName.Text)) + MessageBox.Show("You need to type a name!", "Missing value", MessageBoxButtons.OK, MessageBoxIcon.Warning); + else + DialogResult = DialogResult.OK; + } + } +} \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs b/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs index 88820eba..b14fdd4a 100644 --- a/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs +++ b/Tools/ANXContentCompilerGUI/MainWindow.Designer.cs @@ -32,12 +32,6 @@ namespace ANX.ContentCompiler.GUI { this.components = new System.ComponentModel.Container(); this.splitContainerMenuLayout = new System.Windows.Forms.SplitContainer(); - this.ribbonButtonHelp = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); - this.ribbonButtonWeb = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); - this.ribbonButtonClean = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); - this.ribbonButtonSave = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); - this.ribbonButtonLoad = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); - this.ribbonButtonNew = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); this.buttonQuit = new System.Windows.Forms.Button(); this.buttonMenu = new System.Windows.Forms.Button(); this.labelTitle = new System.Windows.Forms.Label(); @@ -49,11 +43,17 @@ namespace ANX.ContentCompiler.GUI this.treeViewItemRename = new System.Windows.Forms.ToolStripMenuItem(); this.treeViewItemDelete = new System.Windows.Forms.ToolStripMenuItem(); this.splitContainerProperties = new System.Windows.Forms.SplitContainer(); - this.editingState = new ANX.ContentCompiler.GUI.States.EditingState(); - this.startState = new ANX.ContentCompiler.GUI.States.StartState(); this.labelProperties = new System.Windows.Forms.Label(); this.propertyGrid = new System.Windows.Forms.PropertyGrid(); this.menuState = new ANX.ContentCompiler.GUI.States.MenuState(); + this.ribbonButtonHelp = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.ribbonButtonWeb = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.ribbonButtonClean = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.ribbonButtonSave = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.ribbonButtonLoad = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.ribbonButtonNew = new ANX.ContentCompiler.GUI.Controls.RibbonButton(); + this.editingState = new ANX.ContentCompiler.GUI.States.EditingState(); + this.startState = new ANX.ContentCompiler.GUI.States.StartState(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerMenuLayout)).BeginInit(); this.splitContainerMenuLayout.Panel1.SuspendLayout(); this.splitContainerMenuLayout.Panel2.SuspendLayout(); @@ -98,69 +98,6 @@ namespace ANX.ContentCompiler.GUI this.splitContainerMenuLayout.SplitterDistance = 99; this.splitContainerMenuLayout.TabIndex = 0; // - // ribbonButtonHelp - // - this.ribbonButtonHelp.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonHelp.Content = "Help"; - this.ribbonButtonHelp.Image = null; - this.ribbonButtonHelp.Location = new System.Drawing.Point(299, 26); - this.ribbonButtonHelp.Name = "ribbonButtonHelp"; - this.ribbonButtonHelp.Size = new System.Drawing.Size(52, 68); - this.ribbonButtonHelp.TabIndex = 8; - // - // ribbonButtonWeb - // - this.ribbonButtonWeb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonWeb.Content = "Website"; - this.ribbonButtonWeb.Image = null; - this.ribbonButtonWeb.Location = new System.Drawing.Point(237, 26); - this.ribbonButtonWeb.Name = "ribbonButtonWeb"; - this.ribbonButtonWeb.Size = new System.Drawing.Size(63, 68); - this.ribbonButtonWeb.TabIndex = 7; - // - // ribbonButtonClean - // - this.ribbonButtonClean.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonClean.Content = "Clean"; - this.ribbonButtonClean.Image = null; - this.ribbonButtonClean.Location = new System.Drawing.Point(186, 26); - this.ribbonButtonClean.Name = "ribbonButtonClean"; - this.ribbonButtonClean.Size = new System.Drawing.Size(52, 68); - this.ribbonButtonClean.TabIndex = 6; - // - // ribbonButtonSave - // - this.ribbonButtonSave.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonSave.Content = "Save"; - this.ribbonButtonSave.Image = null; - this.ribbonButtonSave.Location = new System.Drawing.Point(105, 26); - this.ribbonButtonSave.Name = "ribbonButtonSave"; - this.ribbonButtonSave.Size = new System.Drawing.Size(52, 68); - this.ribbonButtonSave.TabIndex = 5; - this.ribbonButtonSave.Click += new System.EventHandler(this.SaveProject); - // - // ribbonButtonLoad - // - this.ribbonButtonLoad.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonLoad.Content = "Open"; - this.ribbonButtonLoad.Image = null; - this.ribbonButtonLoad.Location = new System.Drawing.Point(54, 26); - this.ribbonButtonLoad.Name = "ribbonButtonLoad"; - this.ribbonButtonLoad.Size = new System.Drawing.Size(52, 68); - this.ribbonButtonLoad.TabIndex = 4; - this.ribbonButtonLoad.Click += new System.EventHandler(this.OpenProjectDialog); - // - // ribbonButtonNew - // - this.ribbonButtonNew.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ribbonButtonNew.Content = "New"; - this.ribbonButtonNew.Image = null; - this.ribbonButtonNew.Location = new System.Drawing.Point(3, 26); - this.ribbonButtonNew.Name = "ribbonButtonNew"; - this.ribbonButtonNew.Size = new System.Drawing.Size(52, 68); - this.ribbonButtonNew.TabIndex = 3; - this.ribbonButtonNew.Click += new System.EventHandler(this.NewProject); - // // buttonQuit // this.buttonQuit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -322,26 +259,6 @@ namespace ANX.ContentCompiler.GUI this.splitContainerProperties.SplitterDistance = 366; this.splitContainerProperties.TabIndex = 0; // - // editingState - // - this.editingState.Dock = System.Windows.Forms.DockStyle.Fill; - 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.TabIndex = 1; - this.editingState.Visible = false; - // - // startState - // - this.startState.Dock = System.Windows.Forms.DockStyle.Fill; - 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.TabIndex = 0; - this.startState.Visible = false; - // // labelProperties // this.labelProperties.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -390,6 +307,90 @@ namespace ANX.ContentCompiler.GUI this.menuState.TabIndex = 1; this.menuState.Visible = false; // + // ribbonButtonHelp + // + this.ribbonButtonHelp.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonHelp.Content = "Help"; + this.ribbonButtonHelp.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_question; + this.ribbonButtonHelp.Location = new System.Drawing.Point(299, 26); + this.ribbonButtonHelp.Name = "ribbonButtonHelp"; + this.ribbonButtonHelp.Size = new System.Drawing.Size(52, 68); + this.ribbonButtonHelp.TabIndex = 8; + // + // ribbonButtonWeb + // + this.ribbonButtonWeb.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonWeb.Content = "Website"; + this.ribbonButtonWeb.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_globe; + this.ribbonButtonWeb.Location = new System.Drawing.Point(237, 26); + this.ribbonButtonWeb.Name = "ribbonButtonWeb"; + this.ribbonButtonWeb.Size = new System.Drawing.Size(63, 68); + this.ribbonButtonWeb.TabIndex = 7; + // + // ribbonButtonClean + // + this.ribbonButtonClean.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.ribbonButtonClean.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonClean.Content = "Clean"; + this.ribbonButtonClean.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_clean; + this.ribbonButtonClean.Location = new System.Drawing.Point(186, 26); + this.ribbonButtonClean.Name = "ribbonButtonClean"; + this.ribbonButtonClean.Size = new System.Drawing.Size(52, 68); + this.ribbonButtonClean.TabIndex = 6; + // + // ribbonButtonSave + // + this.ribbonButtonSave.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonSave.Content = "Save"; + this.ribbonButtonSave.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_save; + this.ribbonButtonSave.Location = new System.Drawing.Point(105, 26); + this.ribbonButtonSave.Name = "ribbonButtonSave"; + this.ribbonButtonSave.Size = new System.Drawing.Size(52, 68); + this.ribbonButtonSave.TabIndex = 5; + this.ribbonButtonSave.Click += new System.EventHandler(this.SaveProject); + // + // ribbonButtonLoad + // + this.ribbonButtonLoad.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonLoad.Content = "Open"; + this.ribbonButtonLoad.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_folder_open; + this.ribbonButtonLoad.Location = new System.Drawing.Point(54, 26); + this.ribbonButtonLoad.Name = "ribbonButtonLoad"; + this.ribbonButtonLoad.Size = new System.Drawing.Size(52, 68); + this.ribbonButtonLoad.TabIndex = 4; + this.ribbonButtonLoad.Click += new System.EventHandler(this.OpenProjectDialog); + // + // ribbonButtonNew + // + this.ribbonButtonNew.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.ribbonButtonNew.Content = "New"; + this.ribbonButtonNew.Image = global::ANX.ContentCompiler.GUI.Properties.Resources.appbar_page_multiple; + this.ribbonButtonNew.Location = new System.Drawing.Point(3, 26); + this.ribbonButtonNew.Name = "ribbonButtonNew"; + this.ribbonButtonNew.Size = new System.Drawing.Size(52, 68); + this.ribbonButtonNew.TabIndex = 3; + this.ribbonButtonNew.Click += new System.EventHandler(this.NewProject); + // + // editingState + // + this.editingState.Dock = System.Windows.Forms.DockStyle.Fill; + 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.TabIndex = 1; + this.editingState.Visible = false; + // + // startState + // + this.startState.Dock = System.Windows.Forms.DockStyle.Fill; + 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.TabIndex = 0; + this.startState.Visible = false; + // // MainWindow // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); diff --git a/Tools/ANXContentCompilerGUI/MainWindow.cs b/Tools/ANXContentCompilerGUI/MainWindow.cs index c797f346..b94e3fb7 100644 --- a/Tools/ANXContentCompilerGUI/MainWindow.cs +++ b/Tools/ANXContentCompilerGUI/MainWindow.cs @@ -145,6 +145,7 @@ namespace ANX.ContentCompiler.GUI #region SaveProject public void SaveProject(object sender, EventArgs e) { + if (_contentProject == null) return; if (String.IsNullOrEmpty(ProjectPath)) SaveProjectAs(sender, e); diff --git a/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs b/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs index 49c902a4..9ac058c7 100644 --- a/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs +++ b/Tools/ANXContentCompilerGUI/Properties/Resources.Designer.cs @@ -63,9 +63,79 @@ namespace ANX.ContentCompiler.GUI.Properties { /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap arrow { + internal static System.Drawing.Bitmap appbar_arrow_right { get { - object obj = ResourceManager.GetObject("arrow", resourceCulture); + object obj = ResourceManager.GetObject("appbar_arrow_right", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_clean { + get { + object obj = ResourceManager.GetObject("appbar_clean", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_folder_open { + get { + object obj = ResourceManager.GetObject("appbar_folder_open", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_globe { + get { + object obj = ResourceManager.GetObject("appbar_globe", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_new { + get { + object obj = ResourceManager.GetObject("appbar_new", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_page_multiple { + get { + object obj = ResourceManager.GetObject("appbar_page_multiple", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_question { + get { + object obj = ResourceManager.GetObject("appbar_question", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap appbar_save { + get { + object obj = ResourceManager.GetObject("appbar_save", resourceCulture); return ((System.Drawing.Bitmap)(obj)); } } @@ -90,6 +160,16 @@ namespace ANX.ContentCompiler.GUI.Properties { } } + /// + /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap arrow1 { + get { + object obj = ResourceManager.GetObject("arrow1", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. /// diff --git a/Tools/ANXContentCompilerGUI/Properties/Resources.resx b/Tools/ANXContentCompilerGUI/Properties/Resources.resx index a3a98913..44ffe5b4 100644 --- a/Tools/ANXContentCompilerGUI/Properties/Resources.resx +++ b/Tools/ANXContentCompilerGUI/Properties/Resources.resx @@ -112,25 +112,49 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 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 + + + ..\Resources\appbar.page.multiple.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\appbar.save.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\arrow-left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\appbar.folder.open.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Deleket-Smileys-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\appbar.new1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\appbar.clean.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\clouds.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\arrow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\appbar.globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Deleket-Smileys-8.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow-right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\arrow2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/Properties/Settings.Designer.cs b/Tools/ANXContentCompilerGUI/Properties/Settings.Designer.cs deleted file mode 100644 index be2ce135..00000000 --- a/Tools/ANXContentCompilerGUI/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Dieser Code wurde von einem Tool generiert. -// Laufzeitversion:4.0.30319.17929 -// -// Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn -// der Code erneut generiert wird. -// -//------------------------------------------------------------------------------ - -namespace ANX.ContentCompiler.GUI.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 { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Tools/ANXContentCompilerGUI/Properties/Settings.settings b/Tools/ANXContentCompilerGUI/Properties/Settings.settings deleted file mode 100644 index eeb7df06..00000000 --- a/Tools/ANXContentCompilerGUI/Properties/Settings.settings +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.arrow.right.png b/Tools/ANXContentCompilerGUI/Resources/appbar.arrow.right.png new file mode 100644 index 00000000..5535b9e8 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.arrow.right.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.clean.png b/Tools/ANXContentCompilerGUI/Resources/appbar.clean.png new file mode 100644 index 00000000..78383f78 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.clean.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.folder.open.png b/Tools/ANXContentCompilerGUI/Resources/appbar.folder.open.png new file mode 100644 index 00000000..561b3c77 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.folder.open.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.globe.png b/Tools/ANXContentCompilerGUI/Resources/appbar.globe.png new file mode 100644 index 00000000..47357892 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.globe.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.globe.wire.png b/Tools/ANXContentCompilerGUI/Resources/appbar.globe.wire.png new file mode 100644 index 00000000..ec540e74 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.globe.wire.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.new1.png b/Tools/ANXContentCompilerGUI/Resources/appbar.new1.png new file mode 100644 index 00000000..efe8a35e Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.new1.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.page.multiple.png b/Tools/ANXContentCompilerGUI/Resources/appbar.page.multiple.png new file mode 100644 index 00000000..e09b0e50 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.page.multiple.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.question.png b/Tools/ANXContentCompilerGUI/Resources/appbar.question.png new file mode 100644 index 00000000..104fb852 Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.question.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/appbar.save.png b/Tools/ANXContentCompilerGUI/Resources/appbar.save.png new file mode 100644 index 00000000..d3f0abad Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/appbar.save.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/arrow1.png b/Tools/ANXContentCompilerGUI/Resources/arrow1.png new file mode 100644 index 00000000..d0cb0a4a Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/arrow1.png differ diff --git a/Tools/ANXContentCompilerGUI/Resources/arrow2.png b/Tools/ANXContentCompilerGUI/Resources/arrow2.png new file mode 100644 index 00000000..4d843a4c Binary files /dev/null and b/Tools/ANXContentCompilerGUI/Resources/arrow2.png differ diff --git a/Tools/AnxSampleBrowser/AnxSampleBrowser.csproj b/Tools/AnxSampleBrowser/AnxSampleBrowser.csproj index e8b71dc2..d6680238 100644 --- a/Tools/AnxSampleBrowser/AnxSampleBrowser.csproj +++ b/Tools/AnxSampleBrowser/AnxSampleBrowser.csproj @@ -13,6 +13,21 @@ v4.0 Client 512 + veröffentlichen\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true x86 @@ -89,6 +104,28 @@ + + + False + Microsoft .NET Framework 4 Client Profile %28x86 und x64%29 + true + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + false + + + False + Windows Installer 4.5 + true + +