Skip to content

Commit

Permalink
v8.33eng Additional fix.
Browse files Browse the repository at this point in the history 
Former-commit-id: d3bb14e
  • Loading branch information
@SamToki
SamToki committed Jul 27, 2022
1 parent 6b844c4 commit b4998f6
Show file tree
Hide file tree
Showing 12 changed files with 68 additions and 79 deletions.
Binary file added CODE/CZJSTappdata/CZJSTaudio/CZJSTaudio_TimerTimeUp[Long].wav
View file
Binary file not shown.
1 change: 0 additions & 1 deletion CODE/CZJSTappdata/CZJSTaudio/CZJSTaudio_TimerTimeUp[Long].wav.REMOVED.git-id
View file

This file was deleted.

24 changes: 12 additions & 12 deletions CODE/CZJSTappwindows/FormBigFloatingClock.frm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = "00"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -83,10 +83,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = "00"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -108,10 +108,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = ":"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -130,10 +130,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = "00"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -151,10 +151,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = "00"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -173,10 +173,10 @@ Begin VB.Form FormBigFloatingClock
BackStyle = 0 'Transparent
Caption = ":"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 36
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand Down
59 changes: 25 additions & 34 deletions CODE/CZJSTappwindows/FormInputNumber.frm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Begin VB.Form FormInputNumber
Cancel = -1 'True
Caption = "X"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 15.75
Charset = 0
Weight = 400
Expand Down Expand Up @@ -63,7 +63,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdDelete
Caption = "&Del"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 15.75
Charset = 0
Weight = 400
Expand All @@ -83,7 +83,7 @@ Begin VB.Form FormInputNumber
Caption = "&0"
Default = -1 'True
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -102,7 +102,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber9
Caption = "&9"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -121,7 +121,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber8
Caption = "&8"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -140,7 +140,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber7
Caption = "&7"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -159,7 +159,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber6
Caption = "&6"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -178,7 +178,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber5
Caption = "&5"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -197,7 +197,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber4
Caption = "&4"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -216,7 +216,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber3
Caption = "&3"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -235,7 +235,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber2
Caption = "&2"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -254,7 +254,7 @@ Begin VB.Form FormInputNumber
Begin VB.CommandButton CmdNumber1
Caption = "&1"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 30
Charset = 0
Weight = 400
Expand All @@ -276,8 +276,8 @@ Begin VB.Form FormInputNumber
BackColor = &H00FFFFFF&
Caption = ">"
BeginProperty Font
Name = "Avenir Next LT Pro"
Size = 48
Name = "Avenir"
Size = 45.75
Charset = 0
Weight = 400
Underline = 0 'False
Expand All @@ -297,8 +297,8 @@ Begin VB.Form FormInputNumber
BackColor = &H00FFFFFF&
Caption = ">"
BeginProperty Font
Name = "Avenir Next LT Pro"
Size = 48
Name = "Avenir"
Size = 45.75
Charset = 0
Weight = 400
Underline = 0 'False
Expand All @@ -318,8 +318,8 @@ Begin VB.Form FormInputNumber
BackColor = &H00FFFFFF&
Caption = ">"
BeginProperty Font
Name = "Avenir Next LT Pro"
Size = 48
Name = "Avenir"
Size = 45.75
Charset = 0
Weight = 400
Underline = 0 'False
Expand All @@ -339,15 +339,6 @@ Begin VB.Form FormInputNumber
BackColor = &H000000FF&
BackStyle = 0 'Transparent
Caption = "Hold Alt key to enter number using keyboard"
BeginProperty Font
Name = "MS Sans Serif"
Size = 9.75
Charset = 0
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
EndProperty
ForeColor = &H00000000&
Height = 330
Left = 315
Expand All @@ -361,8 +352,8 @@ Begin VB.Form FormInputNumber
BackColor = &H00FFFFFF&
Caption = ">"
BeginProperty Font
Name = "Avenir Next LT Pro"
Size = 48
Name = "Avenir"
Size = 45.75
Charset = 0
Weight = 400
Underline = 0 'False
Expand Down Expand Up @@ -673,7 +664,7 @@ Public windowanimationtargetheight As Integer
Call FormMainWindow.TimerTimer_Timer
Case "TimerSec"
If (inputnumber1 * 10 + inputnumber2) > 59 Then
MsgBox "CAUTION: Number invalid." & vbCrLf & "[Second] cannot be larger than 59.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
MsgBox "Number invalid." & vbCrLf & vbCrLf & "The ""second"" cannot be larger than 59.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
Else
FormMainWindow.timersettimesec = inputnumber1 * 10 + inputnumber2
FormMainWindow.timersettime = FormMainWindow.timersettimemin * 60 + FormMainWindow.timersettimesec
Expand All @@ -682,21 +673,21 @@ Public windowanimationtargetheight As Integer
Call FormMainWindow.TimerTimer_Timer
Case "LotteryTotal"
If (inputnumber1 * 1000 + inputnumber2 * 100 + inputnumber3 * 10 + inputnumber4) < FormMainWindow.lotterygroup Then
MsgBox "CAUTION: Number invalid." & vbCrLf & "[Group] cannot be larger than the lottery number range.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
MsgBox "Number invalid." & vbCrLf & vbCrLf & "The ""group"" cannot be larger than the lottery number range.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
Else
If (inputnumber1 * 1000 + inputnumber2 * 100 + inputnumber3 * 10 + inputnumber4) < 2 Then
MsgBox "The number cannot be smaller than 2.", vbExclamation + vbOKOnly + vbDefaultButton1, "Number Invalid"
MsgBox "Number invalid." & vbCrLf & vbCrLf & "The ""group"" cannot be smaller than 2.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
Else
FormMainWindow.lotterytotal = inputnumber1 * 1000 + inputnumber2 * 100 + inputnumber3 * 10 + inputnumber4
End If
End If
Call FormMainWindow.LotterySettingsRefresher
Case "LotteryGroup"
If (inputnumber1 * 10 + inputnumber2) > FormMainWindow.lotterytotal Then
MsgBox "CAUTION: Number invalid." & vbCrLf & "[Group] cannot be larger than the lottery number range.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
MsgBox "Number invalid." & vbCrLf & vbCrLf & "The ""group"" cannot be larger than the lottery number range.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
Else
If (inputnumber1 * 10 + inputnumber2) < 2 Then
MsgBox "CAUTION: Number invalid." & vbCrLf & "[Group] cannot be smaller than 2.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
MsgBox "Number invalid." & vbCrLf & vbCrLf & "The ""group"" cannot be smaller than 2.", vbExclamation + vbOKOnly + vbDefaultButton1, "Timer+Lottery"
Else
FormMainWindow.lotterygroup = inputnumber1 * 10 + inputnumber2
End If
Expand Down
6 changes: 3 additions & 3 deletions CODE/CZJSTappwindows/FormLottery.frm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Begin VB.Form FormLottery
Caption = "X"
Default = -1 'True
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 24
Charset = 0
Weight = 400
Expand Down Expand Up @@ -93,7 +93,7 @@ Begin VB.Form FormLottery
BackStyle = 0 'Transparent
Caption = "ScrText Abg"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 111.75
Charset = 0
Weight = 400
Expand All @@ -115,7 +115,7 @@ Begin VB.Form FormLottery
BackStyle = 0 'Transparent
Caption = "HintText Abg"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 48
Charset = 0
Weight = 400
Expand Down
20 changes: 10 additions & 10 deletions CODE/CZJSTappwindows/FormMainWindow.frm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ Begin VB.Form FormMainWindow
Begin VB.CommandButton CmdTimerClear
Caption = "CLEAR"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 18
Charset = 0
Weight = 400
Expand All @@ -184,7 +184,7 @@ Begin VB.Form FormMainWindow
Begin VB.CommandButton CmdTimerReset
Caption = "RESET"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 18
Charset = 0
Weight = 400
Expand All @@ -203,7 +203,7 @@ Begin VB.Form FormMainWindow
Begin VB.CommandButton CmdTimerStartPauseResume
Caption = "START"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 18
Charset = 0
Weight = 400
Expand Down Expand Up @@ -398,10 +398,10 @@ Begin VB.Form FormMainWindow
BackStyle = 0 'Transparent
Caption = ":"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 63.75
Charset = 0
Weight = 700
Weight = 400
Underline = 0 'False
Italic = 0 'False
Strikethrough = 0 'False
Expand All @@ -419,7 +419,7 @@ Begin VB.Form FormMainWindow
BackStyle = 0 'Transparent
Caption = "00"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 63.75
Charset = 0
Weight = 400
Expand All @@ -441,7 +441,7 @@ Begin VB.Form FormMainWindow
BackStyle = 0 'Transparent
Caption = "0"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 63.75
Charset = 0
Weight = 400
Expand Down Expand Up @@ -512,7 +512,7 @@ Begin VB.Form FormMainWindow
Begin VB.CommandButton CmdLotteryRepeatTenTimes
Caption = "REPEAT TEN TIMES"
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 18
Charset = 0
Weight = 400
Expand All @@ -532,7 +532,7 @@ Begin VB.Form FormMainWindow
Caption = "START LOTTERY..."
Default = -1 'True
BeginProperty Font
Name = "Avenir Next LT Pro"
Name = "Avenir"
Size = 18
Charset = 0
Weight = 400
Expand Down Expand Up @@ -1261,7 +1261,7 @@ Begin VB.Form FormMainWindow
Enabled = 0 'False
End
Begin VB.Menu MenuAboutDate
Caption = "2022/01/28"
Caption = "2022/07/28"
Enabled = 0 'False
End
End
Expand Down
Loading

0 comments on commit b4998f6

Please sign in to comment.