Skip to content

Commit 7e4dbfa

Browse files
authored
Merge pull request #18 from pdjdev/dev
1.8.2 version update
2 parents 4af6360 + 8048c78 commit 7e4dbfa

5 files changed

Lines changed: 53 additions & 58 deletions

File tree

utable/Forms/EveryTimeBrowserNew.Designer.vb

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

utable/Forms/EveryTimeBrowserNew.vb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Public Class EveryTimeBrowserNew
8181
End If
8282
End If
8383

84-
WebView21.CoreWebView2.Settings.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36"
84+
WebView21.CoreWebView2.Settings.IsReputationCheckingRequired = False
8585
WebView21.Source = New Uri(targetUrl)
8686
trialCount = 0
8787

@@ -94,8 +94,12 @@ Public Class EveryTimeBrowserNew
9494
LoadingSplash1.Visible = False
9595

9696
If WebView21.Source.ToString.Contains("/timetable") Then
97-
Debug.Print("Detected!!" + vbCrLf)
97+
'Debug.Print("Detected!!" + vbCrLf)
98+
TSLinkLabel1.Visible = False
9899
Label1.Text = "시간표를 불러오는 중..."
100+
Label1.Dock = DockStyle.Fill
101+
Label1.TextAlign = ContentAlignment.MiddleCenter
102+
99103
'PerformZoom(WebBrowser1, dpivalue)
100104
WebView21.Visible = False
101105
WebView21.Dock = DockStyle.None
@@ -221,7 +225,7 @@ Public Class EveryTimeBrowserNew
221225
LoadingSplash1.Visible = True
222226
End Sub
223227

224-
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
228+
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles TSLinkLabel1.LinkClicked
225229
TopMost = False
226230
Process.Start("https://utable.sw.pbj.kr/everytime-troubleshooting")
227231
End Sub

utable/Forms/EverytimeSemesterSelector.Designer.vb

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

utable/Forms/EverytimeSemesterSelector.vb

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,19 @@ Public Class EverytimeSemesterSelector
138138

139139
FadeOut(Me)
140140
Hide()
141-
EveryTimeBrowserNew.ShowDialog(Form1)
141+
Try
142+
EveryTimeBrowserNew.ShowDialog(Form1)
143+
Catch ex As Exception
144+
If MsgBox("브라우저 실행 중 문제가 발생했습니다." + vbCr _
145+
+ "(" + ex.Message + ")" + vbCr + vbCr _
146+
+ "문제 해결 페이지로 이동하시겠습니까?", vbExclamation + vbYesNo) = vbYes Then
147+
TopMost = False
148+
Process.Start("https://utable.sw.pbj.kr/everytime-troubleshooting")
149+
Close()
150+
End If
151+
End Try
152+
142153
Close()
143154
End Select
144155
End Sub
145-
146-
Private Sub LinkLabel1_LinkClicked(sender As Object, e As LinkLabelLinkClickedEventArgs) Handles LinkLabel1.LinkClicked
147-
TopMost = False
148-
Process.Start("https://utable.sw.pbj.kr/everytime-troubleshooting")
149-
End Sub
150156
End Class

utable/My Project/AssemblyInfo.vb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Imports System.Runtime.InteropServices
1111
<Assembly: AssemblyDescription("대학생을 위한 시간표 프로그램")>
1212
<Assembly: AssemblyCompany("PBJSoftware")>
1313
<Assembly: AssemblyProduct("uTable")>
14-
<Assembly: AssemblyCopyright("Copyright © PBJSoftware 2021")>
14+
<Assembly: AssemblyCopyright("Copyright © PBJSoftware 2023")>
1515
<Assembly: AssemblyTrademark("PBJSoftware")>
1616

1717
<Assembly: ComVisible(True)>
@@ -30,6 +30,6 @@ Imports System.Runtime.InteropServices
3030
' 기본값으로 할 수 있습니다.
3131
' <Assembly: AssemblyVersion("1.0.*")>
3232

33-
<Assembly: AssemblyVersion("1.8.1.0")>
34-
<Assembly: AssemblyFileVersion("1.8.1.0")>
33+
<Assembly: AssemblyVersion("1.8.2.0")>
34+
<Assembly: AssemblyFileVersion("1.8.2.0")>
3535

0 commit comments

Comments
 (0)