Skip to content

Commit 45e99f4

Browse files
cjhdevactcjhdevact
committed
修复安装程序 统一中文名称 - 20241018
1 parent 5f271ec commit 45e99f4

File tree

14 files changed

+96
-75
lines changed

14 files changed

+96
-75
lines changed

‎Assets/SettingUI.png‎

-264 Bytes
Loading

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TimeControl - 时钟小工具
1+
# TimeControl - 时间小工具
22

33
## 关于本项目
44

@@ -42,7 +42,7 @@
4242

4343
## 相关项目
4444

45-
[TimeControlAero](https://github.com/cjhdevact/TimeControlAero) - 时钟小工具Aero版（开发中）
45+
[TimeControlAero](https://github.com/cjhdevact/TimeControlAero) - 时间小工具Aero版（开发中）
4646

4747
## 你知道吗？
4848

‎Src/PackOut.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
@echo off
2-
echo 任意键打包 时钟小工具（TimeControl）...
2+
echo 任意键打包 时间小工具（TimeControl）...
33
pause > nul
44
if exist "%~dp0TimeControl-Bin" rd /s /q "%~dp0TimeControl-Bin"
55
md "%~dp0TimeControl-Bin"
66
copy "%~dp0TimeControl\files\1-安装.bat" "%~dp0TimeControl-Bin\1-安装.bat"
77
copy "%~dp0TimeControl\files\2-卸载.bat" "%~dp0TimeControl-Bin\2-卸载.bat"
88
copy "%~dp0TimeControl\files\TimeControlAdmxs.exe" "%~dp0TimeControl-Bin\TimeControlAdmxs.exe"
99
copy "%~dp0TimeControl\files\TimeControl.adm" "%~dp0TimeControl-Bin\TimeControl.adm"
10+
copy "%~dp0TimeControl\files\TimeControl.xml" "%~dp0TimeControl-Bin\TimeControl.xml"
1011
copy "%~dp0TimeControl\files\UserinitBootInstall.bat" "%~dp0TimeControl-Bin\UserinitBootInstall.bat"
1112
copy "%~dp0TimeControl\files\UserinitBootUnInstall.bat" "%~dp0TimeControl-Bin\UserinitBootUnInstall.bat"
1213
copy "%~dp0TimeControl\bin\Release\TimeControl.exe" "%~dp0TimeControl-Bin\TimeControl.exe"

‎Src/TimeControl.suo‎

0 Bytes
Binary file not shown.

‎Src/TimeControl/Form1.Designer.vb‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Src/TimeControl/Form1.vb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1370,31 +1370,31 @@ Public Class Form1
13701370
Private Sub h30s_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles h30s.Click
13711371
Timer2.Interval = 30000
13721372
NotifyIcon1.Visible = True
1373-
NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（30秒）之后重新显示。", ToolTipIcon.Info)
1373+
NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（30秒）之后重新显示。", ToolTipIcon.Info)
13741374
Me.Hide()
13751375
Timer2.Enabled = True
13761376
End Sub
13771377

13781378
Private Sub h1m_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles h1m.Click
13791379
Timer2.Interval = 60000
13801380
NotifyIcon1.Visible = True
1381-
NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（1分钟）之后重新显示。", ToolTipIcon.Info)
1381+
NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（1分钟）之后重新显示。", ToolTipIcon.Info)
13821382
Me.Hide()
13831383
Timer2.Enabled = True
13841384
End Sub
13851385

13861386
Private Sub h5m_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles h5m.Click
13871387
Timer2.Interval = 300000
13881388
NotifyIcon1.Visible = True
1389-
NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（5分钟）之后重新显示。", ToolTipIcon.Info)
1389+
NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（5分钟）之后重新显示。", ToolTipIcon.Info)
13901390
Me.Hide()
13911391
Timer2.Enabled = True
13921392
End Sub
13931393

13941394
Private Sub h10m_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles h10m.Click
13951395
Timer2.Interval = 600000
13961396
NotifyIcon1.Visible = True
1397-
NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（10分钟）之后重新显示。", ToolTipIcon.Info)
1397+
NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（10分钟）之后重新显示。", ToolTipIcon.Info)
13981398
Me.Hide()
13991399
Timer2.Enabled = True
14001400
End Sub

‎Src/TimeControl/Form2.Designer.vb‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Src/TimeControl/Form2.vb‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,21 @@ Public Class Form2
8484
Form1.Timer2.Interval = TextBox1.Text * 1000
8585
Form1.Timer2.Enabled = True
8686
Form1.NotifyIcon1.Visible = True
87-
Form1.NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "秒）之后重新显示。", ToolTipIcon.Info)
87+
Form1.NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "秒）之后重新显示。", ToolTipIcon.Info)
8888
Form1.Hide()
8989
Me.Close()
9090
ElseIf ComboBox1.SelectedIndex = 1 Then '分
9191
Form1.Timer2.Interval = TextBox1.Text * 1000 * 60
9292
Form1.Timer2.Enabled = True
9393
Form1.NotifyIcon1.Visible = True
94-
Form1.NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "分钟）之后重新显示。", ToolTipIcon.Info)
94+
Form1.NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "分钟）之后重新显示。", ToolTipIcon.Info)
9595
Form1.Hide()
9696
Me.Close()
9797
ElseIf ComboBox1.SelectedIndex = 2 Then '时
9898
Form1.Timer2.Interval = TextBox1.Text * 1000 * 60 * 60
9999
Form1.Timer2.Enabled = True
100100
Form1.NotifyIcon1.Visible = True
101-
Form1.NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "小时）之后重新显示。", ToolTipIcon.Info)
101+
Form1.NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "小时）之后重新显示。", ToolTipIcon.Info)
102102
Form1.Hide()
103103
Me.Close()
104104
End If
@@ -208,7 +208,7 @@ errcode:
208208
ComboBox4.SelectedText = "自定义背景"
209209
End If
210210

