Skip to content

Commit

Permalink
Added saved searches; changed storage mechanism of boilerplate and ad…
Browse files Browse the repository at this point in the history 
…ded migration pathway; updated helpfile for 2.0.0 release
  • Loading branch information
@Perlkonig
Perlkonig committed Nov 28, 2018
1 parent 8b1cc87 commit 75640b5
Show file tree
Hide file tree
Showing 24 changed files with 1,751 additions and 343 deletions.
25 changes: 25 additions & 0 deletions EditTools/EditingTools.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,9 @@
-->
<ItemGroup>
<Reference Include="Accessibility" />
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
Expand Down Expand Up @@ -188,6 +191,18 @@
<Compile Include="InputDialog.Designer.cs">
<DependentUpon>InputDialog.cs</DependentUpon>
</Compile>
<Compile Include="ManageBoiler.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ManageBoiler.Designer.cs">
<DependentUpon>ManageBoiler.cs</DependentUpon>
</Compile>
<Compile Include="ManageSearches.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="ManageSearches.Designer.cs">
<DependentUpon>ManageSearches.cs</DependentUpon>
</Compile>
<Compile Include="ProgressDialog.cs">
<SubType>Form</SubType>
</Compile>
Expand All @@ -197,6 +212,15 @@
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<EmbeddedResource Include="ImportDialog.resx">
<DependentUpon>ImportDialog.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ManageBoiler.resx">
<DependentUpon>ManageBoiler.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ManageSearches.resx">
<DependentUpon>ManageSearches.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="ProgressDialog.resx">
<DependentUpon>ProgressDialog.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -240,6 +264,7 @@
<Compile Include="SettingsDialog.Designer.cs">
<DependentUpon>SettingsDialog.cs</DependentUpon>
</Compile>
<Compile Include="SettingsClasses.cs" />
<Compile Include="ShortDoubleMetaphone.cs" />
<Compile Include="TextHelpers.cs" />
<Compile Include="ThisAddIn.cs">
Expand Down
30 changes: 14 additions & 16 deletions EditTools/ImportDialog.Designer.cs
View file

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

59 changes: 15 additions & 44 deletions EditTools/ImportDialog.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ namespace EditTools
{
public partial class ImportDialog : Form
{
public enum Modes { REPLACE, MERGE, NEW };

public ImportDialog()
{
InitializeComponent();
Expand All @@ -18,8 +20,8 @@ private void btn_ImportSelect_Click(object sender, EventArgs e)
OpenFileDialog ofd = new OpenFileDialog();
ofd.CheckFileExists = true;
ofd.CheckPathExists = true;
ofd.DefaultExt = "xml";
ofd.Filter = "XML files (*.xml)|*.xml|All files|*.*";
ofd.DefaultExt = "json";
ofd.Filter = "JSON files (*.json)|*.json|All files|*.*";
ofd.Title = "Settings file to import";

if (ofd.ShowDialog() == DialogResult.OK)
Expand All @@ -28,60 +30,29 @@ private void btn_ImportSelect_Click(object sender, EventArgs e)
}
}

private void btn_Close_Click(object sender, EventArgs e)
public string GetFileName()
{
this.Close();
return txt_ImportFile.Text;
}

private void btn_Import_Click(object sender, EventArgs e)
public Modes GetMode()
{
StringCollection sc = Properties.Settings.Default.boilerplate;
Dictionary<string, string> dict = new Dictionary<string, string>();
for (int i = 0; i < sc.Count - 1; i += 2)
if (radio_Replace.Checked)
{
dict.Add(sc[i], sc[i + 1]);
return Modes.REPLACE;
}
if (radio_Replace.Checked == true)
else if (radio_MergeReplace.Checked)
{
dict = new Dictionary<string, string>();
return Modes.MERGE;
}

using (XmlReader reader = XmlReader.Create(txt_ImportFile.Text))
else if (radio_MergeNew.Checked)
{
while (reader.Read())
{
if ((reader.IsStartElement()) && (reader.Name == "entry"))
{
string key = reader["key"];
string value = "";
if (reader.Read())
{
value = reader.Value.Trim();
}
if (dict.ContainsKey(key))
{
if (radio_MergeReplace.Checked == true)
{
dict[key] = value;
}
}
else
{
dict.Add(key, value);
}
}
}
return Modes.NEW;
}

StringCollection newsc = new StringCollection();
foreach (string key in dict.Keys)
else
{
newsc.Add(key);
newsc.Add(dict[key]);
throw new InvalidOperationException("None of the radio buttons were selected. This should *never* happen!");
}
Properties.Settings.Default.boilerplate = newsc;
Properties.Settings.Default.Save();
MessageBox.Show("Import complete.");
}
}
}
120 changes: 120 additions & 0 deletions EditTools/ImportDialog.resx
View file
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 75640b5

Please sign in to comment.