Skip to content

Commit

Permalink
Add support for a few extra fields inthe INOF file
Browse files Browse the repository at this point in the history
  • Loading branch information
vletroye committed Nov 19, 2017
1 parent af657e1 commit 74bf030
Show file tree
Hide file tree
Showing 334 changed files with 174,349 additions and 75,097 deletions.
Binary file modified Crypto/bin/Debug/lib/net20/BouncyCastle.dll
Binary file not shown.
Binary file modified Crypto/bin/Debug/lib/net20/BouncyCastle.pdb
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
E:\Work\Development\Git\Mods\Mods\crypto\bin\Debug\lib\net20\BouncyCastle.dll
E:\Work\Development\Git\Mods\Mods\crypto\bin\Debug\lib\net20\BouncyCastle.pdb
E:\Work\Development\Git\Mods\Mods\crypto\obj\Debug\lib\net20\BouncyCastle.csprojResolveAssemblyReference.cache
E:\Work\Development\Git\Mods\Mods\crypto\obj\Debug\lib\net20\BouncyCastle.dll
E:\Work\Development\Git\Mods\Mods\crypto\obj\Debug\lib\net20\BouncyCastle.pdb
E:\Work\Development\Git\Mods\Mods\Crypto\bin\Debug\lib\net20\BouncyCastle.dll
E:\Work\Development\Git\Mods\Mods\Crypto\bin\Debug\lib\net20\BouncyCastle.pdb
E:\Work\Development\Git\Mods\Mods\Crypto\obj\Debug\lib\net20\BouncyCastle.csprojResolveAssemblyReference.cache
E:\Work\Development\Git\Mods\Mods\Crypto\obj\Debug\lib\net20\BouncyCastle.dll
E:\Work\Development\Git\Mods\Mods\Crypto\obj\Debug\lib\net20\BouncyCastle.pdb
Binary file not shown.
Binary file modified Crypto/obj/Debug/lib/net20/BouncyCastle.dll
Binary file not shown.
Binary file modified Crypto/obj/Debug/lib/net20/BouncyCastle.pdb
Binary file not shown.
4 changes: 2 additions & 2 deletions Json Editor/Json Editor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@
<StartupObject />
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\MyOwnDSMShortcuts\Resources\Newtonsoft.Json.dll</HintPath>
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\MyOwnDSMShortcuts\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
Expand Down
Binary file modified Json Editor/bin/Debug/Newtonsoft.Json.dll
Binary file not shown.
Binary file removed Json Editor/bin/Debug/Newtonsoft.Json.pdb
Binary file not shown.
3,443 changes: 2,487 additions & 956 deletions Json Editor/bin/Debug/Newtonsoft.Json.xml

Large diffs are not rendered by default.

Binary file modified Json Editor/bin/Debug/ScintillaNET.dll
Binary file not shown.
Binary file modified Json Editor/bin/Debug/ScintillaNET.pdb
Binary file not shown.
Binary file modified Json Editor/bin/Debug/ZTn.Json.Editor.dll
Binary file not shown.
Binary file modified Json Editor/bin/Debug/ZTn.Json.Editor.pdb
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\Newtonsoft.Json.dll
E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\ScintillaNET.dll
E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\ScintillaNET.pdb
E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\ScintillaNET.xml
E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\Newtonsoft.Json.pdb
E:\Work\Development\Git\Mods\Mods\Json Editor\bin\Debug\Newtonsoft.Json.xml
E:\Work\Development\Git\Mods\Mods\Json Editor\obj\Debug\Json Editor.csprojResolveAssemblyReference.cache
E:\Work\Development\Git\Mods\Mods\Json Editor\obj\Debug\ZTn.Json.Editor.Forms.AboutBox.resources
Expand Down
Binary file modified Json Editor/obj/Debug/Json Editor.csproj.GenerateResource.Cache
Binary file not shown.
Binary file not shown.
Binary file modified Json Editor/obj/Debug/ZTn.Json.Editor.dll
Binary file not shown.
Binary file modified Json Editor/obj/Debug/ZTn.Json.Editor.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion Json Editor/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="9.0.1" targetFramework="net45" />
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
</packages>
Binary file modified MyOwnDSMShortcuts/.vs/Mods/v14/.suo
Binary file not shown.
95 changes: 95 additions & 0 deletions MyOwnDSMShortcuts/ArchAndModels.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

112 changes: 112 additions & 0 deletions MyOwnDSMShortcuts/ArchAndModels.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using YamlDotNet.Serialization;

namespace BeatificaBytes.Synology.Mods
{
public partial class ArchAndModels : Form
{
private string[] selectedArchs;
private string[] selectedModels;

public ArchAndModels(string archs, string models)
{
InitializeComponent();
if (archs == null) archs = "";
this.selectedArchs = archs.Split(' ');
if (models != null)
{
var list = new List<String>();
foreach (string item in models.Split(' '))
{
list.Add(item.Split('_').Last());
}
this.selectedModels = list.ToArray();
}
}

private void ArchAndModels_Load(object sender, EventArgs e)
{
string yaml = File.ReadAllText(@"Resources\synology_models.yaml");
var deserializer = new Deserializer();
var result = deserializer.Deserialize<Dictionary<string, Dictionary<string, List<String>>>>(new StringReader(yaml));
foreach (var item in result)
{
var plateform = treeViewArch.Nodes.Add(item.Key);
foreach (var archItem in item.Value)
{
var arch = plateform.Nodes.Add(archItem.Key);
if (selectedArchs.Contains(archItem.Key, StringComparer.InvariantCultureIgnoreCase))
arch.Checked = true;
if (archItem.Value != null && this.selectedModels != null)
{
foreach (var modelItem in archItem.Value)
{
var model = arch.Nodes.Add(modelItem);
if (selectedModels.Contains(modelItem, StringComparer.InvariantCultureIgnoreCase))
model.Checked = true;
}
}
}
plateform.ExpandAll();
}
}

public string archs
{
get
{
var list = new List<string>();
foreach (TreeNode platform in treeViewArch.Nodes)
{
foreach (TreeNode arch in platform.Nodes)
{
if (arch.Checked)
list.Add(arch.Text);
}
}
return string.Join(" ", list);
}
}
public string models
{
get
{
var list = new List<string>();
foreach (TreeNode platform in treeViewArch.Nodes)
{
foreach (TreeNode arch in platform.Nodes)
{
foreach (TreeNode model in arch.Nodes)
{
if (model.Checked)
list.Add(string.Format("synology_{0}_{1}", arch.Text, model.Text));
}
}
}
return string.Join(" ", list);
}
}

private void buttonOk_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.OK;
this.Hide();
}

private void buttonCancel_Click(object sender, EventArgs e)
{
DialogResult = DialogResult.Cancel;
this.Hide();
}
}
}
120 changes: 120 additions & 0 deletions MyOwnDSMShortcuts/ArchAndModels.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
Loading

0 comments on commit 74bf030

Please sign in to comment.