Skip to content

Commit 30126c4

Browse files
cjhdevactcjhdevact
committed
更新组件、修改策略、修复Bugs - 20241003
1 parent ada654b commit 30126c4

33 files changed

+3671
-572
lines changed

‎Src/UsefulControl.suo‎

6.5 KB
Binary file not shown.

‎Src/UsefulControl/BootForm.vb‎

Lines changed: 303 additions & 274 deletions
Large diffs are not rendered by default.

‎Src/UsefulControl/FakeShutdownForm.Designer.vb‎

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

‎Src/UsefulControl/FakeShutdownForm.resx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -600,7 +600,7 @@
600600
<value>17, 17</value>
601601
</metadata>
602602
<metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
603-
<value>85</value>
603+
<value>26</value>
604604
</metadata>
605605
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
606606
<value>

‎Src/UsefulControl/FakeShutdownForm.vb‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Public Class FakeShutdownForm
5757
SendMessageW(Me.Handle, &H319, Me.Handle, New IntPtr(down))
5858
Next
5959
Me.TableLayoutPanel1.BackgroundImage = Nothing
60+
6061
End Sub
6162
Private Sub TableLayoutPanel1_MouseDoubleClick(sender As System.Object, e As System.EventArgs) Handles TableLayoutPanel1.MouseDoubleClick
6263
If a = 5 Then

‎Src/UsefulControl/Form1.vb‎

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -661,11 +661,11 @@ Public Class Form1
661661
End Sub
662662

663663
Private Sub Button3_Click(sender As System.Object, e As System.EventArgs) Handles Button3.Click
664-
Form2.Show()
664+
Form2.ShowDialog()
665665
End Sub
666666

