joce · juanrarodriguez18 · Jan 14, 2018 · Jan 14, 2018 · Jan 14, 2018 · Jan 14, 2018
diff --git a/.gitignore b/.gitignore
@@ -6,16 +6,6 @@
 *.user
 *.sln.docstates
 
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-x64/
-build/
-bld/
-[Bb]in/
-[Oo]bj/
-
 # MSTest test Results
 [Tt]est[Rr]esult*/
 [Bb]uild[Ll]og.*
@@ -172,3 +162,4 @@ UpgradeLog*.htm
 
 # Microsoft Fakes
 FakesAssemblies/
+/Source/.vs/Ruler/v15/Server/sqlite3
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Fork of small utility application for Windows called Ruler.
 <img src="https://github.com/andrijac/ruler/raw/master/img/ruler.gif">
 
 Download working version:
-https://github.com/andrijac/ruler/tree/master/Bin/Debug
+https://github.com/juanrarodriguez18/ruler/blob/master/Source/Ruler/bin/Debug/ruler.exe
 
 Original project was developed by Jeff Key:
 
@@ -32,4 +32,16 @@ I wanted to add some features and to have it hosted on GitHub.
 
 Support for .NET 2.0 is kept.
 
-*Gifs are made using LICEcap http://www.cockos.com/licecap/*
+*Gifs are made using LICEcap http://www.cockos.com/licecap/*
+
+<a name="othernewfeatures" href="#othernewfeatures">#</a>Other new features:
+
+- **Buttons** - added buttons for lock and flip the rule.
+
+- **Shortcuts** - added shortcuts for change rule's orientation and flip it and make it's use more easy.
+
+- **Colors** - put color in your life! The new rules has some predefined colors and the option to put the custom color that you want.
+
+- **Fix bugs** - of course some bugs have also been fixed ;).
+
+
diff --git a/Source/Ruler/AboutForm.resx b/Source/Ruler/AboutForm.resx
@@ -144,6 +144,11 @@ https://github.com/kriserickson/ruler
 
 Ishmaeel
 https://github.com/Ishmaeel/ruler
-  - This about box</value>
+  - This about box
+
+Juanra Rodriguez
+https://github.com/juanrarodriguez18/ruler
+  - Added purple and orange color
+  - Added custom color option with HEX code</value>
   </data>
-</root>
+</root>
diff --git a/Source/Ruler/CustomColorForm.Designer.cs b/Source/Ruler/CustomColorForm.Designer.cs
diff --git a/Source/Ruler/CustomColorForm.cs b/Source/Ruler/CustomColorForm.cs
@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Text;
+using System.Windows.Forms;
+
+namespace Ruler
+{
+	public partial class CustomColorForm : Form
+	{
+		private String originalHexCode;
+
+		public CustomColorForm(String initHexCode)
+		{
+			this.InitializeComponent();
+
+			this.originalHexCode = initHexCode;
+
+			this.hexCode.Text = initHexCode;
+		}
+
+		private void BtnCancelClick(object sender, EventArgs e)
+		{
+			this.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+			this.Close();
+		}
+
+		private void BtnOkClick(object sender, EventArgs e)
+		{
+			this.DialogResult = System.Windows.Forms.DialogResult.OK;
+		}
+
+		public Color GetNewColor()
+		{
+
+			Color color = new Color();
+
+			//Check if color is correct
+			try
+			{
+				color = ColorTranslator.FromHtml(this.hexCode.Text);
+			}
+			catch (Exception)
+			{
+				color = ColorTranslator.FromHtml(this.originalHexCode);
+			}
+
+			//Check if color is transparent
+			if(color.A == 0)
+			{
+				color = ColorTranslator.FromHtml(this.originalHexCode);
+			}
+
+			return color;
+		}
+	}
+}
diff --git a/Source/Ruler/CustomColorForm.resx b/Source/Ruler/CustomColorForm.resx
@@ -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>