monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2231

Browse source 
9d6038e main: make variable used once local to function (selsta)
df50c51 main: remove unused variables (selsta)
This commit is contained in:
luigi1111 2019-06-21 14:46:02 -05:00
commit c7956f76ea
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
main.qml
View file

@ -51,9 +51,7 @@ ApplicationWindow {
property var currentItem property var currentItem
property bool hideBalanceForced: false property bool hideBalanceForced: false
property bool whatIsEnable: false
property bool ctrlPressed: false property bool ctrlPressed: false
property bool osx: false
property alias persistentSettings : persistentSettings property alias persistentSettings : persistentSettings
property var currentWallet; property var currentWallet;
property var transaction; property var transaction;
@ -69,7 +67,6 @@ ApplicationWindow {
property string walletName property string walletName
property bool viewOnly: false property bool viewOnly: false
property bool foundNewBlock: false property bool foundNewBlock: false
property int timeToUnlock: 0
property bool qrScannerEnabled: (typeof builtWithScanner != "undefined") && builtWithScanner property bool qrScannerEnabled: (typeof builtWithScanner != "undefined") && builtWithScanner
property int blocksToSync: 1 property int blocksToSync: 1
property var isMobile: (appWindow.width > 700 && !isAndroid) ? false : true property var isMobile: (appWindow.width > 700 && !isAndroid) ? false : true
@ -81,7 +78,6 @@ ApplicationWindow {
// Default daemon addresses // Default daemon addresses
readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype) readonly property string localDaemonAddress : "localhost:" + getDefaultDaemonRpcPort(persistentSettings.nettype)
property string currentDaemonAddress; property string currentDaemonAddress;
property bool startLocalNodeCancelled: false
property int disconnectedEpoch: 0 property int disconnectedEpoch: 0
property int estimatedBlockchainSize: 75 // GB property int estimatedBlockchainSize: 75 // GB
property alias viewState: rootItem.state property alias viewState: rootItem.state
@ -592,7 +588,7 @@ ApplicationWindow {
foundNewBlock = false; foundNewBlock = false;
console.log("New block found - updating history") console.log("New block found - updating history")
currentWallet.history.refresh(currentWallet.currentSubaddressAccount) currentWallet.history.refresh(currentWallet.currentSubaddressAccount)
timeToUnlock = currentWallet.history.minutesToUnlock var timeToUnlock = currentWallet.history.minutesToUnlock
leftPanel.minutesToUnlockTxt = (timeToUnlock > 0)? (timeToUnlock == 20)? qsTr("Unlocked balance (waiting for block)") : qsTr("Unlocked balance (~%1 min)").arg(timeToUnlock) : qsTr("Unlocked balance"); leftPanel.minutesToUnlockTxt = (timeToUnlock > 0)? (timeToUnlock == 20)? qsTr("Unlocked balance (waiting for block)") : qsTr("Unlocked balance (~%1 min)").arg(timeToUnlock) : qsTr("Unlocked balance");
if(middlePanel.state == "History") if(middlePanel.state == "History")
@ -1577,7 +1573,6 @@ ApplicationWindow {
onRejected: { onRejected: {
middlePanel.settingsView.settingsStateViewState = "Node"; middlePanel.settingsView.settingsStateViewState = "Node";
loadPage("Settings"); loadPage("Settings");
startLocalNodeCancelled = true
} }
} }