From d32218ce197eba502b009aa94ae5f900d95f08f1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 11 Feb 2017 03:13:46 -0600 Subject: [PATCH] Layout changes - display receive address --- SiaDrive.Api/SiaApi.h | 3 +- SiaDrive.Api/SiaWallet.cpp | 16 ++++ SiaDrive/SiaDrive.htm | 163 +++++++++++++++++++------------------ SiaDrive/SiaDrive.rc | Bin 11344 -> 11344 bytes SiaDrive/SiaDriveDlg.cpp | 32 +++++--- SiaDrive/SiaDriveDlg.h | 3 +- 6 files changed, 125 insertions(+), 92 deletions(-) diff --git a/SiaDrive.Api/SiaApi.h b/SiaDrive.Api/SiaApi.h index 694798d..98b6b9e 100644 --- a/SiaDrive.Api/SiaApi.h +++ b/SiaDrive.Api/SiaApi.h @@ -49,7 +49,8 @@ public: _SiaApiError Lock(); _SiaApiError Unlock(const String& password); _SiaApiError GetConfirmedBalance(SiaCurrency& balance) const; - _SiaApiError GetUnonfirmedBalance(SiaCurrency& balance) const; + _SiaApiError GetUnonfirmedBalance(SiaCurrency& balance) const; + _SiaApiError GetAddress(String& address) const; }; class AFX_EXT_CLASS _CSiaRenter diff --git a/SiaDrive.Api/SiaWallet.cpp b/SiaDrive.Api/SiaWallet.cpp index ca49c56..21d1136 100644 --- a/SiaDrive.Api/SiaWallet.cpp +++ b/SiaDrive.Api/SiaWallet.cpp @@ -157,5 +157,21 @@ SiaApiError CSiaApi::_CSiaWallet::GetUnonfirmedBalance(SiaCurrency& balance) con ret = SiaApiError::Success; } + return ret; +} + +SiaApiError CSiaApi::_CSiaWallet::GetAddress(String& address) const +{ + SiaApiError ret = SiaApiError::RequestError; + address = L""; + + json result; + SiaCurlError cerror = _siaCurl.Get(L"/wallet/address", result); + if (API_SUCCESS(SiaCurlError, cerror)) + { + address = CA2W(result["address"].get().c_str()); + ret = SiaApiError::Success; + } + return ret; } \ No newline at end of file diff --git a/SiaDrive/SiaDrive.htm b/SiaDrive/SiaDrive.htm index b49b81a..e8c269a 100644 --- a/SiaDrive/SiaDrive.htm +++ b/SiaDrive/SiaDrive.htm @@ -1,91 +1,96 @@ - -
- - - - - - - - - -
Client Version:
Server Version:
-
-
- - - - - - - - - - - - - -
Available:
Pending:
Total:
-
-
- -
-
- - - - -
-   -
-
+ +

Sia Information