667667
Private Sub Button4_Click(sender As System.Object, e As System.EventArgs) Handles Button4.Click
668-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
668+
If BootForm.ToolMode = 1 Then
669669
Me.Close()
670670
BootForm.WindowState = FormWindowState.Normal
671671
BootForm.Show()
@@ -744,7 +744,7 @@ Public Class Form1
744744
FakeShutdownForm.Timer1.Enabled = True
745745
FakeShutdownForm.FakeMode = 0
746746
FakeShutdownForm.ShowDialog()
747-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
747+
If BootForm.ToolMode = 1 Then
748748
Me.Close()
749749
BootForm.WindowState = FormWindowState.Normal
750750
BootForm.Show()
@@ -796,29 +796,35 @@ Public Class Form1
796796
'Button1.Enabled = True
797797
'MessageBox.Show("正在关闭课件，在按钮""正在关闭""文字变化之前，请不要再点击关闭按钮，以免重复关闭。", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information)
798798
Try
799-
For Each TargetNamea As String In DocTargetNames
800-
Shell("taskkill.exe /im " & TargetNamea & ".exe", AppWinStyle.Hide)
801-
Shell("taskkill.exe /im " & TargetNamea & "*", AppWinStyle.Hide)
802-
Shell("taskkill.exe /f /im " & TargetNamea & ".exe", AppWinStyle.Hide)
803-
Shell("taskkill.exe /f /im " & TargetNamea & "*", AppWinStyle.Hide, True)
804-
Next
805-
806-
For Each TargetName As String In DocTargetNames
807-
'Dim TargetName As String = "fmp" '存储进程名为文本型，注：进程名不加扩展名
808-
Dim TargetKill() As Process = Process.GetProcessesByName(TargetName) '从进程名获取进程
809-
Dim TargetPath As String '存储进程路径为文本型
810-
If TargetKill.Length > 1 Then '判断进程名的数量，如果同名进程数量在2个以上，用For循环关闭进程。
811-
For i = 0 To TargetKill.Length - 1
812-
TargetPath = TargetKill(i).MainModule.FileName
813-
TargetKill(i).Kill()
814-
Next
815-
'ElseIf TargetKill.Length = 0 Then '判断进程名的数量，没有发现进程直接弹窗。不需要的，可直接删掉该If子句
816-
' Exit Sub
817-
ElseIf TargetKill.Length = 1 Then '判断进程名的数量，如果只有一个，就不用For循环
818-
TargetKill(0).Kill()
799+
'For Each TargetNamea As String In DocTargetNames
800+
' Shell("taskkill.exe /im " & TargetNamea & ".exe", AppWinStyle.Hide)
801+
' Shell("taskkill.exe /im " & TargetNamea & "*", AppWinStyle.Hide)
802+
' Shell("taskkill.exe /f /im " & TargetNamea & ".exe", AppWinStyle.Hide)
803+
' Shell("taskkill.exe /f /im " & TargetNamea & "*", AppWinStyle.Hide, True)
804+
'Next
805+
For i = 0 To DocTargetNames.Length - 1
806+
If i / 2 - Int(i / 2) = 0 Then
807+
Shell("taskkill.exe /f /im " & DocTargetNames(i) & "*", AppWinStyle.Hide, True)
808+
Else
809+
Shell("taskkill.exe /f /im " & DocTargetNames(i) & "*", AppWinStyle.Hide)
819810
End If
820-
'Me.Dispose(1) '关闭自身进程
821811
Next
812+
'For Each TargetName As String In DocTargetNames
813+
' 'Dim TargetName As String = "fmp" '存储进程名为文本型，注：进程名不加扩展名
814+
' Dim TargetKill() As Process = Process.GetProcessesByName(TargetName) '从进程名获取进程
815+
' Dim TargetPath As String '存储进程路径为文本型
816+
' If TargetKill.Length > 1 Then '判断进程名的数量，如果同名进程数量在2个以上，用For循环关闭进程。
817+
' For i = 0 To TargetKill.Length - 1
818+
' TargetPath = TargetKill(i).MainModule.FileName
819+
' TargetKill(i).Kill()
820+
' Next
821+
' 'ElseIf TargetKill.Length = 0 Then '判断进程名的数量，没有发现进程直接弹窗。不需要的，可直接删掉该If子句
822+
' ' Exit Sub
823+
' ElseIf TargetKill.Length = 1 Then '判断进程名的数量，如果只有一个，就不用For循环
824+
' TargetKill(0).Kill()
825+
' End If
826+
' 'Me.Dispose(1) '关闭自身进程
827+
'Next
822828
Catch ex As Exception
823829
End Try
824830
Me.Invoke(New MyBut(AddressOf SetButText), "一键关闭课件")
@@ -836,7 +842,7 @@ Public Class Form1
836842
Private Sub Button15_Click(sender As System.Object, e As System.EventArgs) Handles Button15.Click
837843
Me.Hide()
838844
LockTimeForm.ShowDialog()
839-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
845+
If BootForm.ToolMode = 1 Then
840846
Me.Close()
841847
BootForm.WindowState = FormWindowState.Normal
842848
BootForm.Show()
@@ -848,7 +854,7 @@ Public Class Form1
848854
Private Sub Button16_Click(sender As System.Object, e As System.EventArgs) Handles Button16.Click
849855
Me.Hide()
850856
LockTime2Form.ShowDialog()
851-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
857+
If BootForm.ToolMode = 1 Then
852858
Me.Close()
853859
BootForm.WindowState = FormWindowState.Normal
854860
BootForm.Show()
@@ -860,7 +866,7 @@ Public Class Form1
860866
Private Sub Button17_Click(sender As System.Object, e As System.EventArgs) Handles Button17.Click
861867
Me.Hide()
862868
PBoardForm.ShowDialog()
863-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
869+
If BootForm.ToolMode = 1 Then
864870
Me.Close()
865871
BootForm.WindowState = FormWindowState.Normal
866872
BootForm.Show()
@@ -872,7 +878,7 @@ Public Class Form1
872878
Private Sub Button18_Click(sender As System.Object, e As System.EventArgs) Handles Button18.Click
873879
Me.Hide()
874880
PBoard2Form.ShowDialog()
875-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
881+
If BootForm.ToolMode = 1 Then
876882
Me.Close()
877883
BootForm.WindowState = FormWindowState.Normal
878884
BootForm.Show()
@@ -883,8 +889,13 @@ Public Class Form1
883889

