Skip to content

Commit

Permalink
v17 release changes: Minor formatting changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Hou5e committed Aug 4, 2018
1 parent 9d48dd5 commit 70f92a8
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion Browser/GlobalRefs.vb
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ Public Class KeyboardHandler
Public Function OnPreKeyEvent(browserControl As CefSharp.IWebBrowser, browser As CefSharp.IBrowser, type As CefSharp.KeyType, windowsKeyCode As Integer, nativeKeyCode As Integer, modifiers As CefSharp.CefEventFlags, isSystemKey As Boolean, ByRef isKeyboardShortcut As Boolean) As Boolean Implements CefSharp.IKeyboardHandler.OnPreKeyEvent
If type = CefSharp.KeyType.RawKeyDown Then
Select Case windowsKeyCode
'Browser active control event: Press ESC to cancel Navigation, F5 to Refresh, CTRL+F5 to Clear Cache, ALT+Left for Navigate Back, ALT+Right for Navigate Forward, F12 for Web Tools
'Browser active control event: Press ESC to cancel Navigation, F5 to Refresh, CTRL+F5 to Clear Cache, ALT+Left for Navigate Back, ALT+Right for Navigate Forward, F12 for Web Tools
Case Keys.Right, Keys.Left
If modifiers = CefSharp.CefEventFlags.AltDown Then
g_Main.updateKeyPress(windowsKeyCode, modifiers)
Expand Down
14 changes: 7 additions & 7 deletions Browser/Main.vb
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
If CefSharp.Cef.Initialize(settings) = True Then
Me.browser = New CefSharp.WinForms.ChromiumWebBrowser(URL_BLANK)
'Add browser event handlers to pass events back to the main UI
AddHandler Me.browser.FrameLoadEnd, AddressOf onBrowserFrameLoadEnd
AddHandler Me.browser.ConsoleMessage, AddressOf onBrowserConsoleMessage
AddHandler Me.browser.FrameLoadEnd, AddressOf OnBrowserFrameLoadEnd
AddHandler Me.browser.ConsoleMessage, AddressOf OnBrowserConsoleMessage
AddHandler Me.browser.StatusMessage, AddressOf OnBrowserStatusMessage
AddHandler Me.browser.LoadingStateChanged, AddressOf OnBrowserLoadingStateChanged
AddHandler Me.browser.TitleChanged, AddressOf OnBrowserTitleChanged
Expand Down Expand Up @@ -562,8 +562,8 @@
Delay(150)

If Me.browser IsNot Nothing Then
RemoveHandler Me.browser.FrameLoadEnd, AddressOf onBrowserFrameLoadEnd
RemoveHandler Me.browser.ConsoleMessage, AddressOf onBrowserConsoleMessage
RemoveHandler Me.browser.FrameLoadEnd, AddressOf OnBrowserFrameLoadEnd
RemoveHandler Me.browser.ConsoleMessage, AddressOf OnBrowserConsoleMessage
RemoveHandler Me.browser.StatusMessage, AddressOf OnBrowserStatusMessage
RemoveHandler Me.browser.LoadingStateChanged, AddressOf OnBrowserLoadingStateChanged
RemoveHandler Me.browser.TitleChanged, AddressOf OnBrowserTitleChanged
Expand Down Expand Up @@ -2403,14 +2403,14 @@
#End Region

#Region "Browser Control Event Handlers"
Private Sub onBrowserFrameLoadEnd(sender As Object, e As CefSharp.FrameLoadEndEventArgs)
Private Sub OnBrowserFrameLoadEnd(sender As Object, e As CefSharp.FrameLoadEndEventArgs)
'Set a flag to indicate the web page has finished loading. This event is fired for each frame that loads, so compare URLs before setting the flag as loaded (NOTE: Me.browser.IsLoading = True, doesn't work)
If e.Url.Contains(m_strPageURL) Then
m_bPageLoaded = True
End If
End Sub

Private Sub onBrowserConsoleMessage(sender As Object, e As CefSharp.ConsoleMessageEventArgs)
Private Sub OnBrowserConsoleMessage(sender As Object, e As CefSharp.ConsoleMessageEventArgs)
If e.Line > 0 Then
addActivity(e.Message & " (" & e.Source & ", ln " & e.Line.ToString & " )")
Else
Expand Down Expand Up @@ -2630,7 +2630,7 @@
End Select
End Sub

'Mouse forward and Back: Works where mouse location is. Works for the main window (but not over the browser control area) when using the extra mouse programmable 4th and 5th buttons on the mouse
'Mouse Forward and Back: Works where mouse location is. Works for the main form window (but not over the browser control area) when using the extra mouse programmable 4th and 5th buttons on the mouse
Private Sub Main_MouseDown(sender As Object, e As MouseEventArgs) Handles Me.MouseDown, btnBack.MouseDown, btnBTCBlockchain.MouseDown, btnCureCoin.MouseDown, btnCureCoinBlockchain.MouseDown, btnCureCoinDiscord.MouseDown, btnCureCoinTwitter.MouseDown, btnCurePool.MouseDown, btnEOC.MouseDown, btnFAHControl.MouseDown, btnFLDC_Distribution.MouseDown, btnFoldingCoinBlockchain.MouseDown, btnFoldingCoinDiscord.MouseDown, btnFoldingCoinTwitter.MouseDown, btnFoldingCoinWebsite.MouseDown, btnFwd.MouseDown, btnGo.MouseDown, btnHome.MouseDown, btnMyWallet.MouseDown, btnReload.MouseDown, btnStopNav.MouseDown, chkShowTools.MouseDown, gbxCheckboxForTools.MouseDown, lblURL.MouseDown, pbProgIcon.MouseDown, txtURL.MouseDown
Select Case e.Button
Case MouseButtons.XButton1
Expand Down
8 changes: 4 additions & 4 deletions FoldingBrowser - Status - ToDo List.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ FoldingBrowser All-in-One Installer:
Immediate Need / Short-Term Goals:
-----------------------------------

