Skip to content

Commit

Permalink
minor update
Browse files Browse the repository at this point in the history
  • Loading branch information
nutellarlz committed Jun 30, 2016
1 parent 8fb888b commit 401b9d0
Show file tree
Hide file tree
Showing 25 changed files with 163 additions and 50 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,10 @@ GeneratedArtifacts/
_Pvt_Extensions/
ModelManifest.xml
/JumpGo-for-Windows/
*.msi
JGSetupTBU/Debug/setup.exe
JGUpdater/bin/Debug/JGUpdater.exe
JGUpdater/bin/Debug/JGUpdater.exe
JumpGo/bin/Debug/JumpGo.exe
JumpGo/obj/Debug/JumpGo.exe
JumpGo/obj/Release/JumpGo Developer.exe
3 changes: 3 additions & 0 deletions JumpGo/App.config
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,9 @@
<setting name="AeroTabs" serializeAs="String">
<value>True</value>
</setting>
<setting name="NavPnlBGEnabled" serializeAs="String">
<value>False</value>
</setting>
</JumpGoStandardEdition.My.MySettings>
</userSettings>
</configuration>
14 changes: 8 additions & 6 deletions JumpGo/JumpGoMain.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions JumpGo/My Project/Settings.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions JumpGo/My Project/Settings.settings
Original file line number Diff line number Diff line change
Expand Up @@ -101,5 +101,8 @@
<Setting Name="AeroTabs" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">True</Value>
</Setting>
<Setting Name="NavPnlBGEnabled" Type="System.Boolean" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
Binary file modified JumpGo/Resources/Thumbs.db
Binary file not shown.
13 changes: 11 additions & 2 deletions JumpGo/Tab.Designer.vb

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

56 changes: 47 additions & 9 deletions JumpGo/Tab.vb
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Public Class Tab
'AxWebBrowser1.Navigate(TextBox1.Text)
Dim uri As Uri

If System.Uri.TryCreate(TextBox1.Text, UriKind.Absolute, uri) Then
If System.Uri.TryCreate(TextBox1.Text, UriKind.RelativeOrAbsolute, uri) Then
' Navigate to it
FasterBrowser1.Navigate(TextBox1.Text)
Else
Expand Down Expand Up @@ -115,6 +115,14 @@ Public Class Tab
MenuOpen = False
End Sub

Private Sub FasterBrowser1_DomFocus(sender As Object, e As EventArgs) Handles FasterBrowser1.DomFocus
'm_strInnerHtml = FasterBrowser1.Document.ActiveElement.GetAttribute("href")
End Sub

Private Sub FasterBrowser1_Navigating(sender As Object, e As EventArgs) Handles FasterBrowser1.Navigating
Me.Text = "Connecting..."
End Sub

Private Sub FasterBrowser1_Navigated(sender As Object, e As GeckoNavigatedEventArgs) Handles FasterBrowser1.Navigated
FasterBrowser1.ContextMenuStrip = ContextMenuStrip1
FasterBrowser1.ContextMenu = ContextMenuStrip1.ContextMenu
Expand All @@ -126,12 +134,15 @@ Public Class Tab
'Me.Icon
'Me.Text = FasterBrowser1.Document.Title.ToString
'Me.Text = FasterBrowser1.Text.ToString
Me.Text = FasterBrowser1.DocumentTitle.ToString
'Me.Text = FasterBrowser1.DocumentTitle.ToString
'Me.Text = FasterBrowser1.Url.AbsoluteUri
If cz119 = Environment.CurrentDirectory + "\Welcome\index.html" Then
If cz119 = Environment.CurrentDirectory + "/Welcome/index.html" Then
TextBox1.Text = "JumpGo://Welcome"
End If
If cz119.Contains(Environment.CurrentDirectory + "\Welcome\index.html") Then
If cz119.Contains(Environment.CurrentDirectory + "/Welcome/index.html") Then
TextBox1.Text = "JumpGo://Welcome"
End If
If cz119.Contains("Welcome/index.html") Then
TextBox1.Text = "JumpGo://Welcome"
End If
If cz119.Contains("https://") Then
Expand All @@ -156,6 +167,8 @@ Public Class Tab
Else
PictureBox4.Image = My.Resources.BackCircleDis
End If

Me.ToolTip1.ToolTipTitle = FasterBrowser1.DocumentTitle
End Sub

Private Sub FasterBrowser1_DocumentCompleted(sender As Object, e As EventArgs) Handles FasterBrowser1.DocumentCompleted
Expand All @@ -164,20 +177,20 @@ Public Class Tab

