fix resolution + browser

fix for the resoltion not found dialog and the webbrowser should now close allways after the backgroud task is compleed
This commit is contained in:
hama3254 2019-12-04 21:00:26 +01:00
parent a8cc176e06
commit 1f2bee8b0e
16 changed files with 41 additions and 38 deletions

Binary file not shown.

View File

@ -148,18 +148,16 @@ Public Class GeckoFX
SoftSub.DownloadSubs() SoftSub.DownloadSubs()
Me.Close() Me.Close()
End If End If
Else
If Main.UserBowser = False Then
Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
Me.Close()
End If
End If End If
End If End If
End If End If
If Main.UserBowser = False Then
Main.WebbrowserURL = WebBrowser1.Url.ToString
Main.WebbrowserText = WebBrowser1.Document.Body.OuterHtml
Main.WebbrowserTitle = WebBrowser1.DocumentTitle
Me.Close()
End If
End Sub End Sub
Private Sub GeckoFX_Load(sender As Object, e As EventArgs) Handles MyBase.Load Private Sub GeckoFX_Load(sender As Object, e As EventArgs) Handles MyBase.Load

View File

@ -119,6 +119,7 @@ Partial Class Main
Me.ListView1.Font = New System.Drawing.Font("Microsoft Sans Serif", 93.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.ListView1.Font = New System.Drawing.Font("Microsoft Sans Serif", 93.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
Me.ListView1.ForeColor = System.Drawing.Color.Black Me.ListView1.ForeColor = System.Drawing.Color.Black
Me.ListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None Me.ListView1.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None
Me.ListView1.HideSelection = False
Me.ListView1.Location = New System.Drawing.Point(1, 64) Me.ListView1.Location = New System.Drawing.Point(1, 64)
Me.ListView1.MinimumSize = New System.Drawing.Size(800, 400) Me.ListView1.MinimumSize = New System.Drawing.Size(800, 400)
Me.ListView1.Name = "ListView1" Me.ListView1.Name = "ListView1"

View File

@ -760,9 +760,12 @@ Public Class Main
If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then If CBool(InStr(WebbrowserText, Chr(34) + "hardsub_lang" + Chr(34) + ":null")) Then
SubSprache2 = "null" SubSprache2 = "null"
Else Else
ResoNotFoundString = WebbrowserText Me.Invoke(New Action(Function()
DialogTaskString = "Language" ResoNotFoundString = WebbrowserText
Reso.ShowDialog() DialogTaskString = "Language"
Reso.ShowDialog()
Return Nothing
End Function))
If UserCloseDialog = True Then If UserCloseDialog = True Then
Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
Else Else
@ -789,9 +792,12 @@ Public Class Main
Else Else
ResoNotFoundString = WebbrowserText Me.Invoke(New Action(Function()
DialogTaskString = "Language" ResoNotFoundString = WebbrowserText
Reso.ShowDialog() DialogTaskString = "Language"
Reso.ShowDialog()
Return Nothing
End Function))
If UserCloseDialog = True Then If UserCloseDialog = True Then
Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
Else Else
@ -912,14 +918,19 @@ Public Class Main
If CBool(InStr(str, "x" + Resu.ToString + ",")) Then If CBool(InStr(str, "x" + Resu.ToString + ",")) Then
Resu2 = "x" + Resu.ToString Resu2 = "x" + Resu.ToString
Else Else
'MsgBox(str)
If CBool(InStr(str, ResuSave + ",")) Then If CBool(InStr(str, ResuSave + ",")) Then
Resu2 = Resu2 Resu2 = Resu2
Else Else
Me.Invoke(New Action(Function()
DialogTaskString = "Resolution"
ResoNotFoundString = str
Reso.ShowDialog()
Return Nothing
End Function))
ResoNotFoundString = str
DialogTaskString = "Resolution" MsgBox(ResoBackString)
Reso.ShowDialog()
'MsgBox(ResoBackString)
If UserCloseDialog = True Then If UserCloseDialog = True Then
Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34)) Throw New System.Exception(Chr(34) + "UserAbort" + Chr(34))
Else Else

View File

@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben: ' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")> ' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("3.0")> <Assembly: AssemblyVersion("3.0.1")>
<Assembly: AssemblyFileVersion("3.0")> <Assembly: AssemblyFileVersion("3.0.1")>
<Assembly: NeutralResourcesLanguage("")> <Assembly: NeutralResourcesLanguage("")>

View File

@ -52,28 +52,21 @@
ComboBox1.Items.Add(langsplit(0)) ComboBox1.Items.Add(langsplit(0))
Next Next
SurroundingSub() SurroundingSub()
'ComboBox1.SelectedIndex = 0
ElseIf Main.DialogTaskString = "Resolution" Then ElseIf Main.DialogTaskString = "Resolution" Then
' CheckBox1.Visible = True
StatusLabel.Text = Main.LabelResoNotFoundText StatusLabel.Text = Main.LabelResoNotFoundText
MsgBox(Main.ResoNotFoundString) Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
Dim Zeilen() As String = Main.ResoNotFoundString.Split(New String() {vbNewLine}, System.StringSplitOptions.RemoveEmptyEntries) For i As Integer = 1 To Reso_avaible1.Count - 1
For i As Integer = 0 To Zeilen.Count - 1 Dim Reso_avaible2 As String() = Reso_avaible1(i).Split(New [Char]() {Chr(44)})
If InStr(Zeilen(i), ": Video:") Then ComboBox1.Items.Add(Reso_avaible2(0))
Dim ZeileReso() As String = Zeilen(i).Split(New String() {" ["}, System.StringSplitOptions.RemoveEmptyEntries)
Dim ZeileReso2() As String = ZeileReso(0).Split(New String() {", "}, System.StringSplitOptions.RemoveEmptyEntries)
ComboBox1.Items.Add(ZeileReso2(ZeileReso2.Count - 1))
End If
Next Next
'Dim Reso_avaible1 As String() = Main.ResoNotFoundString.Split(New String() {"RESOLUTION="}, System.StringSplitOptions.RemoveEmptyEntries)
'For i As Integer = 1 To Reso_avaible1.Count - 1
' Dim Reso_avaible2 As String() = Reso_avaible1(i).Split(New [Char]() {Chr(44)})
' ComboBox1.Items.Add(Reso_avaible2(0))
'Next
SurroundingSub() SurroundingSub()
'ComboBox1.SelectedIndex = 0 Try
ComboBox1.SelectedIndex = 0
Catch ex As Exception
End Try
End If End If
End Sub End Sub
Private Sub SurroundingSub() Private Sub SurroundingSub()
@ -107,7 +100,7 @@
End Sub End Sub
Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click Private Sub PictureBox9_Click(sender As Object, e As EventArgs) Handles PictureBox9.Click
If ComboBox1.SelectedText = Nothing Then If ComboBox1.SelectedItem.ToString = Nothing Then
Else Else
Main.ResoBackString = ComboBox1.SelectedItem.ToString Main.ResoBackString = ComboBox1.SelectedItem.ToString
Main.UserCloseDialog = False Main.UserCloseDialog = False