+
+ + + + + + + + + +
Client Version:
Server Version:
+
+
+ + + + + + + + + + + + + +
Available:
Pending:
Total:
+
- +
- +
- +
+ + + + +
+   +
+
- + - + - + - - - + + + + + + + + + diff --git a/SiaDrive/SiaDrive.rc b/SiaDrive/SiaDrive.rc index 09de1cef7ae42fe3adc8432888e4eadda922474d..dcafb2b3e363dd559c9e479f52fa0bc67070739f 100644 GIT binary patch delta 31 lcmcZ*aUo)ZjR>;|gVAPt5ocajAcMhRa-y{8<~fR6xB!}32>k#6 delta 31 lcmcZ*aUo)ZjR>5ocajAcMhRa-y{8<~fR6xB#0R2?+oI diff --git a/SiaDrive/SiaDriveDlg.cpp b/SiaDrive/SiaDriveDlg.cpp index c447814..eedf35b 100644 --- a/SiaDrive/SiaDriveDlg.cpp +++ b/SiaDrive/SiaDriveDlg.cpp @@ -79,6 +79,7 @@ void CSiaDriveDlg::DoDataExchange(CDataExchange* pDX) DDX_DHtml_ElementInnerText(pDX, _T("WalletBalanceTotal"), _walletBalanceTotal); DDX_DHtml_ElementInnerText(pDX, _T("WalletBalanceConfirmed"), _walletBalanceConfirmed); DDX_DHtml_ElementInnerText(pDX, _T("WalletBalanceUnconfirmed"), _walletBalanceUnconfirmed); + DDX_DHtml_ElementInnerText(pDX, _T("WalletAddress"), _walletAddress); DDX_DHtml_ElementInnerText(pDX, _T("WalletCreatedSeed"), _walletCreatedSeed); DDX_DHtml_ElementValue(pDX, _T("WalletUnlockPwd"), _unlockWalletPwd); } @@ -247,19 +248,13 @@ void CSiaDriveDlg::OnDocumentComplete(LPDISPATCH, LPCTSTR) _walletBalanceConfirmed = L""; _walletBalanceUnconfirmed = L""; _walletBalanceTotal = L""; + _walletAddress = L""; SetTimer(IDT_UPDATE, 2000, nullptr); if ((_connected = UpdateUi(false))) { - switch (_siaConfig.GetUI_Main_TabIndex()) - { - case WALLET_TAB: - { - DisplayWalletTab(); - } - break; - } + ConfigureWallet(); } else { @@ -293,11 +288,17 @@ bool CSiaDriveDlg::UpdateSiaInfo() if (API_SUCCESS(SiaApiError, _siaApi.GetWallet()->GetUnonfirmedBalance(unconfirmed))) { SiaCurrency total = confirmed + unconfirmed; - + _walletBalanceConfirmed = SiaCurrencyToString(confirmed).c_str(); _walletBalanceUnconfirmed = SiaCurrencyToString(unconfirmed).c_str(); _walletBalanceTotal = SiaCurrencyToString(total).c_str(); + if (!_walletAddress.GetLength()) + { + String address; + _siaApi.GetWallet()->GetAddress(address); + _walletAddress = address.c_str(); + } return true; } } @@ -305,7 +306,7 @@ bool CSiaDriveDlg::UpdateSiaInfo() } _serverVersion = L"x.x.x"; - _walletBalanceConfirmed = _walletBalanceUnconfirmed = _walletBalanceTotal = L""; + _walletAddress = _walletBalanceConfirmed = _walletBalanceUnconfirmed = _walletBalanceTotal = L""; return false; } @@ -377,7 +378,7 @@ void CSiaDriveDlg::DisplayCreateWallet() SetMainWindow(L"create_wallet"); } -void CSiaDriveDlg::DisplayWalletTab() +void CSiaDriveDlg::ConfigureWallet() { if (_siaApi.GetWallet()->GetCreated()) { @@ -388,7 +389,16 @@ void CSiaDriveDlg::DisplayWalletTab() } else { + SetMainWindow(L"tab_view"); + switch (_siaConfig.GetUI_Main_TabIndex()) + { + case WALLET_TAB: + { + //DisplayWalletTab(); + } + break; + } } } else diff --git a/SiaDrive/SiaDriveDlg.h b/SiaDrive/SiaDriveDlg.h index e967ac3..1356600 100644 --- a/SiaDrive/SiaDriveDlg.h +++ b/SiaDrive/SiaDriveDlg.h @@ -50,7 +50,7 @@ private: void DisplaySeedCreated(const String& seed); bool UpdateSiaInfo(); void DisplayUnlockWallet(); - void DisplayWalletTab(); + void ConfigureWallet(); void RemoveCreateWalletItems(); void RemoveDomNodeById(const String& id); void SetMainWindow(const String& name); @@ -67,6 +67,7 @@ private: CString _walletBalanceTotal; CString _walletBalanceUnconfirmed; CString _walletCreatedSeed; + CString _walletAddress; CString _unlockWalletPwd; bool _connected = false; bool _seedCreation = false;