884890
Private Sub Button19_Click(sender As System.Object, e As System.EventArgs) Handles Button19.Click
885891
Me.Hide()
892+
If BootForm.ToolMode <> 1 Then
893+
IBoardprms.Button6.Enabled = True
894+
IBoardprms.Button8.Enabled = True
895+
IBoardprms.Button4.Enabled = True
896+
End If
886897
IBoardpfrm.ShowDialog()
887-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
898+
If BootForm.ToolMode = 1 Then
888899
Me.Close()
889900
BootForm.WindowState = FormWindowState.Normal
890901
BootForm.Show()
@@ -922,7 +933,7 @@ Public Class Form1
922933

923934
BlackForm.TopMost = False
924935
BlackForm.ShowDialog()
925-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
936+
If BootForm.ToolMode = 1 Then
926937
Me.Close()
927938
BootForm.WindowState = FormWindowState.Normal
928939
BootForm.Show()
@@ -977,7 +988,7 @@ Public Class Form1
977988
FakeShutdownForm.Timer1.Enabled = True
978989
FakeShutdownForm.FakeMode = 1
979990
FakeShutdownForm.ShowDialog()
980-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
991+
If BootForm.ToolMode = 1 Then
981992
Me.Close()
982993
BootForm.WindowState = FormWindowState.Normal
983994
BootForm.Show()

‎Src/UsefulControl/Form2.vb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Public Class Form2
8383
BootForm.Timer2.Enabled = True
8484
BootForm.NotifyIcon1.Visible = True
8585
BootForm.NotifyIcon1.ShowBalloonTip(7000, "实用工具集合小工具", "实用工具集合小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "秒）之后重新显示。", ToolTipIcon.Info)
86-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
86+
If BootForm.ToolMode = 1 Then
8787
BootForm.Hide()
8888
End If
8989
Form1.Hide()
@@ -94,7 +94,7 @@ Public Class Form2
9494
BootForm.Timer2.Enabled = True
9595
BootForm.NotifyIcon1.Visible = True
9696
BootForm.NotifyIcon1.ShowBalloonTip(7000, "实用工具集合小工具", "实用工具集合小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "分钟）之后重新显示。", ToolTipIcon.Info)
97-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
97+
If BootForm.ToolMode = 1 Then
9898
BootForm.Hide()
9999
End If
100100
Form1.Hide()
@@ -105,7 +105,7 @@ Public Class Form2
105105
BootForm.Timer2.Enabled = True
106106
BootForm.NotifyIcon1.Visible = True
107107
BootForm.NotifyIcon1.ShowBalloonTip(7000, "实用工具集合小工具", "实用工具集合小工具当前已隐藏到系统托盘，双击托盘图标或在设定的时间（" & TextBox1.Text & "小时）之后重新显示。", ToolTipIcon.Info)
108-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
108+
If BootForm.ToolMode = 1 Then
109109
BootForm.Hide()
110110
End If
111111
Form1.Hide()
@@ -290,7 +290,7 @@ errcode:
290290
Private Sub Button4_Click(sender As System.Object, e As System.EventArgs) Handles Button4.Click
291291
BootForm.NotifyIcon1.Visible = True
292292
BootForm.NotifyIcon1.ShowBalloonTip(7000, "实用工具集合小工具", "实用工具集合小工具当前已隐藏到系统托盘，双击托盘图标重新显示。", ToolTipIcon.Info)
293-
If Command().ToLower = "/topbar" Or Command().ToLower = "/bottombar" Or Command().ToLower = "/lefttopbar" Or Command().ToLower = "/righttopbar" Or Command().ToLower = "/leftbottombar" Or Command().ToLower = "/rightbottombar" Or Command().ToLower = "/leftbar" Or Command().ToLower = "/rightbar" Then
293+
If BootForm.ToolMode = 1 Then
294294
BootForm.Hide()
295295
End If
296296
Form1.Hide()

0 commit comments

Comments
 (0)