Skip to content

Commit

Permalink
Chinese hotfix
Browse files Browse the repository at this point in the history
  • Loading branch information
hellzerg committed Jan 29, 2022
1 parent adcec32 commit 65919f4
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 21 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

All notable changes to this project will be documented in this file.

## [2.9] - 2022-01-29
- Hotfix: Updated translation for Chinese (#17)

## [2.8] - 2022-01-29
- Hotfix: Can't change theme and language at the same time (#16)
- Hotfix: Updated translation for Chinese (#16)
Expand Down
32 changes: 18 additions & 14 deletions Hashing/MainForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ public MainForm(string[] files)
CultureInfo.DefaultThreadCurrentCulture = new CultureInfo("en-US");
CultureInfo.DefaultThreadCurrentUICulture = new CultureInfo("en-US");

this.DoubleBuffered = true;

ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12;
Options.ApplyTheme(this);
CheckForIllegalCrossThreadCalls = false;
Expand Down Expand Up @@ -105,6 +107,21 @@ public MainForm(string[] files)
{
DetectFiles(files);
}

RestoreWindowState();

if (Options.CurrentOptions.StayOnTop)
{
// SetWindowPos(this.Handle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS);
this.TopMost = true;
}
else
{
this.TopMost = false;
}

lblversion.Text = Options.TranslationList["lblversion"].ToString().Replace("{VN}", Program.GetCurrentVersionToString());
trayIcon.Visible = false;
}

internal void Translate(bool skipFull = false)
Expand Down Expand Up @@ -980,20 +997,7 @@ private void SaveWindowState()

private void MainForm_Load(object sender, EventArgs e)
{
RestoreWindowState();

if (Options.CurrentOptions.StayOnTop)
{
// SetWindowPos(this.Handle, HWND_TOPMOST, 0, 0, 0, 0, TOPMOST_FLAGS);
this.TopMost = true;
}
else
{
this.TopMost = false;
}

lblversion.Text = "Version: " + Program.GetCurrentVersionToString();
trayIcon.Visible = false;

}

private void MainForm_DragEnter(object sender, DragEventArgs e)
Expand Down
2 changes: 1 addition & 1 deletion Hashing/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static class Program

// Enter current version here
internal readonly static float Major = 2;
internal readonly static float Minor = 8;
internal readonly static float Minor = 9;

/* END OF VERSION PROPERTIES */

Expand Down
4 changes: 2 additions & 2 deletions Hashing/Resources/CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"lblCalculatingNow": "计算中...",
"btnCancelHashing": "取消",
"btnCancelHashingPressed": "取消中...",
"button7": "同意",
"button7": "确定",
"label3": "选择语言",
"btnPaste": "粘贴",
"chkRemove": "移除短横线",
Expand All @@ -25,7 +25,7 @@
"lbl88": "选择哈希类别",
"chkLower": "小写显示",
"chkCRCFormat": "十进制显示CRC32",
"chkSingleInstance": "只允许运行一个程序",
"chkSingleInstance": "只能运行一个本程序",
"chkStayOnTop": "始终保持置顶",
"chkTray": "关闭到托盘图标",
"chkHigh": "设置高优先级",
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

Simple utility to calculate and compare hashes of multiple files
<p align="center">
<a href="https://github.com/hellzerg/hashing/releases/download/2.8/Hashing-2.8.exe" target="_blank">
<a href="https://github.com/hellzerg/hashing/releases/download/2.9/Hashing-2.9.exe" target="_blank">
<img src="download-button.png">
</a>
</p>
Expand Down Expand Up @@ -44,6 +44,6 @@ https://github.com/hellzerg/hashing/blob/master/IMAGES.md

## Details: ##

* Latest version: 2.8
* Latest version: 2.9
* Released: January 29, 2022
* SHA256: A0C44D81E6C6AB7ED1BC81D05E6448C0C31BFD9BC212F2541A51A121359FF279
* SHA256: 2FE5BD8BF285F3B34A23DC199440C7D16444559DD2A24B1E91A8705CB0E1BB0A
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.8
2.9

0 comments on commit 65919f4

Please sign in to comment.