-Add Fwd/Back to the web control window, which should now be available in CefSharp v63+
-Strip out all not allowed characters that can be pasted in to the username textbox --> TextboxEx? -Automatic character removal with no warning that the pasted text was modified was originally (less desirable, but probably better. Make warning message).
-Support other wallets, for pressing the 'FLDC Wallet' button, with option for: https://freewallet.io/ And, reverse the CounterWallet website search order to use the 2nd one first? (Currently only using: https://counterwallet.io/). Other alternatives (ignore for now): https://wallet.indiesquare.me/ also: rarepepewallet.com (Not updated enough? security risks?) (Not yet) https://tokenpockets.com/ (You cannot use tokenpockets currently. It is not compatible with existing passphrases from CounterWallet. If you want to use it, you will have to make a new address first)
-Evaluate upgrading to CefSharp/Chrome v67 (VC++2015) when released here: github.com/cefsharp/CefSharp/releases
Expand All @@ -21,6 +20,7 @@ Other Ideas, Improvements, Tasks, Longer-Term Goals:
-Enable Google Translate in Chrome/CefSharp for automatic web page translations?
-Enable Multi-language support in the browser component to view pages that are available in other languages (Allow users to change the locale & supported languages)?
-Add Multi-language support in the FoldingBrowser for button text (and tooltips)?
-Add Fwd/Back navigation with 4th/5th mouse button clicks to the web control window
-Add images to improve dialog prompt errors, instructions, or questions (It will help non-English speaking users)
-Add an Ad Blocker Plugin, if possible?
-Improve the process to change the default encryption password on the FoldingBrowser Saved settings: INI file: when encryption password is blank, prompt for password, if encryption fails (for extra security for not keeping the PW in a text file in your user account). Option to be prompted for it: once per session, or prompted every time when needed.
Expand Down Expand Up @@ -50,17 +50,17 @@ Other Ideas, Improvements, Tasks, Longer-Term Goals:
-Add a CureCoin Wallet button, that focus a running CURE wallet executable, or launches it as a new process?
-Show image of where to get the CureCoin wallet address, for the message box when it can't be found
-Try to fix/automate this known issue: -Discord invites go to a blank page (Press the 'Discord' button again to reload/fix)
-Improve the get .NET v4.0 (4.7?) from Microsoft message in the installer to: use Windows Update, or manually install from Microsoft's website?
-Improve the get .NET v4.0 from Microsoft message in the installer to: use Windows Update, or manually install from Microsoft's website?
-Integration with HFM.NET, or something similar


======================================================================================================
Change Log - Release Notes - Tasks completed:
======================================================================================================

v17 Release (07/??/2018)
v17 Release (08/??/2018)
[DONE] -Upgrade to CefSharp/Chrome v65 (VC++2015), and updated the VC++ dependency in the installer
[DONE] -Update the FoldingBrowser FAH download links. The FAH website domain links changed.
[DONE] -Update the FoldingBrowser FAH download links for the FAH website domain change
[DONE] -Add workaround for: FAH Web Control, where it gets stuck in an infinite refresh loop in Chrome v59+, and needs a refresh without cache to fix that condition.
[DONE] -Upgrade to CefSharp/Chrome v63 (VC++2013)
v16 Release (02/12/2018)
Expand Down
22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,6 @@
- Requires: [VC++ 2015 x86 Redist](https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x86.exe) & [.NET v4.5.2](https://www.microsoft.com/en-us/download/details.aspx?id=42643)
- [Status, release notes, & ideas for future development](FoldingBrowser%20-%20Status%20-%20ToDo%20List.txt)

## License

- FoldingBrowser is licensed under a [BSD 3-Clause License](Browser/bin/Release/LICENSE.txt "BSD 3-Clause License")

## Contact

**Please ask questions on Discord (I'm user Hou5e):**
* [FoldingCoin New User Discord Invite](https://discord.gg/CvZ7gAs)
* [CureCoin New User Discord Invite](https://discord.gg/jtztkFZ)
* BitcoinTalk forum for: [FoldingCoin](https://bitcointalk.org/index.php?topic=781352), or [CureCoin](https://bitcointalk.org/index.php?topic=603757)

## Browser Hotkeys

Hotkeys | Function
Expand All @@ -35,3 +24,14 @@ ALT+Left, Prior | Navigate back
ALT+Right, Next | Navigate forward
CTRL+F | Open Find (Find Next: ENTER or F3, Find Previous: SHIFT+ENTER or SHIFT+F3, Close Find: ESC)
F12 | Open web developer tools

## License

- FoldingBrowser is licensed under a [BSD 3-Clause License](Browser/bin/Release/LICENSE.txt "BSD 3-Clause License")

## Contact

**Please ask questions on Discord (I'm user Hou5e):**
* [FoldingCoin Discord Invite](https://discord.gg/CvZ7gAs)
* [CureCoin Discord Invite](https://discord.gg/jtztkFZ)
* BitcoinTalk forum for: [FoldingCoin](https://bitcointalk.org/index.php?topic=781352), or [CureCoin](https://bitcointalk.org/index.php?topic=603757)

0 comments on commit 70f92a8

Please sign in to comment.