diff --git a/src/cutecoin/gui/currency_tab.py b/src/cutecoin/gui/currency_tab.py index a3491e86d0c90c3819e3eedb0f9024c6c5a01143..16984dc894a0d1b840f786ead1d386e56a8fece8 100644 --- a/src/cutecoin/gui/currency_tab.py +++ b/src/cutecoin/gui/currency_tab.py @@ -180,7 +180,7 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget): sig_validity = self.community.get_parameters()['sigValidity'] warning_expiration_time = int(sig_validity / 3) will_expire_soon = (current_time > expiration_date - warning_expiration_time) - text = "Connected : Block {0}".format(block_number['number']) + text = "Connected : Block {0}".format(block_number) self.status_label.setText(text) if will_expire_soon: diff --git a/src/cutecoin/models/txhistory.py b/src/cutecoin/models/txhistory.py index 93253641cfea84892e786320350c977e9a0cd04a..62e52b8e90a2aeaaab255cac4e04291c2a5b1f76 100644 --- a/src/cutecoin/models/txhistory.py +++ b/src/cutecoin/models/txhistory.py @@ -138,8 +138,8 @@ class HistoryTableModel(QAbstractTableModel): self.column_headers = ( 'Date', 'UID/Public key', - 'Payment\n({:})'.format(self.account.diff_ref_name(self.community.short_currency)), - 'Deposit\n({:})'.format(self.account.diff_ref_name(self.community.short_currency)), + 'Payment', + 'Deposit', 'Comment', 'State' ) @@ -156,6 +156,12 @@ class HistoryTableModel(QAbstractTableModel): def headerData(self, section, orientation, role): if role == Qt.DisplayRole: + if self.column_types[section] == 'payment' or self.column_types[section] == 'deposit': + return '{:}\n({:})'.format( + self.column_headers[section], + self.account.diff_ref_name(self.community.short_currency) + ) + return self.column_headers[section] def data_received(self, transfer): @@ -210,3 +216,4 @@ class HistoryTableModel(QAbstractTableModel): def flags(self, index): return Qt.ItemIsSelectable | Qt.ItemIsEnabled +