diff --git a/Hashing/AboutForm.cs b/Hashing/AboutForm.cs
index 8371e46..baab8ab 100644
--- a/Hashing/AboutForm.cs
+++ b/Hashing/AboutForm.cs
@@ -54,10 +54,7 @@ private void t2_Tick(object sender, EventArgs e)
string s7 = "deadmoo";
string s8 = "deadmoon";
string s9 = "deadmoon © ";
- string s10 = "deadmoon © 2";
- string s11 = "deadmoon © 20";
- string s12 = "deadmoon © 201";
- string s13 = "deadmoon © 2018";
+ string s10 = "deadmoon © ∞";
switch (l2.Text)
{
@@ -90,19 +87,9 @@ private void t2_Tick(object sender, EventArgs e)
break;
case "deadmoon © ":
l2.Text = s10;
- break;
- case "deadmoon © 2":
- l2.Text = s11;
- break;
- case "deadmoon © 20":
- l2.Text = s12;
- break;
- case "deadmoon © 201":
- l2.Text = s13;
t2.Stop();
- //t1.Start();
break;
- case "deadmoon © 2018":
+ case "deadmoon © ∞":
l2.Text = s0;
break;
}
@@ -110,7 +97,7 @@ private void t2_Tick(object sender, EventArgs e)
private void l2_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
{
- Process.Start("https://elgaming.eu/deadmoon");
+ Process.Start("https://github.com/hellzerg/hashing");
}
private void t1_Tick(object sender, EventArgs e)
@@ -120,7 +107,7 @@ private void t1_Tick(object sender, EventArgs e)
const string s2 = "Ha";
const string s3 = "Has";
const string s4 = "Hash";
- const string s5 = "Hashi";
+ const string s5 = "Hashi";
const string s6 = "Hashin";
const string s7 = "Hashing";
diff --git a/Hashing/CompareForm.Designer.cs b/Hashing/CompareForm.Designer.cs
index 46fabf4..523a10b 100644
--- a/Hashing/CompareForm.Designer.cs
+++ b/Hashing/CompareForm.Designer.cs
@@ -29,13 +29,13 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
- this.chkCRC32 = new System.Windows.Forms.RadioButton();
- this.chkSHA512 = new System.Windows.Forms.RadioButton();
- this.chkSHA384 = new System.Windows.Forms.RadioButton();
- this.chkRIPEMD160 = new System.Windows.Forms.RadioButton();
- this.chkSHA256 = new System.Windows.Forms.RadioButton();
- this.chkSHA1 = new System.Windows.Forms.RadioButton();
- this.chkMD5 = new System.Windows.Forms.RadioButton();
+ this.chkCRC32 = new ColoredRadioButton();
+ this.chkSHA512 = new ColoredRadioButton();
+ this.chkSHA384 = new ColoredRadioButton();
+ this.chkRIPEMD160 = new ColoredRadioButton();
+ this.chkSHA256 = new ColoredRadioButton();
+ this.chkSHA1 = new ColoredRadioButton();
+ this.chkMD5 = new ColoredRadioButton();
this.label1 = new System.Windows.Forms.Label();
this.txtExpected = new System.Windows.Forms.TextBox();
this.btnCompare = new System.Windows.Forms.Button();
@@ -43,7 +43,7 @@ private void InitializeComponent()
this.resultBox = new System.Windows.Forms.ListBox();
this.panel2 = new System.Windows.Forms.Panel();
this.lblNoMatch = new System.Windows.Forms.Label();
- this.chkRemove = new System.Windows.Forms.CheckBox();
+ this.chkRemove = new ColoredCheckBox();
this.btnPaste = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
this.panel2.SuspendLayout();
@@ -327,20 +327,20 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.RadioButton chkSHA512;
- private System.Windows.Forms.RadioButton chkSHA384;
- private System.Windows.Forms.RadioButton chkRIPEMD160;
- private System.Windows.Forms.RadioButton chkSHA256;
- private System.Windows.Forms.RadioButton chkSHA1;
- private System.Windows.Forms.RadioButton chkMD5;
+ private ColoredRadioButton chkSHA512;
+ private ColoredRadioButton chkSHA384;
+ private ColoredRadioButton chkRIPEMD160;
+ private ColoredRadioButton chkSHA256;
+ private ColoredRadioButton chkSHA1;
+ private ColoredRadioButton chkMD5;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtExpected;
private System.Windows.Forms.Button btnCompare;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.ListBox resultBox;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.CheckBox chkRemove;
- private System.Windows.Forms.RadioButton chkCRC32;
+ private ColoredCheckBox chkRemove;
+ private ColoredRadioButton chkCRC32;
private System.Windows.Forms.Button btnPaste;
private System.Windows.Forms.Label lblNoMatch;
}
diff --git a/Hashing/Controls/ColoredCheckBox.cs b/Hashing/Controls/ColoredCheckBox.cs
new file mode 100644
index 0000000..ee4895c
--- /dev/null
+++ b/Hashing/Controls/ColoredCheckBox.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Hashing
+{
+ public class ColoredCheckBox : CheckBox
+ {
+ protected override void OnCheckedChanged(EventArgs e)
+ {
+ base.OnCheckedChanged(e);
+
+ // custom theming
+ if (this.Checked)
+ {
+ this.Tag = "themeable";
+ this.Font = new Font(this.Font, FontStyle.Underline);
+
+ switch (Options.CurrentOptions.Color)
+ {
+ case Theme.Caramel:
+ this.ForeColor = Color.DarkOrange;
+ break;
+ case Theme.Lime:
+ this.ForeColor = Color.LimeGreen;
+ break;
+ case Theme.Magma:
+ this.ForeColor = Color.Tomato;
+ break;
+ case Theme.Minimal:
+ this.ForeColor = Color.Gray;
+ break;
+ case Theme.Ocean:
+ this.ForeColor = Color.DodgerBlue;
+ break;
+ case Theme.Zerg:
+ this.ForeColor = Color.MediumOrchid;
+ break;
+ }
+ }
+ else
+ {
+ this.Tag = string.Empty;
+ this.ForeColor = Color.White;
+ this.Font = new Font(this.Font, FontStyle.Regular);
+ }
+ }
+ }
+}
diff --git a/Hashing/Controls/ColoredRadioButton.cs b/Hashing/Controls/ColoredRadioButton.cs
new file mode 100644
index 0000000..f1b6345
--- /dev/null
+++ b/Hashing/Controls/ColoredRadioButton.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Hashing
+{
+ public class ColoredRadioButton : RadioButton
+ {
+ protected override void OnCheckedChanged(EventArgs e)
+ {
+ base.OnCheckedChanged(e);
+
+ // custom theming
+ if (this.Checked)
+ {
+ this.Tag = "themeable";
+ this.Font = new Font(this.Font, FontStyle.Underline);
+
+ switch (Options.CurrentOptions.Color)
+ {
+ case Theme.Caramel:
+ this.ForeColor = Color.DarkOrange;
+ break;
+ case Theme.Lime:
+ this.ForeColor = Color.LimeGreen;
+ break;
+ case Theme.Magma:
+ this.ForeColor = Color.Tomato;
+ break;
+ case Theme.Minimal:
+ this.ForeColor = Color.Gray;
+ break;
+ case Theme.Ocean:
+ this.ForeColor = Color.DodgerBlue;
+ break;
+ case Theme.Zerg:
+ this.ForeColor = Color.MediumOrchid;
+ break;
+ }
+ }
+ else
+ {
+ this.Tag = string.Empty;
+ this.ForeColor = Color.White;
+ this.Font = new Font(this.Font, FontStyle.Regular);
+ }
+ }
+ }
+}
diff --git a/Hashing/Hashing.csproj b/Hashing/Hashing.csproj
index 9f6c89a..1b8c02c 100644
--- a/Hashing/Hashing.csproj
+++ b/Hashing/Hashing.csproj
@@ -76,6 +76,12 @@
CompareForm.cs
+
+ Component
+
+
+ Component
+
Form
diff --git a/Hashing/IdenticalsForm.Designer.cs b/Hashing/IdenticalsForm.Designer.cs
index 2c701e7..edac406 100644
--- a/Hashing/IdenticalsForm.Designer.cs
+++ b/Hashing/IdenticalsForm.Designer.cs
@@ -34,14 +34,14 @@ private void InitializeComponent()
this.copyToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.saveAsJSONToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.panel2 = new System.Windows.Forms.Panel();
- this.radioMD5 = new System.Windows.Forms.RadioButton();
- this.radioSHA1 = new System.Windows.Forms.RadioButton();
- this.radioSHA256 = new System.Windows.Forms.RadioButton();
- this.radioRIPEMD160 = new System.Windows.Forms.RadioButton();
- this.radioSHA384 = new System.Windows.Forms.RadioButton();
- this.radioSHA512 = new System.Windows.Forms.RadioButton();
+ this.radioMD5 = new ColoredRadioButton();
+ this.radioSHA1 = new ColoredRadioButton();
+ this.radioSHA256 = new ColoredRadioButton();
+ this.radioRIPEMD160 = new ColoredRadioButton();
+ this.radioSHA384 = new ColoredRadioButton();
+ this.radioSHA512 = new ColoredRadioButton();
this.panel1 = new System.Windows.Forms.Panel();
- this.radioCRC32 = new System.Windows.Forms.RadioButton();
+ this.radioCRC32 = new ColoredRadioButton();
this.helperMenu.SuspendLayout();
this.panel2.SuspendLayout();
this.panel1.SuspendLayout();
@@ -244,13 +244,13 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem copyToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem saveAsJSONToolStripMenuItem;
private System.Windows.Forms.Panel panel2;
- private System.Windows.Forms.RadioButton radioMD5;
- private System.Windows.Forms.RadioButton radioSHA1;
- private System.Windows.Forms.RadioButton radioSHA256;
- private System.Windows.Forms.RadioButton radioRIPEMD160;
- private System.Windows.Forms.RadioButton radioSHA384;
- private System.Windows.Forms.RadioButton radioSHA512;
+ private ColoredRadioButton radioMD5;
+ private ColoredRadioButton radioSHA1;
+ private ColoredRadioButton radioSHA256;
+ private ColoredRadioButton radioRIPEMD160;
+ private ColoredRadioButton radioSHA384;
+ private ColoredRadioButton radioSHA512;
private System.Windows.Forms.Panel panel1;
- private System.Windows.Forms.RadioButton radioCRC32;
+ private ColoredRadioButton radioCRC32;
}
}
\ No newline at end of file
diff --git a/Hashing/MainForm.Designer.cs b/Hashing/MainForm.Designer.cs
index 5e6323f..62ab292 100644
--- a/Hashing/MainForm.Designer.cs
+++ b/Hashing/MainForm.Designer.cs
@@ -37,6 +37,7 @@ private void InitializeComponent()
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.clearToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.topPanel = new System.Windows.Forms.Panel();
+ this.btnUpdate = new System.Windows.Forms.Button();
this.btnCalculate = new System.Windows.Forms.Button();
this.btnBrowse = new System.Windows.Forms.Button();
this.txtPath = new System.Windows.Forms.TextBox();
@@ -54,7 +55,6 @@ private void InitializeComponent()
this.trayMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.restoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.exitToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
- this.btnUpdate = new System.Windows.Forms.Button();
this.helperMenu.SuspendLayout();
this.topPanel.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
@@ -73,7 +73,7 @@ private void InitializeComponent()
this.SumView.Location = new System.Drawing.Point(0, 0);
this.SumView.Margin = new System.Windows.Forms.Padding(2);
this.SumView.Name = "SumView";
- this.SumView.Size = new System.Drawing.Size(983, 551);
+ this.SumView.Size = new System.Drawing.Size(802, 518);
this.SumView.TabIndex = 0;
this.SumView.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.sumView_NodeMouseClick);
//
@@ -91,14 +91,14 @@ private void InitializeComponent()
this.helperMenu.Name = "helperMenu";
this.helperMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
this.helperMenu.ShowImageMargin = false;
- this.helperMenu.Size = new System.Drawing.Size(145, 132);
+ this.helperMenu.Size = new System.Drawing.Size(124, 108);
//
// copyToolStripMenuItem
//
this.copyToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.copyToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.copyToolStripMenuItem.Name = "copyToolStripMenuItem";
- this.copyToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
+ this.copyToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
this.copyToolStripMenuItem.Text = "Copy";
this.copyToolStripMenuItem.Click += new System.EventHandler(this.copyToolStripMenuItem_Click);
//
@@ -107,7 +107,7 @@ private void InitializeComponent()
this.removeToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.removeToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.removeToolStripMenuItem.Name = "removeToolStripMenuItem";
- this.removeToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
+ this.removeToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
this.removeToolStripMenuItem.Text = "Remove";
this.removeToolStripMenuItem.Click += new System.EventHandler(this.removeToolStripMenuItem_Click);
//
@@ -116,7 +116,7 @@ private void InitializeComponent()
this.toolStripMenuItem1.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.toolStripMenuItem1.ForeColor = System.Drawing.Color.White;
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
- this.toolStripMenuItem1.Size = new System.Drawing.Size(144, 32);
+ this.toolStripMenuItem1.Size = new System.Drawing.Size(123, 26);
this.toolStripMenuItem1.Text = "VirusTotal";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
@@ -125,7 +125,7 @@ private void InitializeComponent()
this.clearToolStripMenuItem.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.clearToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.clearToolStripMenuItem.Name = "clearToolStripMenuItem";
- this.clearToolStripMenuItem.Size = new System.Drawing.Size(144, 32);
+ this.clearToolStripMenuItem.Size = new System.Drawing.Size(123, 26);
this.clearToolStripMenuItem.Text = "Clear";
this.clearToolStripMenuItem.Click += new System.EventHandler(this.clearToolStripMenuItem_Click);
//
@@ -148,9 +148,29 @@ private void InitializeComponent()
this.topPanel.Location = new System.Drawing.Point(0, 0);
this.topPanel.Margin = new System.Windows.Forms.Padding(2);
this.topPanel.Name = "topPanel";
- this.topPanel.Size = new System.Drawing.Size(985, 89);
+ this.topPanel.Size = new System.Drawing.Size(804, 72);
this.topPanel.TabIndex = 7;
//
+ // btnUpdate
+ //
+ this.btnUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnUpdate.BackColor = System.Drawing.Color.DodgerBlue;
+ this.btnUpdate.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ this.btnUpdate.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
+ this.btnUpdate.FlatAppearance.MouseDownBackColor = System.Drawing.Color.RoyalBlue;
+ this.btnUpdate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
+ this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnUpdate.ForeColor = System.Drawing.Color.White;
+ this.btnUpdate.Location = new System.Drawing.Point(698, 6);
+ this.btnUpdate.Margin = new System.Windows.Forms.Padding(2);
+ this.btnUpdate.Name = "btnUpdate";
+ this.btnUpdate.Size = new System.Drawing.Size(97, 27);
+ this.btnUpdate.TabIndex = 81;
+ this.btnUpdate.Tag = "themeable";
+ this.btnUpdate.Text = "Update";
+ this.btnUpdate.UseVisualStyleBackColor = false;
+ this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
+ //
// btnCalculate
//
this.btnCalculate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -161,10 +181,10 @@ private void InitializeComponent()
this.btnCalculate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnCalculate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCalculate.ForeColor = System.Drawing.Color.White;
- this.btnCalculate.Location = new System.Drawing.Point(852, 46);
+ this.btnCalculate.Location = new System.Drawing.Point(698, 38);
this.btnCalculate.Margin = new System.Windows.Forms.Padding(2);
this.btnCalculate.Name = "btnCalculate";
- this.btnCalculate.Size = new System.Drawing.Size(121, 34);
+ this.btnCalculate.Size = new System.Drawing.Size(97, 25);
this.btnCalculate.TabIndex = 80;
this.btnCalculate.Tag = "themeable";
this.btnCalculate.Text = "Calculate";
@@ -181,10 +201,10 @@ private void InitializeComponent()
this.btnBrowse.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnBrowse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBrowse.ForeColor = System.Drawing.Color.White;
- this.btnBrowse.Location = new System.Drawing.Point(801, 46);
+ this.btnBrowse.Location = new System.Drawing.Point(657, 38);
this.btnBrowse.Margin = new System.Windows.Forms.Padding(2);
this.btnBrowse.Name = "btnBrowse";
- this.btnBrowse.Size = new System.Drawing.Size(47, 34);
+ this.btnBrowse.Size = new System.Drawing.Size(38, 25);
this.btnBrowse.TabIndex = 79;
this.btnBrowse.Tag = "themeable";
this.btnBrowse.Text = "...";
@@ -196,11 +216,12 @@ private void InitializeComponent()
this.txtPath.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.txtPath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
this.txtPath.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.txtPath.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.txtPath.Font = new System.Drawing.Font("Segoe UI Semibold", 10F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.txtPath.ForeColor = System.Drawing.Color.Silver;
- this.txtPath.Location = new System.Drawing.Point(227, 46);
+ this.txtPath.Location = new System.Drawing.Point(198, 38);
+ this.txtPath.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.txtPath.Name = "txtPath";
- this.txtPath.Size = new System.Drawing.Size(569, 34);
+ this.txtPath.Size = new System.Drawing.Size(456, 25);
this.txtPath.TabIndex = 78;
//
// btnCompare
@@ -213,10 +234,10 @@ private void InitializeComponent()
this.btnCompare.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnCompare.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCompare.ForeColor = System.Drawing.Color.White;
- this.btnCompare.Location = new System.Drawing.Point(352, 7);
+ this.btnCompare.Location = new System.Drawing.Point(298, 6);
this.btnCompare.Margin = new System.Windows.Forms.Padding(2);
this.btnCompare.Name = "btnCompare";
- this.btnCompare.Size = new System.Drawing.Size(121, 34);
+ this.btnCompare.Size = new System.Drawing.Size(97, 27);
this.btnCompare.TabIndex = 77;
this.btnCompare.Tag = "themeable";
this.btnCompare.Text = "Compare";
@@ -233,10 +254,10 @@ private void InitializeComponent()
this.btnOptions.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnOptions.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOptions.ForeColor = System.Drawing.Color.White;
- this.btnOptions.Location = new System.Drawing.Point(727, 7);
+ this.btnOptions.Location = new System.Drawing.Point(598, 6);
this.btnOptions.Margin = new System.Windows.Forms.Padding(2);
this.btnOptions.Name = "btnOptions";
- this.btnOptions.Size = new System.Drawing.Size(121, 34);
+ this.btnOptions.Size = new System.Drawing.Size(97, 27);
this.btnOptions.TabIndex = 76;
this.btnOptions.Tag = "themeable";
this.btnOptions.Text = "Options";
@@ -253,10 +274,10 @@ private void InitializeComponent()
this.btnFindIdenticals.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnFindIdenticals.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFindIdenticals.ForeColor = System.Drawing.Color.White;
- this.btnFindIdenticals.Location = new System.Drawing.Point(227, 7);
+ this.btnFindIdenticals.Location = new System.Drawing.Point(198, 6);
this.btnFindIdenticals.Margin = new System.Windows.Forms.Padding(2);
this.btnFindIdenticals.Name = "btnFindIdenticals";
- this.btnFindIdenticals.Size = new System.Drawing.Size(121, 34);
+ this.btnFindIdenticals.Size = new System.Drawing.Size(97, 27);
this.btnFindIdenticals.TabIndex = 74;
this.btnFindIdenticals.Tag = "themeable";
this.btnFindIdenticals.Text = "Find Identicals";
@@ -273,10 +294,10 @@ private void InitializeComponent()
this.btnClear.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClear.ForeColor = System.Drawing.Color.White;
- this.btnClear.Location = new System.Drawing.Point(602, 7);
+ this.btnClear.Location = new System.Drawing.Point(498, 6);
this.btnClear.Margin = new System.Windows.Forms.Padding(2);
this.btnClear.Name = "btnClear";
- this.btnClear.Size = new System.Drawing.Size(121, 34);
+ this.btnClear.Size = new System.Drawing.Size(97, 27);
this.btnClear.TabIndex = 73;
this.btnClear.Tag = "themeable";
this.btnClear.Text = "Clear";
@@ -293,10 +314,10 @@ private void InitializeComponent()
this.btnSaveJson.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
this.btnSaveJson.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveJson.ForeColor = System.Drawing.Color.White;
- this.btnSaveJson.Location = new System.Drawing.Point(477, 7);
+ this.btnSaveJson.Location = new System.Drawing.Point(398, 6);
this.btnSaveJson.Margin = new System.Windows.Forms.Padding(2);
this.btnSaveJson.Name = "btnSaveJson";
- this.btnSaveJson.Size = new System.Drawing.Size(121, 34);
+ this.btnSaveJson.Size = new System.Drawing.Size(97, 27);
this.btnSaveJson.TabIndex = 71;
this.btnSaveJson.Tag = "themeable";
this.btnSaveJson.Text = "Save as JSON";
@@ -307,10 +328,10 @@ private void InitializeComponent()
//
this.pictureBox1.Cursor = System.Windows.Forms.Cursors.Hand;
this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image")));
- this.pictureBox1.Location = new System.Drawing.Point(10, 10);
+ this.pictureBox1.Location = new System.Drawing.Point(8, 8);
this.pictureBox1.Margin = new System.Windows.Forms.Padding(2);
this.pictureBox1.Name = "pictureBox1";
- this.pictureBox1.Size = new System.Drawing.Size(55, 54);
+ this.pictureBox1.Size = new System.Drawing.Size(44, 43);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pictureBox1.TabIndex = 2;
this.pictureBox1.TabStop = false;
@@ -320,10 +341,10 @@ private void InitializeComponent()
//
this.lblversion.AutoSize = true;
this.lblversion.ForeColor = System.Drawing.Color.Silver;
- this.lblversion.Location = new System.Drawing.Point(90, 46);
+ this.lblversion.Location = new System.Drawing.Point(72, 37);
this.lblversion.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblversion.Name = "lblversion";
- this.lblversion.Size = new System.Drawing.Size(64, 20);
+ this.lblversion.Size = new System.Drawing.Size(49, 15);
this.lblversion.TabIndex = 4;
this.lblversion.Text = "Version:";
//
@@ -332,10 +353,10 @@ private void InitializeComponent()
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("Segoe UI Semibold", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.label2.ForeColor = System.Drawing.Color.White;
- this.label2.Location = new System.Drawing.Point(88, 9);
+ this.label2.Location = new System.Drawing.Point(70, 7);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(104, 32);
+ this.label2.Size = new System.Drawing.Size(82, 25);
this.label2.TabIndex = 3;
this.label2.Text = "Hashing";
//
@@ -345,10 +366,10 @@ private void InitializeComponent()
this.botPanel.Controls.Add(this.lblCalculating);
this.botPanel.Controls.Add(this.SumView);
this.botPanel.Dock = System.Windows.Forms.DockStyle.Fill;
- this.botPanel.Location = new System.Drawing.Point(0, 89);
+ this.botPanel.Location = new System.Drawing.Point(0, 72);
this.botPanel.Margin = new System.Windows.Forms.Padding(2);
this.botPanel.Name = "botPanel";
- this.botPanel.Size = new System.Drawing.Size(985, 553);
+ this.botPanel.Size = new System.Drawing.Size(804, 520);
this.botPanel.TabIndex = 8;
//
// lblCalculating
@@ -359,7 +380,7 @@ private void InitializeComponent()
this.lblCalculating.Location = new System.Drawing.Point(0, 0);
this.lblCalculating.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblCalculating.Name = "lblCalculating";
- this.lblCalculating.Size = new System.Drawing.Size(983, 551);
+ this.lblCalculating.Size = new System.Drawing.Size(802, 518);
this.lblCalculating.TabIndex = 1;
this.lblCalculating.Tag = "themeable";
this.lblCalculating.Text = "Drag and drop files here...";
@@ -383,13 +404,13 @@ private void InitializeComponent()
this.trayMenu.Name = "trayMenu";
this.trayMenu.RenderMode = System.Windows.Forms.ToolStripRenderMode.System;
this.trayMenu.ShowImageMargin = false;
- this.trayMenu.Size = new System.Drawing.Size(125, 68);
+ this.trayMenu.Size = new System.Drawing.Size(109, 56);
//
// restoreToolStripMenuItem
//
this.restoreToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem";
- this.restoreToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
+ this.restoreToolStripMenuItem.Size = new System.Drawing.Size(108, 26);
this.restoreToolStripMenuItem.Text = "Restore";
this.restoreToolStripMenuItem.Click += new System.EventHandler(this.restoreToolStripMenuItem_Click);
//
@@ -397,37 +418,17 @@ private void InitializeComponent()
//
this.exitToolStripMenuItem.ForeColor = System.Drawing.Color.White;
this.exitToolStripMenuItem.Name = "exitToolStripMenuItem";
- this.exitToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
+ this.exitToolStripMenuItem.Size = new System.Drawing.Size(108, 26);
this.exitToolStripMenuItem.Text = "Exit";
this.exitToolStripMenuItem.Click += new System.EventHandler(this.exitToolStripMenuItem_Click);
//
- // btnUpdate
- //
- this.btnUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnUpdate.BackColor = System.Drawing.Color.DodgerBlue;
- this.btnUpdate.DialogResult = System.Windows.Forms.DialogResult.Cancel;
- this.btnUpdate.FlatAppearance.BorderColor = System.Drawing.Color.DodgerBlue;
- this.btnUpdate.FlatAppearance.MouseDownBackColor = System.Drawing.Color.RoyalBlue;
- this.btnUpdate.FlatAppearance.MouseOverBackColor = System.Drawing.Color.RoyalBlue;
- this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnUpdate.ForeColor = System.Drawing.Color.White;
- this.btnUpdate.Location = new System.Drawing.Point(852, 7);
- this.btnUpdate.Margin = new System.Windows.Forms.Padding(2);
- this.btnUpdate.Name = "btnUpdate";
- this.btnUpdate.Size = new System.Drawing.Size(121, 34);
- this.btnUpdate.TabIndex = 81;
- this.btnUpdate.Tag = "themeable";
- this.btnUpdate.Text = "Update";
- this.btnUpdate.UseVisualStyleBackColor = false;
- this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
- //
// MainForm
//
this.AllowDrop = true;
- this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20)))));
- this.ClientSize = new System.Drawing.Size(985, 642);
+ this.ClientSize = new System.Drawing.Size(804, 592);
this.Controls.Add(this.botPanel);
this.Controls.Add(this.topPanel);
this.DoubleBuffered = true;
diff --git a/Hashing/MainForm.cs b/Hashing/MainForm.cs
index 6c4219b..b41e4bb 100644
--- a/Hashing/MainForm.cs
+++ b/Hashing/MainForm.cs
@@ -55,6 +55,7 @@ public MainForm(string[] files)
{
InitializeComponent();
+ ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
Options.ApplyTheme(this);
CheckForIllegalCrossThreadCalls = false;
diff --git a/Hashing/Options.cs b/Hashing/Options.cs
index ad1a7a0..004a1d8 100644
--- a/Hashing/Options.cs
+++ b/Hashing/Options.cs
@@ -112,6 +112,13 @@ private static void SetTheme(Form f, Color c1, Color c2)
tmp.ForeColor = c1;
}
}
+ foreach (RadioButton tmp in GetSelfAndChildrenRecursive(f).OfType().ToList())
+ {
+ if ((string)tmp.Tag == ThemeFlag)
+ {
+ tmp.ForeColor = c1;
+ }
+ }
}
internal static void SaveSettings()
diff --git a/Hashing/OptionsForm.Designer.cs b/Hashing/OptionsForm.Designer.cs
index 60f6b9c..721b13e 100644
--- a/Hashing/OptionsForm.Designer.cs
+++ b/Hashing/OptionsForm.Designer.cs
@@ -36,20 +36,20 @@ private void InitializeComponent()
this.oceantheme = new System.Windows.Forms.RadioButton();
this.zergtheme = new System.Windows.Forms.RadioButton();
this.label27 = new System.Windows.Forms.Label();
- this.chkRIPEMD160 = new System.Windows.Forms.CheckBox();
- this.chkSHA512 = new System.Windows.Forms.CheckBox();
- this.chkSHA256 = new System.Windows.Forms.CheckBox();
- this.chkSHA1 = new System.Windows.Forms.CheckBox();
- this.chkMD5 = new System.Windows.Forms.CheckBox();
+ this.chkRIPEMD160 = new ColoredCheckBox();
+ this.chkSHA512 = new ColoredCheckBox();
+ this.chkSHA256 = new ColoredCheckBox();
+ this.chkSHA1 = new ColoredCheckBox();
+ this.chkMD5 = new ColoredCheckBox();
this.lblCalculating = new System.Windows.Forms.Label();
- this.chkSHA384 = new System.Windows.Forms.CheckBox();
- this.chkTray = new System.Windows.Forms.CheckBox();
- this.chkHigh = new System.Windows.Forms.CheckBox();
- this.chkCRC32 = new System.Windows.Forms.CheckBox();
- this.chkLower = new System.Windows.Forms.CheckBox();
- this.chkCRCFormat = new System.Windows.Forms.CheckBox();
- this.chkSingleInstance = new System.Windows.Forms.CheckBox();
- this.chkStayOnTop = new System.Windows.Forms.CheckBox();
+ this.chkSHA384 = new ColoredCheckBox();
+ this.chkTray = new ColoredCheckBox();
+ this.chkHigh = new ColoredCheckBox();
+ this.chkCRC32 = new ColoredCheckBox();
+ this.chkLower = new ColoredCheckBox();
+ this.chkCRCFormat = new ColoredCheckBox();
+ this.chkSingleInstance = new ColoredCheckBox();
+ this.chkStayOnTop = new ColoredCheckBox();
this.SuspendLayout();
//
// okbtn
@@ -425,19 +425,19 @@ private void InitializeComponent()
private System.Windows.Forms.RadioButton oceantheme;
private System.Windows.Forms.RadioButton zergtheme;
private System.Windows.Forms.Label label27;
- private System.Windows.Forms.CheckBox chkRIPEMD160;
- private System.Windows.Forms.CheckBox chkSHA512;
- private System.Windows.Forms.CheckBox chkSHA256;
- private System.Windows.Forms.CheckBox chkSHA1;
- private System.Windows.Forms.CheckBox chkMD5;
+ private ColoredCheckBox chkRIPEMD160;
+ private ColoredCheckBox chkSHA512;
+ private ColoredCheckBox chkSHA256;
+ private ColoredCheckBox chkSHA1;
+ private ColoredCheckBox chkMD5;
private System.Windows.Forms.Label lblCalculating;
- private System.Windows.Forms.CheckBox chkSHA384;
- private System.Windows.Forms.CheckBox chkTray;
- private System.Windows.Forms.CheckBox chkHigh;
- private System.Windows.Forms.CheckBox chkCRC32;
- private System.Windows.Forms.CheckBox chkLower;
- private System.Windows.Forms.CheckBox chkCRCFormat;
- private System.Windows.Forms.CheckBox chkSingleInstance;
- private System.Windows.Forms.CheckBox chkStayOnTop;
+ private ColoredCheckBox chkSHA384;
+ private ColoredCheckBox chkTray;
+ private ColoredCheckBox chkHigh;
+ private ColoredCheckBox chkCRC32;
+ private ColoredCheckBox chkLower;
+ private ColoredCheckBox chkCRCFormat;
+ private ColoredCheckBox chkSingleInstance;
+ private ColoredCheckBox chkStayOnTop;
}
}
\ No newline at end of file
diff --git a/Hashing/Program.cs b/Hashing/Program.cs
index f5ef7d1..2de1f10 100644
--- a/Hashing/Program.cs
+++ b/Hashing/Program.cs
@@ -16,7 +16,7 @@ static class Program
// Enter current version here
internal readonly static float Major = 2;
- internal readonly static float Minor = 1;
+ internal readonly static float Minor = 2;
/* END OF VERSION PROPERTIES */
diff --git a/Hashing/Properties/AssemblyInfo.cs b/Hashing/Properties/AssemblyInfo.cs
index a5b2567..1e01ff6 100644
--- a/Hashing/Properties/AssemblyInfo.cs
+++ b/Hashing/Properties/AssemblyInfo.cs
@@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("Hashing")]
-[assembly: AssemblyCopyright("deadmoon © 2018")]
+[assembly: AssemblyCopyright("deadmoon © ∞")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]