From e90bbf16466dfe70d9e2f5eed694f3fa9277a00b Mon Sep 17 00:00:00 2001 From: Hou5e <20870053+Hou5e@users.noreply.github.com> Date: Fri, 10 Apr 2020 04:48:06 -0700 Subject: [PATCH] v22 release changes: Add CTRL+A to Select All for more applicable text controls. Update instructions for changing the PW on the main PW storage. Update changed URL --- Browser/DisplayTextDialog.resx | 18 ++++++---- Browser/DisplayTextDialog.vb | 30 ++++++++++++++++ Browser/GlobalRefs.vb | 2 +- Browser/Main.vb | 34 +++++++++++++++---- FoldingBrowser - Status - ToDo List.txt | 18 +++++++--- ...ith blockchain - NSIS Installer Script.nsi | 2 +- ...out blockchain - NSIS Installer Script.nsi | 2 +- README.md | 2 +- 8 files changed, 87 insertions(+), 21 deletions(-) diff --git a/Browser/DisplayTextDialog.resx b/Browser/DisplayTextDialog.resx index 410d0c9..1ee53ff 100644 --- a/Browser/DisplayTextDialog.resx +++ b/Browser/DisplayTextDialog.resx @@ -130,14 +130,20 @@ Don't let anyone see your wallet passphrase, or they can gain access to your wal This information is saved in an encrypted format, which is more secure than a text file. Note: The default encryption password can be modified in the INI file: -(Make a backup first) Click 'Show Raw Data', copy the text above to something, -close the program, change the INI password, reopen the program, -click 'Show Raw Data', paste text into this window, and click 'Save Changes'. +(Make a backup first) +Click 'Show Raw Data', copy the text above to something. +Copy these instructions to something, if needed. +Close the program. +Delete file: +C:\Users\<user>\AppData\Roaming\FoldingBrowser\FoldingBrowser.dat + +Change the INI password in file: +C:\Users\<user>\AppData\Roaming\FoldingBrowser\FoldingBrowser.ini + +Reopen the program, click the 'Saved Data' button, and select 'Show Raw Data'. +Paste the 'Saved Data' text into that window, and click 'Save Changes'. (Make a new backup to finish) - - 17, 17 - 47 diff --git a/Browser/DisplayTextDialog.vb b/Browser/DisplayTextDialog.vb index d9800f5..26f780f 100644 --- a/Browser/DisplayTextDialog.vb +++ b/Browser/DisplayTextDialog.vb @@ -1,6 +1,7 @@ Public Class DisplayTextDialog Private m_bRawDataSaved As Boolean = False +#Region "Form Events - New, Closing" Public Sub New() Try InitializeComponent() @@ -43,7 +44,9 @@ 'Clear out the displayed text Me.txtDisplayText.Text = String.Empty End Sub +#End Region +#Region "Control Events - Buttons, Checkboxes" Private Sub chkShowRawData_CheckedChanged(sender As Object, e As EventArgs) Handles chkShowRawData.CheckedChanged If Me.chkShowRawData.Checked = False Then 'Use the individual text boxes @@ -304,7 +307,9 @@ 'The Closing event clears out the displayed text Me.Close() End Sub +#End Region +#Region "Control Events - Comboboxes" Public Sub cbxWalletId_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cbxWalletId.SelectedIndexChanged Me.txtFAHUsername.Text = "" Me.txtFAHTeam.Text = "" @@ -399,7 +404,9 @@ Me.txtWalletName.Text = NotUsed End If End Sub +#End Region +#Region "Control Events - Text boxes" Private Sub txtDisplayText_TextChanged(sender As Object, e As EventArgs) Handles txtDisplayText.TextChanged Me.btnSaveChanges.Enabled = True End Sub @@ -444,6 +451,28 @@ Private Sub txtExtremeOverclockingId_TextChanged(sender As Object, e As EventArgs) Handles txtExtremeOverclockingId.TextChanged Me.btnSaveChanges.Enabled = True End Sub +#End Region + +#Region "Control Events - Keystrokes" + Private Sub txtDisplayText_KeyDown(sender As Object, e As KeyEventArgs) Handles txtDisplayText.KeyDown + If e.KeyCode = Keys.A Then + If e.Modifiers = Keys.Control Then + 'Select all text + Me.txtDisplayText.SelectAll() + e.SuppressKeyPress = True + End If + End If + End Sub + + Private Sub txtWarningMessage_KeyDown(sender As Object, e As KeyEventArgs) Handles txtWarningMessage.KeyDown + If e.KeyCode = Keys.A Then + If e.Modifiers = Keys.Control Then + 'Select all text + Me.txtWarningMessage.SelectAll() + e.SuppressKeyPress = True + End If + End If + End Sub Private Sub txtWalletName_KeyDown(sender As Object, e As KeyEventArgs) Handles txtWalletName.KeyDown 'Change wallet name when text is changed and is pressed @@ -462,4 +491,5 @@ Me.Close() End If End Sub +#End Region End Class \ No newline at end of file diff --git a/Browser/GlobalRefs.vb b/Browser/GlobalRefs.vb index 783730d..88ffc46 100644 --- a/Browser/GlobalRefs.vb +++ b/Browser/GlobalRefs.vb @@ -18,7 +18,7 @@ Public Module GlobalRefs Public Const URL_FLDC_DefaultBlockchain As String = "https://xchain.io/asset/FLDC" Public Const URL_FLDC_AddressBlockchain As String = "https://xchain.io/address/" Public Const URL_BTC_Blockchain As String = "https://www.blockchain.com/" - Public Const URL_FLDC_Distro As String = "https://mergedfolding.net/official-distributions" + Public Const URL_FLDC_Distro As String = "https://mergedfolding.net/distributions" Public Const URL_FoldingCoinDiscordInvite As String = "https://discord.gg/CvZ7gAs" Public Const URL_FoldingCoinDiscordRegister As String = "https://discordapp.com/register?redirect_to=%2Finvite%2FCvZ7gAs" Public Const URL_FoldingCoinDiscord As String = "https://discordapp.com/channels/379168590626029568/379168590626029571" diff --git a/Browser/Main.vb b/Browser/Main.vb index 605e46d..8ac4b9d 100644 --- a/Browser/Main.vb +++ b/Browser/Main.vb @@ -3243,16 +3243,36 @@ Me.browser.GetBrowser.GoForward() End Sub - 'URL bar only: Open the URL if 'Enter' is pressed + 'URL bar only: Open the URL if 'Enter' is pressed. Select All with CTRL+A Private Sub txtURL_KeyDown(sender As Object, e As KeyEventArgs) Handles txtURL.KeyDown - If e.KeyCode = Keys.Enter Then + Select Case e.KeyCode + Case Keys.Enter #Disable Warning BC42358 ' Because this call is not awaited, execution of the current method continues before the call is completed - OpenURL(Me.txtURL.Text, True) + OpenURL(Me.txtURL.Text, True) #Enable Warning BC42358 - e.SuppressKeyPress = True - Else - 'See if there are other keystroke events that need to be handled - FormKeyDownEvents(e) + e.SuppressKeyPress = True + + Case Keys.A + If e.Modifiers = Keys.Control Then + 'Select all text + Me.txtURL.SelectAll() + e.SuppressKeyPress = True + End If + + Case Else + 'See if there are other keystroke events that need to be handled + FormKeyDownEvents(e) + End Select + End Sub + + 'Select All with CTRL+A + Private Sub txtMsg_KeyDown(sender As Object, e As KeyEventArgs) Handles txtMsg.KeyDown + If e.KeyCode = Keys.A Then + If e.Modifiers = Keys.Control Then + 'Select all text + Me.txtMsg.SelectAll() + e.SuppressKeyPress = True + End If End If End Sub diff --git a/FoldingBrowser - Status - ToDo List.txt b/FoldingBrowser - Status - ToDo List.txt index 06925c0..4a6e290 100644 --- a/FoldingBrowser - Status - ToDo List.txt +++ b/FoldingBrowser - Status - ToDo List.txt @@ -7,9 +7,14 @@ Immediate Need / Short-Term Goals: ----------------------------------- -Evaluate upgrading to CefSharp/Chrome v81 (VC++2015) when released here: https://github.com/cefsharp/CefSharp/releases --CureCoin installer: Update blockchain files and 'peers.dat' file in the installer to be current. --Support other wallets, for pressing the 'FLDC Wallet' button, with option for: https://freewallet.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) -On installation, see if FAH is running and show the web control if it is, instead of a blank page (mostly for upgrade installs) +-Update video on website. It's pretty stale now +-Can't wipe-out saved data to be blank (can do it from the raw data view) +-Make saved data changes prompt you to: 'Save changes?' when changing wallet numbers, or auto-save? +-Start with Wallet #1 instead of #0, as the default wallet used for initial setup? +-Make a simple setup: Do you want FLDC? Do you want Cure? Pick username (hide stuff that doesn't apply) (Add CureCoin folding pool rules: more than 3? chars, no special chars). Have a checkbox for advanced (normally, hide the advanced setup) +-Add CTRL+A to: Options Raw data view, to select all +-Test and update any URL buttons to be current ---------------------------------------------------- Other Ideas, Improvements, Tasks, Longer-Term Goals: @@ -63,14 +68,19 @@ Other Ideas, Improvements, Tasks, Longer-Term Goals: -Support SegWit addresses for FLDC (start with 'bc1' and are about 9 characters longer). Probably should get both addresses (Legacy and SegWit) from CounterWallet, and offer a pull-down list selection. Might need to get the 50 character CureCoin folding pool username limit raised. -Installer: Change to a language selection page, instead of the pre-installer dialog box? -Have a button to try and get a new CounterParty Bitcoin Address, if it's blank (with a timeout & retry for the mirror Counterwallet site). Or, message to run button #2 to get an address? +-Support other wallets, for pressing the 'FLDC Wallet' button, with option for: https://freewallet.io/ Possibly include FreeWallet installer. 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) +-Informational: List keystrokes implemented on Settings/options page ====================================================================================================== Change Log - Release Notes - Tasks completed: ====================================================================================================== -v22 Release (2020-0?-??) - +v22 Release (2020-04-10) +[DONE] -Update instructions for changing the PW on the main PW storage +[DONE] -Add CTRL+A to: URL bar and Debug info, to select all +[DONE] -Add CTRL+A to: Saved Data Raw data view and warning info, to select all +[DONE] -CureCoin installer: Update 'peers.dat' file in the installer to be current [DONE] -Evaluate upgrading to CefSharp/Chrome v79 (VC++2015) when released [DONE] -Increased the speed of the fly-down menu [DONE] -Wait up to 90 seconds (instead of 60 seconds) for CounterWallet to load diff --git a/Install/CureCoin Wallet Installer with blockchain - NSIS Installer Script.nsi b/Install/CureCoin Wallet Installer with blockchain - NSIS Installer Script.nsi index 6c5839b..addff37 100644 --- a/Install/CureCoin Wallet Installer with blockchain - NSIS Installer Script.nsi +++ b/Install/CureCoin Wallet Installer with blockchain - NSIS Installer Script.nsi @@ -5,7 +5,7 @@ ;---- Helper defines / constants ---- !define PRODUCT_VERSION "2.0.0.2" ;Match the displayed version in the program title. Example: 1.2.3 !define PRODUCT_4_VALUE_VERSION "2.0.0.2" ;Match the executable version: Right-click the program executable file | Properties | Version. Example: 1.2.3.4 -!define PRODUCT_UPDATED "2019-10-06" +!define PRODUCT_UPDATED "2020-04-10" !define PRODUCT_YEAR "2020" !define PRODUCT_NAME "CureCoin" !define PRODUCT_EXE_NAME "curecoin-qt" ;Executable name without extension diff --git a/Install/CureCoin Wallet Installer without blockchain - NSIS Installer Script.nsi b/Install/CureCoin Wallet Installer without blockchain - NSIS Installer Script.nsi index e5b91ba..0881041 100644 --- a/Install/CureCoin Wallet Installer without blockchain - NSIS Installer Script.nsi +++ b/Install/CureCoin Wallet Installer without blockchain - NSIS Installer Script.nsi @@ -5,7 +5,7 @@ ;---- Helper defines / constants ---- !define PRODUCT_VERSION "2.0.0.2" ;Match the displayed version in the program title. Example: 1.2.3 !define PRODUCT_4_VALUE_VERSION "2.0.0.2" ;Match the executable version: Right-click the program executable file | Properties | Version. Example: 1.2.3.4 -!define PRODUCT_UPDATED "2019-10-06" +!define PRODUCT_UPDATED "2020-04-10" !define PRODUCT_YEAR "2020" !define PRODUCT_NAME "CureCoin" !define PRODUCT_EXE_NAME "curecoin-qt" ;Executable name without extension diff --git a/README.md b/README.md index 2d056a1..c3792ea 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ - **FoldingBrowser [Screenshot #1](Screenshot.jpg), [Screenshot #2](Screenshot-LinksMenu.jpg), and [Setup Video](https://www.youtube.com/playlist?list=PLMWSISjQe0XFz9bFy5KXLq4hrgFH-94eI).** - **Please ask questions on the Discord Contact links below** - FoldingBrowser is written in VB.NET, compiled with VS2015, targeting the .NET Framework v4.5.2 -- Currently based on [cefsharp/75](https://github.com/cefsharp/CefSharp/tree/cefsharp/75) Chrome / Chromium Embedded Framework (CEF) +- Currently based on [cefsharp/79](https://github.com/cefsharp/CefSharp/tree/cefsharp/79) Chrome / Chromium Embedded Framework (CEF) - 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)