From 0436a332ca47b2ab5504ce87986235e711b6b261 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Fri, 1 May 2015 15:07:56 +0200
Subject: [PATCH] Fixing transactions refresh
---
src/cutecoin/gui/community_tab.py | 2 +-
src/cutecoin/gui/currency_tab.py | 2 +-
src/cutecoin/gui/mainwindow.py | 2 +-
src/cutecoin/gui/transactions_tab.py | 4 ++--
src/cutecoin/gui/wallets_tab.py | 2 +-
src/cutecoin/models/identities.py | 5 ++++-
6 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/cutecoin/gui/community_tab.py b/src/cutecoin/gui/community_tab.py
index 33f526fc..7aa26253 100644
--- a/src/cutecoin/gui/community_tab.py
+++ b/src/cutecoin/gui/community_tab.py
@@ -140,7 +140,7 @@ class CommunityTabWidget(QWidget, Ui_CommunityTabWidget):
dialog.radio_pubkey.setChecked(True)
if dialog.exec_() == QDialog.Accepted:
currency_tab = self.window().currencies_tabwidget.currentWidget()
- currency_tab.tab_history.table_history.model().invalidate()
+ currency_tab.tab_history.table_history.model().sourceModel().refresh_transfers()
def certify_identity(self, person):
dialog = CertificationDialog(self.account, self.password_asker)
diff --git a/src/cutecoin/gui/currency_tab.py b/src/cutecoin/gui/currency_tab.py
index fbcbe4c6..e2476046 100644
--- a/src/cutecoin/gui/currency_tab.py
+++ b/src/cutecoin/gui/currency_tab.py
@@ -159,7 +159,7 @@ class CurrencyTabWidget(QWidget, Ui_CurrencyTabWidget):
self.tab_wallets.refresh()
if self.tab_history.table_history.model():
- self.tab_history.table_history.model().refresh_transfers()
+ self.tab_history.table_history.model().sourceModel().refresh_transfers()
@pyqtSlot()
def refresh_status(self):
diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py
index 2546d17e..1aabed47 100644
--- a/src/cutecoin/gui/mainwindow.py
+++ b/src/cutecoin/gui/mainwindow.py
@@ -189,7 +189,7 @@ class MainWindow(QMainWindow, Ui_MainWindow):
dialog.accepted.connect(self.refresh_wallets)
if dialog.exec_() == QDialog.Accepted:
currency_tab = self.currencies_tabwidget.currentWidget()
- currency_tab.tab_history.table_history.model().invalidate()
+ currency_tab.tab_history.table_history.model().sourceModel().refresh_transfers()
def open_certification_dialog(self):
dialog = CertificationDialog(self.app.current_account,
diff --git a/src/cutecoin/gui/transactions_tab.py b/src/cutecoin/gui/transactions_tab.py
index 65888a80..14eae683 100644
--- a/src/cutecoin/gui/transactions_tab.py
+++ b/src/cutecoin/gui/transactions_tab.py
@@ -180,7 +180,7 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
result = dialog.exec_()
if result == QDialog.Accepted:
transfer.drop()
- self.table_history.model().invalidate()
+ self.table_history.model().sourceModel().refresh_transfers()
def cancel_transfer(self):
reply = QMessageBox.warning(self, self.tr("Warning"),
@@ -190,7 +190,7 @@ QMessageBox.Ok | QMessageBox.Cancel)
if reply == QMessageBox.Ok:
transfer = self.sender().data()
transfer.drop()
- self.table_history.model().invalidate()
+ self.table_history.model().sourceModel().refresh_transfers()
def dates_changed(self):
logging.debug("Changed dates")
diff --git a/src/cutecoin/gui/wallets_tab.py b/src/cutecoin/gui/wallets_tab.py
index 12b6e41f..817a37cf 100644
--- a/src/cutecoin/gui/wallets_tab.py
+++ b/src/cutecoin/gui/wallets_tab.py
@@ -203,4 +203,4 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab):
dialog.radio_pubkey.setChecked(True)
if dialog.exec_() == QDialog.Accepted:
currency_tab = self.window().currencies_tabwidget.currentWidget()
- currency_tab.tab_history.table_history.model().invalidate()
+ currency_tab.tab_history.table_history.model().sourceModel().refresh_transfers()
diff --git a/src/cutecoin/models/identities.py b/src/cutecoin/models/identities.py
index 4bb0cde4..89c3c1c4 100644
--- a/src/cutecoin/models/identities.py
+++ b/src/cutecoin/models/identities.py
@@ -80,7 +80,10 @@ class IdentitiesTableModel(QAbstractTableModel):
@property
def pubkeys(self):
- return [i.pubkey for i in self.identities_data]
+ '''
+ Get pubkeys of displayed identities
+ '''
+ return [i[1] for i in self.identities_data]
def identity_data(self, person):
join_block = person.membership(self.community)['blockNumber']
--
GitLab