diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py index 5d27613c8be69637c1bce4ccc6bfcf55ef7d22fb..314428cd5fa88a406e86d9e53a834a0905c93d30 100644 --- a/src/cutecoin/core/account.py +++ b/src/cutecoin/core/account.py @@ -106,6 +106,7 @@ class Account(object): def set_display_referential(self, index): self.referential = index + @property def units_to_ref(self): def units(units, community): return units @@ -131,6 +132,10 @@ class Account(object): referentials = [units, relative, units_to_zero, relative_to_zero] return referentials[self.referential] + def ref_name(self, currency): + referentials = ['{0}', 'UD {0}', '{0} -> 0', 'UD {0} -> 0'] + return referentials[self.referential].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/gui/currency_tab.py b/src/cutecoin/gui/currency_tab.py index 0a1e15165878f12c61b305e9719c4fa642f121e4..99b304c6d057e88358d585a336880ddfc6578e97 100644 --- a/src/cutecoin/gui/currency_tab.py +++ b/src/cutecoin/gui/currency_tab.py @@ -228,3 +228,9 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget): QModelIndex(), QModelIndex(), []) + + if self.list_wallets.model(): + self.list_wallets.model().dataChanged.emit( + QModelIndex(), + QModelIndex(), + []) diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py index c667e433f4d55ea80647f58e930b10890e18bdc7..1e2bba817bd0cdcf22e7de07ce988e7d4de28d7f 100644 --- a/src/cutecoin/gui/mainwindow.py +++ b/src/cutecoin/gui/mainwindow.py @@ -123,7 +123,7 @@ class MainWindow(QMainWindow, Ui_MainWindow): dialog.accepted.connect(self.refresh_wallets) dialog.exec_() currency_tab = self.currencies_tabwidget.currentWidget() - currency_tab.list_transactions_sent.model().dataChanged.emit( + currency_tab.table_history.model().dataChanged.emit( QModelIndex(), QModelIndex(), ()) diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py index e040966f58a0e4a182310944717430d4f2047aa9..41a382872ba5697df6cd9fad9db74a28c2ed9fbd 100644 --- a/src/cutecoin/models/txhistory.py +++ b/src/cutecoin/models/txhistory.py @@ -89,7 +89,7 @@ class HistoryTableModel(QAbstractTableModel): date_ts = self.community.get_block(tx[0]).mediantime date = QDateTime.fromTime_t(date_ts) - amount_ref = self.account.units_to_ref()(amount, self.community) + amount_ref = self.account.units_to_ref(amount, self.community) return (date.date(), sender, "", "{0}".format(amount_ref), comment) @@ -111,7 +111,7 @@ class HistoryTableModel(QAbstractTableModel): date_ts = self.community.get_block(tx[0]).mediantime date = QDateTime.fromTime_t(date_ts) - amount_ref = self.account.units_to_ref()(-amount, self.community) + amount_ref = self.account.units_to_ref(-amount, self.community) return (date.date(), receiver, "{0}".format(amount_ref), "", comment) diff --git a/src/cutecoin/models/wallet.py b/src/cutecoin/models/wallet.py index df17811b29b808d607d4d18a5aa7ef24d0570c11..8c67ae6ad6372162d8baecfcc1170fe45ccad792 100644 --- a/src/cutecoin/models/wallet.py +++ b/src/cutecoin/models/wallet.py @@ -26,8 +26,8 @@ class WalletListModel(QAbstractListModel): def data(self, index, role): if role == Qt.DisplayRole: row = index.row() - value = "{0}".format(self.sources[row].amount) - return value + amount = self.sources[row].amount + return amount def flags(self, index): return Qt.ItemIsSelectable | Qt.ItemIsEnabled diff --git a/src/cutecoin/models/wallets.py b/src/cutecoin/models/wallets.py index 745d62f92bab0037e945a2241ac1b49ac8c96d99..10b462f06054691fdf120cbcad81f3c60fd26157 100644 --- a/src/cutecoin/models/wallets.py +++ b/src/cutecoin/models/wallets.py @@ -19,6 +19,7 @@ class WalletsListModel(QAbstractListModel): Constructor ''' super(WalletsListModel, self).__init__(parent) + self.account = account self.wallets = account.wallets self.community = community @@ -29,7 +30,11 @@ class WalletsListModel(QAbstractListModel): row = index.row() w = self.wallets[row] if role == Qt.DisplayRole: - return w.get_text(self.community) + amount = w.value(self.community) + ref_amount = self.account.units_to_ref(amount, self.community) + ref_name = self.account.ref_name(self.community.currency) + return """{0} +{1} {2}""".format(w.name, ref_amount, ref_name) elif role == Qt.EditRole: return self.wallets[row].name