Network: instantiable QML type, introduce proxyAddress property

# Conflicts:
#	main.qml
This commit is contained in:
xiphon
2020-07-29 17:43:02 +00:00
parent 7eeda0a8f0
commit 43aeea8eb7
4 changed files with 44 additions and 13 deletions

View File

@@ -33,6 +33,7 @@ import QtQuick.Controls.Styles 1.1
import QtQuick.Dialogs 1.2
import QtGraphicalEffects 1.0
import moneroComponents.Network 1.0
import moneroComponents.Wallet 1.0
import moneroComponents.WalletManager 1.0
import moneroComponents.PendingTransaction 1.0
@@ -1255,7 +1256,7 @@ ApplicationWindow {
}
var url = provider[userCurrency];
Network.getJSON(url, fiatApiJsonReceived);
network.getJSON(url, fiatApiJsonReceived);
}
function fiatApiCurrencySymbol() {
@@ -2237,6 +2238,10 @@ ApplicationWindow {
dragMargin: 0
}
Network {
id: network
}
WalletManager {
id: walletManager
}