backup/anx.framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Content Compiler:

Browse Source 
- Fixed issue with colors when loaded from a config file
- added project to main solution
This commit is contained in:
SND\eagleeyestudios_cp 2012-08-29 15:57:35 +00:00
parent 1f45cd9038
commit f0a9bf34fa
6 changed files with 61 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ANX.Framework.sln
View File

@ -179,6 +179,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.SoundSystem.PsVita", "S
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AudioSample", "Samples\AudioSample\AudioSample.csproj", "{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANX.ContentCompiler.GUI", "Tools\ANXContentCompilerGUI\ANX.ContentCompiler.GUI.csproj", "{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@ -689,6 +691,16 @@ Global
{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|Mixed Platforms.Build.0 = Release|x86
{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.ActiveCfg = Release|x86
{4A048A8C-C31D-4FC8-AAF3-C387B9E0309B}.Release|x86.Build.0 = Release|x86
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Debug|x86.ActiveCfg = Debug|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Any CPU.Build.0 = Release|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@ -703,6 +715,7 @@ Global
{10F7894D-E8B5-4DCA-BB08-5C99FA792388} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
{938D5F88-B888-4B04-BEEE-EE701FBA51EF} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
{14B39F89-C9B0-407E-877A-B515C985E96E} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
{45DD7B40-C498-4DD2-A16B-FD6C4E6991B3} = {B24A8593-562A-4A25-BB08-46C163F10F3F}
{5BE49183-2F6F-4527-AC90-D816911FCF90} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
{EB8258E0-6741-4DB9-B756-1EBDF67B1ED6} = {D421509A-9AE3-4D7E-881B-EAFED598B028}
{B30DE9C2-0926-46B6-8351-9AF276C472D5} = {D421509A-9AE3-4D7E-881B-EAFED598B028}

6
Tools/ANXContentCompilerGUI/MainWindow.Designer.cs generated
View File

@ -144,7 +144,7 @@ namespace ANX.ContentCompiler.GUI
this.ribbonButtonLoad.Name = "ribbonButtonLoad";
this.ribbonButtonLoad.Size = new System.Drawing.Size(52, 68);
this.ribbonButtonLoad.TabIndex = 4;
this.ribbonButtonLoad.Click += new System.EventHandler(this.RibbonButtonLoadClick);
this.ribbonButtonLoad.Click += new System.EventHandler(this.OpenProject);
//
// ribbonButtonNew
//
@ -155,7 +155,7 @@ namespace ANX.ContentCompiler.GUI
this.ribbonButtonNew.Name = "ribbonButtonNew";
this.ribbonButtonNew.Size = new System.Drawing.Size(52, 68);
this.ribbonButtonNew.TabIndex = 3;
this.ribbonButtonNew.Click += new System.EventHandler(this.RibbonButtonNewClick);
this.ribbonButtonNew.Click += new System.EventHandler(this.NewProject);
//
// buttonQuit
//
@ -398,6 +398,8 @@ namespace ANX.ContentCompiler.GUI
this.Name = "MainWindow";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "ANX Content Compiler";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainWindowFormClosing);
this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.MainWindowFormClosed);
this.Shown += new System.EventHandler(this.MainWindowShown);
this.splitContainerMenuLayout.Panel1.ResumeLayout(false);
this.splitContainerMenuLayout.Panel2.ResumeLayout(false);

16
Tools/ANXContentCompilerGUI/MainWindow.cs
View File

@ -57,7 +57,7 @@ namespace ANX.ContentCompiler.GUI
#endregion
#region NewProject
private void RibbonButtonNewClick(object sender, EventArgs e)
public void NewProject(object sender, EventArgs e)
{
using (var dlg = new NewProjectScreen())
{
@ -100,7 +100,7 @@ namespace ANX.ContentCompiler.GUI
#endregion
#region OpenProject
private void RibbonButtonLoadClick(object sender, EventArgs e)
public void OpenProject(object sender, EventArgs e)
{
using (var dlg = new OpenProjectScreen())
{
@ -229,5 +229,17 @@ namespace ANX.ContentCompiler.GUI
propertyGrid.ViewForeColor = Settings.ForeColor;
}
#endregion
#region Exit
private void MainWindowFormClosed(object sender, FormClosedEventArgs e)
{
Settings.Save(SettingsFile);
}
private void MainWindowFormClosing(object sender, FormClosingEventArgs e)
{
}
#endregion
}
}

32
Tools/ANXContentCompilerGUI/Settings.cs
View File

@ -52,31 +52,31 @@ namespace ANX.ContentCompiler.GUI
{
case "MainColor":
if (reader.NodeType == XmlNodeType.Element)
MainColor = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
MainColor = GetColorFromString(reader.ReadElementContentAsString());
break;
case "DarkMainColor":
if (reader.NodeType == XmlNodeType.Element)
DarkMainColor = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
DarkMainColor = GetColorFromString(reader.ReadElementContentAsString());
break;
case "LightMainColor":
if (reader.NodeType == XmlNodeType.Element)
LightMainColor = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
LightMainColor = GetColorFromString(reader.ReadElementContentAsString());
break;
case "ForeColor":
if (reader.NodeType == XmlNodeType.Element)
ForeColor = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
ForeColor = GetColorFromString(reader.ReadElementContentAsString());
break;
case "AccentColor":
if (reader.NodeType == XmlNodeType.Element)
AccentColor = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
AccentColor = GetColorFromString(reader.ReadElementContentAsString());
break;
case "AccentColor2":
if (reader.NodeType == XmlNodeType.Element)
AccentColor2 = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
AccentColor2 = GetColorFromString(reader.ReadElementContentAsString());
break;
case "AccentColor3":
if (reader.NodeType == XmlNodeType.Element)
AccentColor3 = GetColorFromXmlCompatible(reader.ReadElementContentAsString());
AccentColor3 = GetColorFromString(reader.ReadElementContentAsString());
break;
case "Path":
if (reader.NodeType == XmlNodeType.Element)
@ -99,25 +99,25 @@ namespace ANX.ContentCompiler.GUI
writer.WriteStartDocument();
writer.WriteStartElement("CCompiler4Settings");
writer.WriteStartElement("MainColor");
writer.WriteValue(GetXmlCompatibleColor(MainColor));
writer.WriteValue(GetStringFromColor(MainColor));
writer.WriteFullEndElement();
writer.WriteStartElement("DarkMainColor");
writer.WriteValue(GetXmlCompatibleColor(DarkMainColor));
writer.WriteValue(GetStringFromColor(DarkMainColor));
writer.WriteFullEndElement();
writer.WriteStartElement("LightMainColor");
writer.WriteValue(GetXmlCompatibleColor(LightMainColor));
writer.WriteValue(GetStringFromColor(LightMainColor));
writer.WriteFullEndElement();
writer.WriteStartElement("ForeColor");
writer.WriteValue(GetXmlCompatibleColor(ForeColor));
writer.WriteValue(GetStringFromColor(ForeColor));
writer.WriteFullEndElement();
writer.WriteStartElement("AccentColor");
writer.WriteValue(GetXmlCompatibleColor(AccentColor));
writer.WriteValue(GetStringFromColor(AccentColor));
writer.WriteFullEndElement();
writer.WriteStartElement("AccentColor2");
writer.WriteValue(GetXmlCompatibleColor(AccentColor2));
writer.WriteValue(GetStringFromColor(AccentColor2));
writer.WriteFullEndElement();
writer.WriteStartElement("AccentColor3");
writer.WriteValue(GetXmlCompatibleColor(AccentColor3));
writer.WriteValue(GetStringFromColor(AccentColor3));
writer.WriteFullEndElement();
writer.WriteStartElement("RecentProjects");
foreach (var recentProject in RecentProjects)
@ -133,12 +133,12 @@ namespace ANX.ContentCompiler.GUI
writer.Close();
}
private static string GetXmlCompatibleColor(Color color)
private static string GetStringFromColor(Color color)
{
return color.R + "," + color.G + "," + color.B;
}
private static Color GetColorFromXmlCompatible(string xml)
private static Color GetColorFromString(string xml)
{
var s = xml.Split(new[] {','}, 3);
return Color.FromArgb(Convert.ToInt32(s[0]), Convert.ToInt32(s[1]), Convert.ToInt32(s[2]));

4
Tools/ANXContentCompilerGUI/States/StartState.Designer.cs generated
View File

@ -57,6 +57,7 @@
this.arrowButtonLoad.Name = "arrowButtonLoad";
this.arrowButtonLoad.Size = new System.Drawing.Size(348, 64);
this.arrowButtonLoad.TabIndex = 2;
this.arrowButtonLoad.Click += new System.EventHandler(this.ArrowButtonLoadClick);
//
// arrowButtonImport
//
@ -81,6 +82,7 @@
this.arrowButtonNew.Name = "arrowButtonNew";
this.arrowButtonNew.Size = new System.Drawing.Size(348, 64);
this.arrowButtonNew.TabIndex = 0;
this.arrowButtonNew.Click += new System.EventHandler(this.ArrowButtonNewClick);
//
// StartState
//
@ -95,7 +97,7 @@
this.ForeColor = System.Drawing.Color.White;
this.Name = "StartState";
this.Size = new System.Drawing.Size(386, 323);
this.Load += new System.EventHandler(this.StartState_Load);
this.Load += new System.EventHandler(this.StartStateLoad);
this.ResumeLayout(false);
this.PerformLayout();

12
Tools/ANXContentCompilerGUI/States/StartState.cs
View File

@ -15,9 +15,19 @@ namespace ANX.ContentCompiler.GUI.States
ForeColor = Settings.ForeColor;
}
private void StartState_Load(object sender, System.EventArgs e)
private void StartStateLoad(object sender, System.EventArgs e)
{
SetUpColor();
}
private void ArrowButtonNewClick(object sender, System.EventArgs e)
{
MainWindow.Instance.NewProject(sender, e);
}
private void ArrowButtonLoadClick(object sender, System.EventArgs e)
{
MainWindow.Instance.OpenProject(sender, e);
}
}
}