'AxWebBrowser1.Navigate(FasterBrowser1.Url)
'FasterBrowser1.Url.ToString()
TextBox1.Text = FasterBrowser1.Url.ToString
'TextBox1.Text = FasterBrowser1.Url.ToString
Dim cz119 As String = FasterBrowser1.Url.ToString
'Me.Icon
'Me.Text = FasterBrowser1.Document.Title.ToString
'Me.Text = FasterBrowser1.Text.ToString
Me.Text = FasterBrowser1.DocumentTitle.ToString
'Me.Text = FasterBrowser1.Url.AbsoluteUri
If FasterBrowser1.Url.AbsolutePath = Environment.CurrentDirectory + " \ Welcome \ Index.html" Then
If FasterBrowser1.Url.AbsolutePath = Environment.CurrentDirectory + "/Welcome/index.html" Then
TextBox1.Text = "JumpGo: //Welcome"
End If
If cz119 = Environment.CurrentDirectory + "\Welcome\index.html" Then
If cz119 = Environment.CurrentDirectory + "/Welcome/index.html" Then
TextBox1.Text = "JumpGo://Welcome"
End If
If cz119.Contains(Environment.CurrentDirectory + "\Welcome\index.html") Then
If cz119.Contains(Environment.CurrentDirectory + "/Welcome/index.html") Then
TextBox1.Text = "JumpGo://Welcome"
End If
If cz119.Contains("https://") Then
Expand Down Expand Up @@ -243,6 +256,8 @@ Public Class Tab
Else
PictureBox4.Image = My.Resources.BackCircleDis
End If

Me.ToolTip1.ToolTipTitle = FasterBrowser1.DocumentTitle
End Sub

Private Sub geticon()
Expand Down Expand Up @@ -362,6 +377,7 @@ Public Class Tab

Private Sub Tab_Load(sender As Object, e As EventArgs) Handles MyBase.Load
GeckoPreferences.Default("extensions.blocklist.enabled") = False
'GeckoPreferences.Default()
FasterBrowser1.ContextMenuStrip = ContextMenuStrip1
FasterBrowser1.ContextMenu = ContextMenuStrip1.ContextMenu
If My.Settings.FirstRun = True Then
Expand Down Expand Up @@ -402,8 +418,13 @@ Public Class Tab
Button6.BackgroundImage = My.Resources.SearchButton
'Button7.BackgroundImage = My.Resources.MenuTransparent
End If

Dim WinVerID As String = Environment.OSVersion.ToString()

'Dim sUserAgent As String = "Mozilla/5.0 (Windows; U; Windows NT 6.1; pl; rv:1.9.1) Gecko/20090624 Firefox/3.5 (.NET CLR 3.5.30729)"
Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"
'Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"
Dim sUserAgent As String = "Mozilla/5.0 (Windows NT " + WinVerID + "; WOW64; rv:43.0) Gecko/20100101 Firefox/43.0"
'Dim sUserAgent As String = "Mozilla/5.0 (Windows NT 10.0; WOW64; rv:43.0) Gecko/20100101 JumpGo/43.0"
'Dim sUserAgent As String = "Mozilla/5.0 (Mozilla/5.0 (Windows NT 6.1; WOW64; rv:46.0) Gecko/20100101 JumpGo/4.3"
'Dim sUserAgent As String = "JTechMe/5.0 (Windows; U; Windows NT 6.1; pl; rv:1.9.1) Gecko/20090624 JumpGo/4.3 (.NET CLR 3.5.30729)"
GeckoPreferences.User("general.useragent.override") = sUserAgent
Expand Down Expand Up @@ -789,4 +810,21 @@ Public Class Tab
PictureBox5.Image = My.Resources.ForwardSquareDis
End If
End Sub

Private Sub CopyImageLocationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles CopyImageLocationToolStripMenuItem.Click
FasterBrowser1.CopyLinkLocation()
End Sub

Private Sub OpenInNewTabToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles OpenInNewTabToolStripMenuItem.Click
'FasterBrowser1.Document.ActiveElement.
'JumpGoMain.CreateNewTab("")
End Sub

Private Sub FasterBrowser1_Navigating(sender As Object, e As Events.GeckoNavigatingEventArgs) Handles FasterBrowser1.Navigating

End Sub

Private Sub FasterBrowser1_DomFocus(sender As Object, e As DomEventArgs) Handles FasterBrowser1.DomFocus

End Sub
End Class
Loading

0 comments on commit 401b9d0

Please sign in to comment.