From adcec32de4af2c9fa854d05ecd28054bcd6d46d5 Mon Sep 17 00:00:00 2001 From: deadmoon Date: Sat, 29 Jan 2022 09:34:51 +0200 Subject: [PATCH] Hotfixes (v2.8) --- CHANGELOG.md | 4 ++ Hashing/CompareForm.cs | 1 + Hashing/IdenticalsForm.cs | 4 ++ Hashing/OptionsForm.Designer.cs | 82 ++++++++++++++++++++++----------- Hashing/OptionsForm.cs | 1 + Hashing/Program.cs | 2 +- Hashing/Resources/CN.json | 8 ++-- README.md | 8 ++-- version.txt | 2 +- 9 files changed, 74 insertions(+), 38 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebd4c35..c0f50af 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## [2.8] - 2022-01-29 +- Hotfix: Can't change theme and language at the same time (#16) +- Hotfix: Updated translation for Chinese (#16) + ## [2.7] - 2022-01-28 - New: Multilingual support (starting with Hellenic and Chinese) diff --git a/Hashing/CompareForm.cs b/Hashing/CompareForm.cs index 1f9694a..b186a90 100644 --- a/Hashing/CompareForm.cs +++ b/Hashing/CompareForm.cs @@ -17,6 +17,7 @@ public CompareForm() chkRemove.Text = Options.TranslationList["chkRemove"].ToString(); label2.Text = Options.TranslationList["label2"].ToString(); lblNoMatch.Text = Options.TranslationList["lblNoMatch"].ToString(); + this.Text = Options.TranslationList["btnCompare"].ToString(); LoadActiveHash(); diff --git a/Hashing/IdenticalsForm.cs b/Hashing/IdenticalsForm.cs index 9282d4c..3d3ea65 100644 --- a/Hashing/IdenticalsForm.cs +++ b/Hashing/IdenticalsForm.cs @@ -19,6 +19,10 @@ public IdenticalsForm(List list) Options.ApplyTheme(this); helperMenu.Renderer = new ToolStripRendererMaterial(); + this.Text = Options.TranslationList["btnFindIdenticals"].ToString(); + copyToolStripMenuItem.Text = Options.TranslationList["copyToolStripMenuItem"].ToString(); + saveAsJSONToolStripMenuItem.Text = Options.TranslationList["btnSaveJson"].ToString(); + ConfigureGUI(); _identicals = list; GetActiveHash(); diff --git a/Hashing/OptionsForm.Designer.cs b/Hashing/OptionsForm.Designer.cs index c99bee4..a47a922 100644 --- a/Hashing/OptionsForm.Designer.cs +++ b/Hashing/OptionsForm.Designer.cs @@ -58,9 +58,13 @@ private void InitializeComponent() this.chkSHA256 = new Hashing.ColoredCheckBox(); this.chkSHA1 = new Hashing.ColoredCheckBox(); this.chkMD5 = new Hashing.ColoredCheckBox(); + this.panel1 = new System.Windows.Forms.Panel(); + this.panel2 = new System.Windows.Forms.Panel(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox88)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox86)).BeginInit(); + this.panel1.SuspendLayout(); + this.panel2.SuspendLayout(); this.SuspendLayout(); // // okbtn @@ -90,7 +94,7 @@ private void InitializeComponent() this.minimaltheme.AutoSize = true; this.minimaltheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.minimaltheme.ForeColor = System.Drawing.Color.Gray; - this.minimaltheme.Location = new System.Drawing.Point(122, 108); + this.minimaltheme.Location = new System.Drawing.Point(114, 110); this.minimaltheme.Margin = new System.Windows.Forms.Padding(2); this.minimaltheme.Name = "minimaltheme"; this.minimaltheme.Size = new System.Drawing.Size(86, 25); @@ -104,7 +108,7 @@ private void InitializeComponent() this.carameltheme.AutoSize = true; this.carameltheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.carameltheme.ForeColor = System.Drawing.Color.DarkOrange; - this.carameltheme.Location = new System.Drawing.Point(122, 47); + this.carameltheme.Location = new System.Drawing.Point(114, 49); this.carameltheme.Margin = new System.Windows.Forms.Padding(2); this.carameltheme.Name = "carameltheme"; this.carameltheme.Size = new System.Drawing.Size(87, 25); @@ -118,7 +122,7 @@ private void InitializeComponent() this.limetheme.AutoSize = true; this.limetheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.limetheme.ForeColor = System.Drawing.Color.LimeGreen; - this.limetheme.Location = new System.Drawing.Point(122, 78); + this.limetheme.Location = new System.Drawing.Point(114, 80); this.limetheme.Margin = new System.Windows.Forms.Padding(2); this.limetheme.Name = "limetheme"; this.limetheme.Size = new System.Drawing.Size(63, 25); @@ -132,7 +136,7 @@ private void InitializeComponent() this.magmatheme.AutoSize = true; this.magmatheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.magmatheme.ForeColor = System.Drawing.Color.Tomato; - this.magmatheme.Location = new System.Drawing.Point(30, 78); + this.magmatheme.Location = new System.Drawing.Point(22, 80); this.magmatheme.Margin = new System.Windows.Forms.Padding(2); this.magmatheme.Name = "magmatheme"; this.magmatheme.Size = new System.Drawing.Size(83, 25); @@ -147,7 +151,7 @@ private void InitializeComponent() this.oceantheme.Checked = true; this.oceantheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.oceantheme.ForeColor = System.Drawing.Color.DodgerBlue; - this.oceantheme.Location = new System.Drawing.Point(30, 47); + this.oceantheme.Location = new System.Drawing.Point(22, 49); this.oceantheme.Margin = new System.Windows.Forms.Padding(2); this.oceantheme.Name = "oceantheme"; this.oceantheme.Size = new System.Drawing.Size(74, 25); @@ -162,7 +166,7 @@ private void InitializeComponent() this.zergtheme.AutoSize = true; this.zergtheme.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.zergtheme.ForeColor = System.Drawing.Color.MediumOrchid; - this.zergtheme.Location = new System.Drawing.Point(30, 108); + this.zergtheme.Location = new System.Drawing.Point(22, 110); this.zergtheme.Margin = new System.Windows.Forms.Padding(2); this.zergtheme.Name = "zergtheme"; this.zergtheme.Size = new System.Drawing.Size(62, 25); @@ -176,7 +180,7 @@ private void InitializeComponent() this.label27.AutoSize = true; this.label27.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label27.ForeColor = System.Drawing.Color.DodgerBlue; - this.label27.Location = new System.Drawing.Point(10, 8); + this.label27.Location = new System.Drawing.Point(2, 10); this.label27.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(153, 21); @@ -203,7 +207,7 @@ private void InitializeComponent() this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.label3.ForeColor = System.Drawing.Color.DodgerBlue; - this.label3.Location = new System.Drawing.Point(279, 8); + this.label3.Location = new System.Drawing.Point(2, 10); this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(136, 21); @@ -214,7 +218,7 @@ private void InitializeComponent() // pictureBox7 // this.pictureBox7.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox7.Image"))); - this.pictureBox7.Location = new System.Drawing.Point(304, 111); + this.pictureBox7.Location = new System.Drawing.Point(27, 113); this.pictureBox7.Name = "pictureBox7"; this.pictureBox7.Size = new System.Drawing.Size(36, 22); this.pictureBox7.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -225,7 +229,7 @@ private void InitializeComponent() // pictureBox88 // this.pictureBox88.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox88.Image"))); - this.pictureBox88.Location = new System.Drawing.Point(304, 79); + this.pictureBox88.Location = new System.Drawing.Point(27, 81); this.pictureBox88.Name = "pictureBox88"; this.pictureBox88.Size = new System.Drawing.Size(36, 22); this.pictureBox88.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -236,7 +240,7 @@ private void InitializeComponent() // pictureBox86 // this.pictureBox86.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox86.Image"))); - this.pictureBox86.Location = new System.Drawing.Point(304, 48); + this.pictureBox86.Location = new System.Drawing.Point(27, 50); this.pictureBox86.Name = "pictureBox86"; this.pictureBox86.Size = new System.Drawing.Size(36, 22); this.pictureBox86.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -248,7 +252,7 @@ private void InitializeComponent() // this.radioChinese.AutoSize = true; this.radioChinese.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.radioChinese.Location = new System.Drawing.Point(345, 109); + this.radioChinese.Location = new System.Drawing.Point(68, 111); this.radioChinese.Name = "radioChinese"; this.radioChinese.Size = new System.Drawing.Size(96, 25); this.radioChinese.TabIndex = 107; @@ -261,7 +265,7 @@ private void InitializeComponent() // this.radioHellenic.AutoSize = true; this.radioHellenic.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.radioHellenic.Location = new System.Drawing.Point(345, 78); + this.radioHellenic.Location = new System.Drawing.Point(68, 80); this.radioHellenic.Name = "radioHellenic"; this.radioHellenic.Size = new System.Drawing.Size(94, 25); this.radioHellenic.TabIndex = 106; @@ -274,7 +278,7 @@ private void InitializeComponent() // this.radioEnglish.AutoSize = true; this.radioEnglish.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.radioEnglish.Location = new System.Drawing.Point(345, 47); + this.radioEnglish.Location = new System.Drawing.Point(68, 49); this.radioEnglish.Name = "radioEnglish"; this.radioEnglish.Size = new System.Drawing.Size(79, 25); this.radioEnglish.TabIndex = 105; @@ -465,6 +469,34 @@ private void InitializeComponent() this.chkMD5.UseVisualStyleBackColor = true; this.chkMD5.CheckedChanged += new System.EventHandler(this.chkMD5_CheckedChanged); // + // panel1 + // + this.panel1.Controls.Add(this.label27); + this.panel1.Controls.Add(this.zergtheme); + this.panel1.Controls.Add(this.oceantheme); + this.panel1.Controls.Add(this.magmatheme); + this.panel1.Controls.Add(this.limetheme); + this.panel1.Controls.Add(this.carameltheme); + this.panel1.Controls.Add(this.minimaltheme); + this.panel1.Location = new System.Drawing.Point(12, 8); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(245, 156); + this.panel1.TabIndex = 108; + // + // panel2 + // + this.panel2.Controls.Add(this.label3); + this.panel2.Controls.Add(this.pictureBox86); + this.panel2.Controls.Add(this.radioChinese); + this.panel2.Controls.Add(this.pictureBox88); + this.panel2.Controls.Add(this.radioHellenic); + this.panel2.Controls.Add(this.pictureBox7); + this.panel2.Controls.Add(this.radioEnglish); + this.panel2.Location = new System.Drawing.Point(271, 8); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(181, 150); + this.panel2.TabIndex = 109; + // // OptionsForm // this.AcceptButton = this.okbtn; @@ -473,13 +505,8 @@ private void InitializeComponent() this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(20)))), ((int)(((byte)(20)))), ((int)(((byte)(20))))); this.CancelButton = this.okbtn; this.ClientSize = new System.Drawing.Size(584, 411); - this.Controls.Add(this.radioChinese); - this.Controls.Add(this.radioHellenic); - this.Controls.Add(this.radioEnglish); - this.Controls.Add(this.pictureBox7); - this.Controls.Add(this.pictureBox88); - this.Controls.Add(this.pictureBox86); - this.Controls.Add(this.label3); + this.Controls.Add(this.panel2); + this.Controls.Add(this.panel1); this.Controls.Add(this.chkStayOnTop); this.Controls.Add(this.chkSingleInstance); this.Controls.Add(this.chkCRCFormat); @@ -495,13 +522,6 @@ private void InitializeComponent() this.Controls.Add(this.chkMD5); this.Controls.Add(this.lbl88); this.Controls.Add(this.okbtn); - this.Controls.Add(this.minimaltheme); - this.Controls.Add(this.carameltheme); - this.Controls.Add(this.limetheme); - this.Controls.Add(this.magmatheme); - this.Controls.Add(this.oceantheme); - this.Controls.Add(this.zergtheme); - this.Controls.Add(this.label27); this.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.ForeColor = System.Drawing.Color.White; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle; @@ -517,6 +537,10 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pictureBox7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox88)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pictureBox86)).EndInit(); + this.panel1.ResumeLayout(false); + this.panel1.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); this.ResumeLayout(false); this.PerformLayout(); @@ -553,5 +577,7 @@ private void InitializeComponent() private ColoredRadioButton radioEnglish; private ColoredRadioButton radioHellenic; private ColoredRadioButton radioChinese; + private System.Windows.Forms.Panel panel1; + private System.Windows.Forms.Panel panel2; } } \ No newline at end of file diff --git a/Hashing/OptionsForm.cs b/Hashing/OptionsForm.cs index f363ebb..26b7625 100644 --- a/Hashing/OptionsForm.cs +++ b/Hashing/OptionsForm.cs @@ -39,6 +39,7 @@ private void Translate() chkHigh.Text = Options.TranslationList["chkHigh"].ToString(); okbtn.Text = Options.TranslationList["button7"].ToString(); label3.Text = Options.TranslationList["label3"].ToString(); + this.Text = Options.TranslationList["btnOptions"].ToString(); } private void LoadSettings() diff --git a/Hashing/Program.cs b/Hashing/Program.cs index db86f9b..85af203 100644 --- a/Hashing/Program.cs +++ b/Hashing/Program.cs @@ -12,7 +12,7 @@ static class Program // Enter current version here internal readonly static float Major = 2; - internal readonly static float Minor = 7; + internal readonly static float Minor = 8; /* END OF VERSION PROPERTIES */ diff --git a/Hashing/Resources/CN.json b/Hashing/Resources/CN.json index 29867c4..fb307e6 100644 --- a/Hashing/Resources/CN.json +++ b/Hashing/Resources/CN.json @@ -11,7 +11,7 @@ "btnCancelHashing": "取消", "btnCancelHashingPressed": "取消中...", "button7": "同意", - "label3": "期望的哈希:", + "label3": "选择语言", "btnPaste": "粘贴", "chkRemove": "移除短横线", "label2": "结果", @@ -21,7 +21,7 @@ "btnAnalyze": "分析JSON文件", "btnList": "列出JSON文件", "label27": "选择主题", - "label1": "选择语言", + "label1": "期望的哈希:", "lbl88": "选择哈希类别", "chkLower": "小写显示", "chkCRCFormat": "十进制显示CRC32", @@ -40,11 +40,11 @@ "clearToolStripMenuItem": "全部清除", "newVersion": "有一个新的版本可用!\n\n最新版本: {LATEST}\n当前版本: {CURRENT}\n\n你想现在下载吗?\n\n应用程序将在几秒钟内重新启动.", "noNewVersion": "您已经是最新的版本!", - "betaVersion": "你使用的是实验版本!", + "betaVersion": "你使用的是测试版本!", "filesWord": "文件", "enableSHA256Message": "VirusTotal仅通过其SHA256哈希值识别文件!\n\n你是否希望为此操作开启SHA256?", "noIdenticalsMessage": "没有找到相同的文件!", - "unsupportedJSON1": "检测到不支持的JSON文件:", + "unsupportedJSON1": "检测到不支持的JSON文件:\n\n", "unsupportedJSON2": "\n这些文件不会被分析!", "invalidPath": "无法执行JSON分析. 所有文件路径都无效.", "corruptedJSON": "由JSON分析的所有文件都已损坏!", diff --git a/README.md b/README.md index c74282f..1092a1a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ Simple utility to calculate and compare hashes of multiple files

- +

@@ -44,6 +44,6 @@ https://github.com/hellzerg/hashing/blob/master/IMAGES.md ## Details: ## -* Latest version: 2.7 -* Released: January 28, 2022 -* SHA256: B3A6EBEADBB3992ABE452B585C8BA3EE4B14D8A16123A8AACDE414501317D39A \ No newline at end of file +* Latest version: 2.8 +* Released: January 29, 2022 +* SHA256: A0C44D81E6C6AB7ED1BC81D05E6448C0C31BFD9BC212F2541A51A121359FF279 \ No newline at end of file diff --git a/version.txt b/version.txt index e6b7b62..af65e02 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.7 \ No newline at end of file +2.8 \ No newline at end of file