mirror of
https://github.com/monero-project/monero-gui.git
synced 2026-04-08 00:37:26 -04:00
Network: instantiable QML type, introduce proxyAddress property
# Conflicts: # main.qml
This commit is contained in:
7
main.qml
7
main.qml
@@ -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
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user