211-
Label1.Text = "时钟小工具 版本：" & My.Application.Info.Version.ToString & vbCrLf & "版权所有 © 2022-2024 CJH。"
211+
Label1.Text = "时间小工具 版本：" & My.Application.Info.Version.ToString & vbCrLf & "版权所有 © 2022-2024 CJH。"
212212
Call formatcolorcurset()
213213
End Sub
214214
Private Sub TextBox1_KeyPress(ByVal sender As Object, ByVal e As System.Windows.Forms.KeyPressEventArgs) Handles TextBox1.KeyPress
@@ -448,7 +448,7 @@ errcode:
448448
End Sub
449449

450450
Private Sub Button3_Click(sender As System.Object, e As System.EventArgs) Handles Button3.Click
451-
If (MessageBox.Show("确定退出时钟小工具吗？", "时钟小工具", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = DialogResult.Yes) Then
451+
If (MessageBox.Show("确定退出时间小工具吗？", "时间小工具", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = DialogResult.Yes) Then
452452
End
453453
End If
454454
End Sub
@@ -1162,7 +1162,7 @@ errcode:
11621162

11631163
Private Sub Button6_Click(sender As System.Object, e As System.EventArgs) Handles Button6.Click
11641164
Form1.NotifyIcon1.Visible = True
1165-
Form1.NotifyIcon1.ShowBalloonTip(7000, "时钟小工具", "时钟小工具当前已隐藏到系统托盘，双击托盘图标重新显示。", ToolTipIcon.Info)
1165+
Form1.NotifyIcon1.ShowBalloonTip(7000, "时间小工具", "时间小工具当前已隐藏到系统托盘，双击托盘图标重新显示。", ToolTipIcon.Info)
11661166
Form1.Hide()
11671167
Me.Close()
11681168
End Sub
@@ -1645,7 +1645,7 @@ errcode:
16451645
End Sub
16461646

16471647
Private Sub LinkLabel3_LinkClicked(sender As System.Object, e As System.Windows.Forms.LinkLabelLinkClickedEventArgs) Handles LinkLabel3.LinkClicked
1648-
If MessageBox.Show(" " & vbCrLf & "确定要删除自定义配置并退出程序吗？" & vbCrLf & "执行该操作会删除本机时钟小工具的自定义设置并退出，相当于清除在本机的设置，此操作无法撤销。" & vbCrLf & vbCrLf & "你确定要继续吗？" & vbCrLf & " ", "警告 - 删除自定义配置并退出", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) = Windows.Forms.DialogResult.Yes Then
1648+
If MessageBox.Show(" " & vbCrLf & "确定要删除自定义配置并退出程序吗？" & vbCrLf & "执行该操作会删除本机时间小工具的自定义设置并退出，相当于清除在本机的设置，此操作无法撤销。" & vbCrLf & vbCrLf & "你确定要继续吗？" & vbCrLf & " ", "警告 - 删除自定义配置并退出", MessageBoxButtons.YesNo, MessageBoxIcon.Exclamation) = Windows.Forms.DialogResult.Yes Then
16491649
If Form1.UnSaveData = 0 Then
16501650
RegKeyModule.DelKey("Software\CJH\TimeControl", True, "HKCU")
16511651
End If
@@ -1662,7 +1662,7 @@ errcode:
16621662
End Sub
16631663

16641664
Private Sub Button12_Click(sender As System.Object, e As System.EventArgs) Handles Button12.Click
1665-
If (MessageBox.Show("确定重启时钟小工具吗？", "时钟小工具", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = DialogResult.Yes) Then
1665+
If (MessageBox.Show("确定重启时间小工具吗？", "时间小工具", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) = DialogResult.Yes) Then
16661666
System.Diagnostics.Process.Start(Application.ExecutablePath)
16671667
End
16681668
End If

‎Src/TimeControl/My Project/AssemblyInfo.vb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ Imports System.Runtime.InteropServices
88

99
' 查看程序集特性的值
1010

11-
<Assembly: AssemblyTitle("时钟小工具")>
12-
<Assembly: AssemblyDescription("时钟小工具")>
11+
<Assembly: AssemblyTitle("时间小工具")>
12+
<Assembly: AssemblyDescription("时间小工具")>
1313
<Assembly: AssemblyCompany("CJH")>
14-
<Assembly: AssemblyProduct("时钟小工具")>
14+
<Assembly: AssemblyProduct("时间小工具")>
1515
<Assembly: AssemblyCopyright("Copyright © 2022-2024 CJH. All Rights Reserved.")>
1616
<Assembly: AssemblyTrademark("")>
1717

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' 方法是按如下所示使用“*”:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("1.1.18.24101")>
35-
<Assembly: AssemblyFileVersion("1.1.18.24101")>
34+
<Assembly: AssemblyVersion("1.1.19.24102")>
35+
<Assembly: AssemblyFileVersion("1.1.19.24102")>

0 commit comments

Comments
 (0)