From 1ab80fc30e4a37dc48801b1a68dcbd853280dea9 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Thu, 1 Jan 2015 23:35:11 +0100
Subject: [PATCH] Fixing a bug in transaction history
---
src/cutecoin/core/app.py | 2 +-
src/cutecoin/core/wallet.py | 3 ++-
src/cutecoin/gui/mainwindow.py | 6 +++++-
src/cutecoin/models/sent.py | 1 +
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/cutecoin/core/app.py b/src/cutecoin/core/app.py
index ddde6c72..a166025b 100644
--- a/src/cutecoin/core/app.py
+++ b/src/cutecoin/core/app.py
@@ -31,7 +31,7 @@ class Application(object):
config.parse_arguments(argv)
self.load()
if self.default_account != "":
- self.current_account = self.get_account(self.default_account)
+ self.change_current_account(self.get_account(self.default_account))
def get_account(self, name):
if not self.accounts[name]:
diff --git a/src/cutecoin/core/wallet.py b/src/cutecoin/core/wallet.py
index 0d395ec5..21d10fb9 100644
--- a/src/cutecoin/core/wallet.py
+++ b/src/cutecoin/core/wallet.py
@@ -74,10 +74,11 @@ class Cache():
current_block = community.request(bma.blockchain.Current)
with_tx = community.request(bma.blockchain.TX)
# We parse only blocks with transactions
- parsed_blocks = reversed(range(self.latest_block,
+ parsed_blocks = reversed(range(self.latest_block + 1,
current_block['number'] + 1))
parsed_blocks = [n for n in parsed_blocks
if n in with_tx['result']['blocks']]
+
for block_number in parsed_blocks:
block = community.request(bma.blockchain.Block,
req_args={'number': block_number})
diff --git a/src/cutecoin/gui/mainwindow.py b/src/cutecoin/gui/mainwindow.py
index b88cefec..f1f97a25 100644
--- a/src/cutecoin/gui/mainwindow.py
+++ b/src/cutecoin/gui/mainwindow.py
@@ -17,6 +17,7 @@ from .password_asker import PasswordAskerDialog
import logging
+
class MainWindow(QMainWindow, Ui_MainWindow):
'''
@@ -96,18 +97,21 @@ class MainWindow(QMainWindow, Ui_MainWindow):
if self.app.current_account is None:
self.menu_contacts.setEnabled(False)
self.menu_actions.setEnabled(False)
+ self.action_configure_parameters.setEnabled(False)
self.action_set_as_default.setEnabled(False)
else:
self.action_set_as_default.setEnabled(self.app.current_account.name != self.app.default_account)
self.password_asker = PasswordAskerDialog(self.app.current_account)
self.menu_contacts.setEnabled(True)
+ self.action_configure_parameters.setEnabled(True)
self.menu_actions.setEnabled(True)
self.setWindowTitle("CuteCoin - Account : {0}".format(
self.app.current_account.name))
self.currencies_tabwidget.clear()
for community in self.app.current_account.communities:
- tab_currency = CurrencyTabWidget(self.app, community, self.password_asker)
+ tab_currency = CurrencyTabWidget(self.app, community,
+ self.password_asker)
tab_currency.refresh()
self.currencies_tabwidget.addTab(tab_currency,
QIcon(":/icons/currency_icon"),
diff --git a/src/cutecoin/models/sent.py b/src/cutecoin/models/sent.py
index ca1264d1..aa59d3a5 100644
--- a/src/cutecoin/models/sent.py
+++ b/src/cutecoin/models/sent.py
@@ -47,6 +47,7 @@ class SentListModel(QAbstractListModel):
receiver = Person.lookup(outputs[0].pubkey, self.community)
value = "{0} to {1}".format(amount, receiver.name)
return value
+
if role == Qt.FontRole:
if row < len(self.account.transactions_sent(self.community)):
return QFont('Sans Serif', italic=False)
--
GitLab