Browse Source

comments and readme update

miguelfreitas
Wladimir J. van der Laan 13 years ago
parent
commit
6c85cbecf1
  1. 4
      README.rst
  2. 1
      src/qt/bitcoinamountfield.cpp
  3. 2
      src/qt/bitcoingui.cpp
  4. 23
      src/qt/walletmodel.h

4
README.rst

@ -12,7 +12,7 @@ This has been implemented:
- Compatibility with Linux (both GNOME and KDE), MacOSX and Windows - Compatibility with Linux (both GNOME and KDE), MacOSX and Windows
- All functionality of the original client, including taskbar icon/menu - All functionality of the original client, including taskbar icon/menu and wallet encryption
- Splash screen - Splash screen
@ -44,7 +44,7 @@ This has to be done:
- Start at system start - Start at system start
- Support more languages - Support more languages (please send translations)
Build instructions Build instructions
=================== ===================

1
src/qt/bitcoinamountfield.cpp

@ -161,6 +161,7 @@ void BitcoinAmountField::unitChanged(int idx)
if(valid) if(valid)
{ {
// If value was valid, re-place it in the widget with the new unit
setValue(currentValue); setValue(currentValue);
} }
else else

2
src/qt/bitcoingui.cpp

@ -602,7 +602,7 @@ void BitcoinGUI::changePassphrase()
void BitcoinGUI::unlockWallet() void BitcoinGUI::unlockWallet()
{ {
// Unlock wallet if needed // Unlock wallet when requested by wallet model
if(walletModel->getEncryptionStatus() == WalletModel::Locked) if(walletModel->getEncryptionStatus() == WalletModel::Locked)
{ {
AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this); AskPassphraseDialog dlg(AskPassphraseDialog::Unlock, this);

23
src/qt/walletmodel.h

@ -23,7 +23,7 @@ class WalletModel : public QObject
public: public:
explicit WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent = 0); explicit WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent = 0);
enum StatusCode enum StatusCode // Returned by sendCoins
{ {
OK, OK,
InvalidAmount, InvalidAmount,
@ -31,7 +31,7 @@ public:
AmountExceedsBalance, AmountExceedsBalance,
AmountWithFeeExceedsBalance, AmountWithFeeExceedsBalance,
DuplicateAddress, DuplicateAddress,
TransactionCreationFailed, TransactionCreationFailed, // Error returned when wallet is still locked
TransactionCommitFailed, TransactionCommitFailed,
Aborted, Aborted,
MiscError MiscError
@ -86,12 +86,9 @@ public:
bool isValid() const { return valid; } bool isValid() const { return valid; }
UnlockContext(const UnlockContext& obj) // Copy operator and constructor transfer the context
{ CopyFrom(obj); } UnlockContext(const UnlockContext& obj) { CopyFrom(obj); }
private: UnlockContext& operator=(const UnlockContext& rhs) { CopyFrom(rhs); return *this; }
UnlockContext& operator=(const UnlockContext& rhs)
{ CopyFrom(rhs); return *this; }
private: private:
WalletModel *wallet; WalletModel *wallet;
bool valid; bool valid;
@ -112,15 +109,25 @@ private:
AddressTableModel *addressTableModel; AddressTableModel *addressTableModel;
TransactionTableModel *transactionTableModel; TransactionTableModel *transactionTableModel;
// Cache some values to be able to detect changes
qint64 cachedBalance; qint64 cachedBalance;
qint64 cachedUnconfirmedBalance; qint64 cachedUnconfirmedBalance;
qint64 cachedNumTransactions; qint64 cachedNumTransactions;
EncryptionStatus cachedEncryptionStatus; EncryptionStatus cachedEncryptionStatus;
signals: signals:
// Signal that balance in wallet changed
void balanceChanged(qint64 balance, qint64 unconfirmedBalance); void balanceChanged(qint64 balance, qint64 unconfirmedBalance);
// Number of transactions in wallet changed
void numTransactionsChanged(int count); void numTransactionsChanged(int count);
// Encryption status of wallet changed
void encryptionStatusChanged(int status); void encryptionStatusChanged(int status);
// Signal emitted when wallet needs to be unlocked
// It is valid behaviour for listeners to keep the wallet locked after this signal;
// this means that the unlocking failed or was cancelled.
void requireUnlock(); void requireUnlock();
// Asynchronous error notification // Asynchronous error notification

Loading…
Cancel
Save