From 85654bf504fc9ac4ee444e96bf49c4ae5cb3a4f5 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Wed, 11 Feb 2015 20:10:20 +0100
Subject: [PATCH] Fixed issue #60
---
src/cutecoin/core/account.py | 17 +++++++++++++----
src/cutecoin/models/txhistory.py | 10 ++++++----
2 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py
index 55ec2698..dbe59c89 100644
--- a/src/cutecoin/core/account.py
+++ b/src/cutecoin/core/account.py
@@ -51,10 +51,12 @@ class Account(object):
Each account has only one key, and a key can
be locally referenced by only one account.
'''
- referentials = {'Units': (quantitative, '{0}'),
- 'UD': (relative, 'ud {0}'),
- 'Quant Z-sum': (quantitative_zerosum, 'q0 {0}'),
- 'Relat Z-sum': (relative_zerosum, 'r0 {0}')
+ referentials = {'Units': (quantitative, '{0}', quantitative, '{0}'),
+ 'UD': (relative, 'ud {0}', relative, 'ud {0}'),
+ 'Quant Z-sum': (quantitative_zerosum, 'q0 {0}',
+ quantitative, '{0}'),
+ 'Relat Z-sum': (relative_zerosum, 'r0 {0}',
+ relative, 'ud {0}')
}
def __init__(self, salt, pubkey, name, communities, wallets, contacts,
@@ -143,9 +145,16 @@ class Account(object):
def units_to_ref(self):
return Account.referentials[self.referential][0]
+ @property
+ def units_to_diff_ref(self):
+ return Account.referentials[self.referential][2]
+
def ref_name(self, currency):
return Account.referentials[self.referential][1].format(currency)
+ def diff_ref_name(self, currency):
+ return Account.referentials[self.referential][3].format(currency)
+
def set_walletpool_size(self, size, password):
logging.debug("Defining wallet pool size")
if len(self.wallets) < size:
diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py
index fdd5aa88..3faecb97 100644
--- a/src/cutecoin/models/txhistory.py
+++ b/src/cutecoin/models/txhistory.py
@@ -72,13 +72,15 @@ class TxFilterProxyModel(QSortFilterProxyModel):
return date.date()
if source_index.column() == self.sourceModel().columns.index('Payment'):
if source_data is not "":
- amount_ref = self.account.units_to_ref(source_data, self.community)
- ref_name = self.account.ref_name(self.community.short_currency)
+ amount_ref = self.account.units_to_diff_ref(source_data,
+ self.community)
+ ref_name = self.account.diff_ref_name(self.community.short_currency)
return "{0:.2f} {1}".format(amount_ref, ref_name)
if source_index.column() == self.sourceModel().columns.index('Deposit'):
if source_data is not "":
- amount_ref = self.account.units_to_ref(source_data, self.community)
- ref_name = self.account.ref_name(self.community.short_currency)
+ amount_ref = self.account.units_to_diff_ref(source_data,
+ self.community)
+ ref_name = self.account.diff_ref_name(self.community.short_currency)
return "{0:.2f} {1}".format(amount_ref, ref_name)
if role == Qt.FontRole:
--
GitLab