diff --git a/FModel/FModel.csproj b/FModel/FModel.csproj
index ee764b88..9d37baae 100644
--- a/FModel/FModel.csproj
+++ b/FModel/FModel.csproj
@@ -78,6 +78,9 @@
..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll
+
+ ..\packages\jacobslusser.ScintillaNET.3.6.3\lib\net40\ScintillaNET.dll
+
@@ -150,6 +153,7 @@
+
diff --git a/FModel/PAKWindow.Designer.cs b/FModel/PAKWindow.Designer.cs
index 8c8bdcad..89f2260c 100644
--- a/FModel/PAKWindow.Designer.cs
+++ b/FModel/PAKWindow.Designer.cs
@@ -31,30 +31,31 @@
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PAKWindow));
this.groupBox1 = new System.Windows.Forms.GroupBox();
- this.LoadButton = new FModel.SplitButton();
this.LoadContext = new System.Windows.Forms.ContextMenuStrip(this.components);
+ this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.helpToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.AESKeyLabel = new System.Windows.Forms.Label();
this.AESKeyTextBox = new System.Windows.Forms.TextBox();
this.PAKsComboBox = new System.Windows.Forms.ComboBox();
this.ItemsListBox = new System.Windows.Forms.ListBox();
this.PAKTreeView = new System.Windows.Forms.TreeView();
+ this.TreeViewImageList = new System.Windows.Forms.ImageList(this.components);
this.ItemIconPictureBox = new System.Windows.Forms.PictureBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
- this.SaveImageButton = new FModel.SplitButton();
this.ImageContext = new System.Windows.Forms.ContextMenuStrip(this.components);
this.OpenImageTS = new System.Windows.Forms.ToolStripMenuItem();
- this.ExtractAssetButton = new FModel.SplitButton();
this.ExtractAsset = new System.Windows.Forms.ContextMenuStrip(this.components);
this.LoadDataTS = new System.Windows.Forms.ToolStripMenuItem();
this.SaveImageTS = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+ this.mergeGeneratedImagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.ConsoleRichTextBox = new System.Windows.Forms.RichTextBox();
- this.ItemRichTextBox = new System.Windows.Forms.RichTextBox();
this.FilterLabel = new System.Windows.Forms.Label();
this.FilterTextBox = new System.Windows.Forms.TextBox();
- this.mergeGeneratedImagesToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.optionsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+ this.scintilla1 = new ScintillaNET.Scintilla();
+ this.SaveImageButton = new FModel.SplitButton();
+ this.ExtractAssetButton = new FModel.SplitButton();
+ this.LoadButton = new FModel.SplitButton();
this.groupBox1.SuspendLayout();
this.LoadContext.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.ItemIconPictureBox)).BeginInit();
@@ -76,18 +77,6 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "PAK";
//
- // LoadButton
- //
- this.LoadButton.Location = new System.Drawing.Point(296, 18);
- this.LoadButton.Menu = this.LoadContext;
- this.LoadButton.Name = "LoadButton";
- this.LoadButton.Size = new System.Drawing.Size(106, 23);
- this.LoadButton.TabIndex = 12;
- this.LoadButton.Text = " Load";
- this.LoadButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.LoadButton.UseVisualStyleBackColor = true;
- this.LoadButton.Click += new System.EventHandler(this.LoadButton_Click);
- //
// LoadContext
//
this.LoadContext.ImageScalingSize = new System.Drawing.Size(18, 18);
@@ -97,6 +86,13 @@
this.LoadContext.Name = "LoadContext";
this.LoadContext.Size = new System.Drawing.Size(117, 48);
//
+ // optionsToolStripMenuItem
+ //
+ this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
+ this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
+ this.optionsToolStripMenuItem.Text = "Options";
+ this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
+ //
// helpToolStripMenuItem
//
this.helpToolStripMenuItem.Name = "helpToolStripMenuItem";
@@ -142,12 +138,23 @@
//
// PAKTreeView
//
+ this.PAKTreeView.ImageIndex = 0;
+ this.PAKTreeView.ImageList = this.TreeViewImageList;
this.PAKTreeView.Location = new System.Drawing.Point(12, 93);
this.PAKTreeView.Name = "PAKTreeView";
+ this.PAKTreeView.SelectedImageIndex = 1;
+ this.PAKTreeView.ShowLines = false;
this.PAKTreeView.Size = new System.Drawing.Size(408, 290);
this.PAKTreeView.TabIndex = 2;
this.PAKTreeView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.PAKTreeView_NodeMouseClick);
//
+ // TreeViewImageList
+ //
+ this.TreeViewImageList.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("TreeViewImageList.ImageStream")));
+ this.TreeViewImageList.TransparentColor = System.Drawing.Color.Transparent;
+ this.TreeViewImageList.Images.SetKeyName(0, "folder.png");
+ this.TreeViewImageList.Images.SetKeyName(1, "folder_open.png");
+ //
// ItemIconPictureBox
//
this.ItemIconPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@@ -160,10 +167,10 @@
//
// groupBox2
//
+ this.groupBox2.Controls.Add(this.scintilla1);
this.groupBox2.Controls.Add(this.SaveImageButton);
this.groupBox2.Controls.Add(this.ExtractAssetButton);
this.groupBox2.Controls.Add(this.ConsoleRichTextBox);
- this.groupBox2.Controls.Add(this.ItemRichTextBox);
this.groupBox2.Controls.Add(this.ItemIconPictureBox);
this.groupBox2.Location = new System.Drawing.Point(426, 12);
this.groupBox2.Name = "groupBox2";
@@ -171,18 +178,6 @@
this.groupBox2.TabIndex = 4;
this.groupBox2.TabStop = false;
//
- // SaveImageButton
- //
- this.SaveImageButton.Location = new System.Drawing.Point(810, 635);
- this.SaveImageButton.Menu = this.ImageContext;
- this.SaveImageButton.Name = "SaveImageButton";
- this.SaveImageButton.Size = new System.Drawing.Size(112, 23);
- this.SaveImageButton.TabIndex = 11;
- this.SaveImageButton.Text = " Save Image";
- this.SaveImageButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.SaveImageButton.UseVisualStyleBackColor = true;
- this.SaveImageButton.Click += new System.EventHandler(this.SaveImageButton_Click);
- //
// ImageContext
//
this.ImageContext.ImageScalingSize = new System.Drawing.Size(18, 18);
@@ -199,18 +194,6 @@
this.OpenImageTS.Text = "Open Image";
this.OpenImageTS.Click += new System.EventHandler(this.OpenImageTS_Click);
//
- // ExtractAssetButton
- //
- this.ExtractAssetButton.Location = new System.Drawing.Point(810, 664);
- this.ExtractAssetButton.Menu = this.ExtractAsset;
- this.ExtractAssetButton.Name = "ExtractAssetButton";
- this.ExtractAssetButton.Size = new System.Drawing.Size(112, 23);
- this.ExtractAssetButton.TabIndex = 10;
- this.ExtractAssetButton.Text = " Extract Asset";
- this.ExtractAssetButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
- this.ExtractAssetButton.UseVisualStyleBackColor = true;
- this.ExtractAssetButton.Click += new System.EventHandler(this.ExtractAssetButton_Click);
- //
// ExtractAsset
//
this.ExtractAsset.ImageScalingSize = new System.Drawing.Size(18, 18);
@@ -220,7 +203,7 @@
this.toolStripSeparator1,
this.mergeGeneratedImagesToolStripMenuItem});
this.ExtractAsset.Name = "ExtractAsset";
- this.ExtractAsset.Size = new System.Drawing.Size(223, 98);
+ this.ExtractAsset.Size = new System.Drawing.Size(223, 76);
//
// LoadDataTS
//
@@ -246,6 +229,13 @@
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(219, 6);
//
+ // mergeGeneratedImagesToolStripMenuItem
+ //
+ this.mergeGeneratedImagesToolStripMenuItem.Name = "mergeGeneratedImagesToolStripMenuItem";
+ this.mergeGeneratedImagesToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
+ this.mergeGeneratedImagesToolStripMenuItem.Text = "Merge Generated Images";
+ this.mergeGeneratedImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeGeneratedImagesToolStripMenuItem_Click);
+ //
// ConsoleRichTextBox
//
this.ConsoleRichTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
@@ -256,17 +246,6 @@
this.ConsoleRichTextBox.TabIndex = 6;
this.ConsoleRichTextBox.Text = "";
//
- // ItemRichTextBox
- //
- this.ItemRichTextBox.BackColor = System.Drawing.SystemColors.Window;
- this.ItemRichTextBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.ItemRichTextBox.Location = new System.Drawing.Point(6, 18);
- this.ItemRichTextBox.Name = "ItemRichTextBox";
- this.ItemRichTextBox.ReadOnly = true;
- this.ItemRichTextBox.Size = new System.Drawing.Size(560, 350);
- this.ItemRichTextBox.TabIndex = 4;
- this.ItemRichTextBox.Text = "";
- //
// FilterLabel
//
this.FilterLabel.AutoSize = true;
@@ -284,19 +263,51 @@
this.FilterTextBox.TabIndex = 5;
this.FilterTextBox.TextChanged += new System.EventHandler(this.FilterTextBox_TextChanged);
//
- // mergeGeneratedImagesToolStripMenuItem
+ // scintilla1
//
- this.mergeGeneratedImagesToolStripMenuItem.Name = "mergeGeneratedImagesToolStripMenuItem";
- this.mergeGeneratedImagesToolStripMenuItem.Size = new System.Drawing.Size(222, 22);
- this.mergeGeneratedImagesToolStripMenuItem.Text = "Merge Generated Images";
- this.mergeGeneratedImagesToolStripMenuItem.Click += new System.EventHandler(this.mergeGeneratedImagesToolStripMenuItem_Click);
+ this.scintilla1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ this.scintilla1.IndentationGuides = ScintillaNET.IndentView.Real;
+ this.scintilla1.Location = new System.Drawing.Point(6, 18);
+ this.scintilla1.Name = "scintilla1";
+ this.scintilla1.ScrollWidth = 539;
+ this.scintilla1.Size = new System.Drawing.Size(560, 350);
+ this.scintilla1.TabIndex = 12;
//
- // optionsToolStripMenuItem
+ // SaveImageButton
//
- this.optionsToolStripMenuItem.Name = "optionsToolStripMenuItem";
- this.optionsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
- this.optionsToolStripMenuItem.Text = "Options";
- this.optionsToolStripMenuItem.Click += new System.EventHandler(this.optionsToolStripMenuItem_Click);
+ this.SaveImageButton.Location = new System.Drawing.Point(810, 635);
+ this.SaveImageButton.Menu = this.ImageContext;
+ this.SaveImageButton.Name = "SaveImageButton";
+ this.SaveImageButton.Size = new System.Drawing.Size(112, 23);
+ this.SaveImageButton.TabIndex = 11;
+ this.SaveImageButton.Text = " Save Image";
+ this.SaveImageButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.SaveImageButton.UseVisualStyleBackColor = true;
+ this.SaveImageButton.Click += new System.EventHandler(this.SaveImageButton_Click);
+ //
+ // ExtractAssetButton
+ //
+ this.ExtractAssetButton.Location = new System.Drawing.Point(810, 664);
+ this.ExtractAssetButton.Menu = this.ExtractAsset;
+ this.ExtractAssetButton.Name = "ExtractAssetButton";
+ this.ExtractAssetButton.Size = new System.Drawing.Size(112, 23);
+ this.ExtractAssetButton.TabIndex = 10;
+ this.ExtractAssetButton.Text = " Extract Asset";
+ this.ExtractAssetButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.ExtractAssetButton.UseVisualStyleBackColor = true;
+ this.ExtractAssetButton.Click += new System.EventHandler(this.ExtractAssetButton_Click);
+ //
+ // LoadButton
+ //
+ this.LoadButton.Location = new System.Drawing.Point(296, 18);
+ this.LoadButton.Menu = this.LoadContext;
+ this.LoadButton.Name = "LoadButton";
+ this.LoadButton.Size = new System.Drawing.Size(106, 23);
+ this.LoadButton.TabIndex = 12;
+ this.LoadButton.Text = " Load";
+ this.LoadButton.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+ this.LoadButton.UseVisualStyleBackColor = true;
+ this.LoadButton.Click += new System.EventHandler(this.LoadButton_Click);
//
// PAKWindow
//
@@ -339,7 +350,6 @@
private System.Windows.Forms.TreeView PAKTreeView;
private System.Windows.Forms.PictureBox ItemIconPictureBox;
private System.Windows.Forms.GroupBox groupBox2;
- private System.Windows.Forms.RichTextBox ItemRichTextBox;
private System.Windows.Forms.RichTextBox ConsoleRichTextBox;
private System.Windows.Forms.Label FilterLabel;
private System.Windows.Forms.TextBox FilterTextBox;
@@ -356,6 +366,8 @@
private System.Windows.Forms.ToolStripMenuItem helpToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem optionsToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem mergeGeneratedImagesToolStripMenuItem;
+ private System.Windows.Forms.ImageList TreeViewImageList;
+ private ScintillaNET.Scintilla scintilla1;
}
}
diff --git a/FModel/PAKWindow.cs b/FModel/PAKWindow.cs
index 2c06ee9c..6f412870 100644
--- a/FModel/PAKWindow.cs
+++ b/FModel/PAKWindow.cs
@@ -32,6 +32,13 @@ namespace FModel
private int fontLength;
private byte[] fontdata;
+ [DllImport("uxtheme.dll", ExactSpelling = true, CharSet = CharSet.Unicode)]
+ private static extern int SetWindowTheme(IntPtr hwnd, string pszSubAppName, string pszSubIdList);
+ public static void SetTreeViewTheme(IntPtr treeHandle)
+ {
+ SetWindowTheme(treeHandle, "explorer", null);
+ }
+
public PAKWindow()
{
InitializeComponent();
@@ -72,6 +79,7 @@ namespace FModel
private void PAKWindow_Load(object sender, EventArgs e)
{
+ SetTreeViewTheme(PAKTreeView.Handle);
Properties.Settings.Default.ExtractAndSerialize = true; //SERIALIZE BY DEFAULT
docPath = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments).ToString() + "\\FModel";
@@ -159,6 +167,17 @@ namespace FModel
rightString.Alignment = StringAlignment.Far;
centeredStringLine.LineAlignment = StringAlignment.Center;
centeredStringLine.Alignment = StringAlignment.Center;
+
+ // Configure the JSON lexer styles
+ scintilla1.Styles[ScintillaNET.Style.Json.Default].ForeColor = Color.Silver;
+ scintilla1.Styles[ScintillaNET.Style.Json.BlockComment].ForeColor = Color.FromArgb(0, 128, 0);
+ scintilla1.Styles[ScintillaNET.Style.Json.LineComment].ForeColor = Color.FromArgb(0, 128, 0);
+ scintilla1.Styles[ScintillaNET.Style.Json.Number].ForeColor = Color.Green;
+ scintilla1.Styles[ScintillaNET.Style.Json.PropertyName].ForeColor = Color.SteelBlue; ;
+ scintilla1.Styles[ScintillaNET.Style.Json.String].ForeColor = Color.OrangeRed;
+ scintilla1.Styles[ScintillaNET.Style.Json.StringEol].BackColor = Color.OrangeRed;
+ scintilla1.Styles[ScintillaNET.Style.Json.Operator].ForeColor = Color.Black;
+ scintilla1.Lexer = ScintillaNET.Lexer.Json;
} //EVERYTHING TO SET WHEN APP IS STARTING
private void PAKWindow_FormClosing(object sender, FormClosingEventArgs e)
{
@@ -192,7 +211,7 @@ namespace FModel
}
if (node == null)
{
- node = new TreeNode(folder);
+ node = new TreeNode(folder) { ImageIndex=0 };
nodeList.Add(node);
}
if (path != "")
@@ -586,7 +605,7 @@ namespace FModel
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
- ItemRichTextBox.Text = "";
+ scintilla1.Text = "";
ItemIconPictureBox.Image = null;
if (!Directory.Exists(docPath + "\\Extracted\\")) //Create Extracted Subfolder
@@ -645,7 +664,7 @@ namespace FModel
AppendText("✔ ", Color.Green);
AppendText(currentItem, Color.DarkRed);
AppendText(" successfully serialized", Color.Black, true);
- ItemRichTextBox.Text = json;
+ scintilla1.Text = json;
var IDParser = ItemsIdParser.FromJson(json);
@@ -1270,7 +1289,7 @@ namespace FModel
}
if (files.Contains(".ini"))
{
- ItemRichTextBox.Text = File.ReadAllText(files);
+ scintilla1.Text = File.ReadAllText(files);
}
}
else
diff --git a/FModel/PAKWindow.resx b/FModel/PAKWindow.resx
index 64bda541..16353538 100644
--- a/FModel/PAKWindow.resx
+++ b/FModel/PAKWindow.resx
@@ -117,12 +117,58 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
277, 17
True
+
+ 398, 17
+
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+ LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACc
+ BwAAAk1TRnQBSQFMAgEBAgEAASABAAEgAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+ AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
+ AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
+ AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
+ AWYDAAGZAwABzAIAATMDAAIzAgABMwFmAgABMwGZAgABMwHMAgABMwH/AgABZgMAAWYBMwIAAmYCAAFm
+ AZkCAAFmAcwCAAFmAf8CAAGZAwABmQEzAgABmQFmAgACmQIAAZkBzAIAAZkB/wIAAcwDAAHMATMCAAHM
+ AWYCAAHMAZkCAALMAgABzAH/AgAB/wFmAgAB/wGZAgAB/wHMAQABMwH/AgAB/wEAATMBAAEzAQABZgEA
+ ATMBAAGZAQABMwEAAcwBAAEzAQAB/wEAAf8BMwIAAzMBAAIzAWYBAAIzAZkBAAIzAcwBAAIzAf8BAAEz
+ AWYCAAEzAWYBMwEAATMCZgEAATMBZgGZAQABMwFmAcwBAAEzAWYB/wEAATMBmQIAATMBmQEzAQABMwGZ
+ AWYBAAEzApkBAAEzAZkBzAEAATMBmQH/AQABMwHMAgABMwHMATMBAAEzAcwBZgEAATMBzAGZAQABMwLM
+ AQABMwHMAf8BAAEzAf8BMwEAATMB/wFmAQABMwH/AZkBAAEzAf8BzAEAATMC/wEAAWYDAAFmAQABMwEA
+ AWYBAAFmAQABZgEAAZkBAAFmAQABzAEAAWYBAAH/AQABZgEzAgABZgIzAQABZgEzAWYBAAFmATMBmQEA
+ AWYBMwHMAQABZgEzAf8BAAJmAgACZgEzAQADZgEAAmYBmQEAAmYBzAEAAWYBmQIAAWYBmQEzAQABZgGZ
+ AWYBAAFmApkBAAFmAZkBzAEAAWYBmQH/AQABZgHMAgABZgHMATMBAAFmAcwBmQEAAWYCzAEAAWYBzAH/
+ AQABZgH/AgABZgH/ATMBAAFmAf8BmQEAAWYB/wHMAQABzAEAAf8BAAH/AQABzAEAApkCAAGZATMBmQEA
+ AZkBAAGZAQABmQEAAcwBAAGZAwABmQIzAQABmQEAAWYBAAGZATMBzAEAAZkBAAH/AQABmQFmAgABmQFm
+ ATMBAAGZATMBZgEAAZkBZgGZAQABmQFmAcwBAAGZATMB/wEAApkBMwEAApkBZgEAA5kBAAKZAcwBAAKZ
+ Af8BAAGZAcwCAAGZAcwBMwEAAWYBzAFmAQABmQHMAZkBAAGZAswBAAGZAcwB/wEAAZkB/wIAAZkB/wEz
+ AQABmQHMAWYBAAGZAf8BmQEAAZkB/wHMAQABmQL/AQABzAMAAZkBAAEzAQABzAEAAWYBAAHMAQABmQEA
+ AcwBAAHMAQABmQEzAgABzAIzAQABzAEzAWYBAAHMATMBmQEAAcwBMwHMAQABzAEzAf8BAAHMAWYCAAHM
+ AWYBMwEAAZkCZgEAAcwBZgGZAQABzAFmAcwBAAGZAWYB/wEAAcwBmQIAAcwBmQEzAQABzAGZAWYBAAHM
+ ApkBAAHMAZkBzAEAAcwBmQH/AQACzAIAAswBMwEAAswBZgEAAswBmQEAA8wBAALMAf8BAAHMAf8CAAHM
+ Af8BMwEAAZkB/wFmAQABzAH/AZkBAAHMAf8BzAEAAcwC/wEAAcwBAAEzAQAB/wEAAWYBAAH/AQABmQEA
+ AcwBMwIAAf8CMwEAAf8BMwFmAQAB/wEzAZkBAAH/ATMBzAEAAf8BMwH/AQAB/wFmAgAB/wFmATMBAAHM
+ AmYBAAH/AWYBmQEAAf8BZgHMAQABzAFmAf8BAAH/AZkCAAH/AZkBMwEAAf8BmQFmAQAB/wKZAQAB/wGZ
+ AcwBAAH/AZkB/wEAAf8BzAIAAf8BzAEzAQAB/wHMAWYBAAH/AcwBmQEAAf8CzAEAAf8BzAH/AQAC/wEz
+ AQABzAH/AWYBAAL/AZkBAAL/AcwBAAJmAf8BAAFmAf8BZgEAAWYC/wEAAf8CZgEAAf8BZgH/AQAC/wFm
+ AQABIQEAAaUBAANfAQADdwEAA4YBAAOWAQADywEAA7IBAAPXAQAD3QEAA+MBAAPqAQAD8QEAA/gBAAHw
+ AfsB/wEAAaQCoAEAA4ADAAH/AgAB/wMAAv8BAAH/AwAB/wEAAf8BAAL/AgAD/wEAEP8wABuuBJYBriAA
+ Gq4GliAAB64B6gESEa4ClgHxAfQCliAABq4B6gFtAhIQrgSWAboBliAABq4BbQGuARIBrgFtD64ElgG7
+ AZYgAAiuARISrgSWAa4gAAiuARIXriAACK4BEheuIAAgriAAIK4gAAiuCBQIrggUIAAHrgHsCBQHrgHq
+ CBQgAAauAe0JAAauAQcpAAauCgAGrmoAAUIBTQE+BwABPgMAASgDAAFAAwABEAMAAQEBAAEBBQABgBcA
+ A/8DAAL/ZAABAQH/AQEB/wQAAQMB/wEDAf8EAAT/BAAL
+
+
134, 17
diff --git a/FModel/Resources/folder.png b/FModel/Resources/folder.png
new file mode 100644
index 00000000..93c4d4e3
Binary files /dev/null and b/FModel/Resources/folder.png differ
diff --git a/FModel/packages.config b/FModel/packages.config
index 466ab764..962f15c1 100644
--- a/FModel/packages.config
+++ b/FModel/packages.config
@@ -1,4 +1,5 @@
+
\ No newline at end of file