From 5d3ccdefb67128db50a22a96e261f3f5741ba99c Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Thu, 27 Feb 2014 22:39:43 +0100
Subject: [PATCH] Small fix due to a misunderstood of the ucoinpy Transfer
class.
---
Makefile | 2 +-
src/cutecoin/gui/transferMoneyDialog.py | 2 +-
src/cutecoin/models/account/__init__.py | 4 +---
src/cutecoin/models/coin/listModel.py | 5 ++---
4 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
index 65555602..9988c5fc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ RESOURCE_DIR = res/ui
COMPILED_DIR = src/cutecoin/gen_resources
#UI files to compile
-UI_FILES = mainwindow.ui addAccountDialog.ui addCommunityDialog.ui communityTabWidget.ui issuanceDialog.ui transferDialog.ui
+UI_FILES = mainwindow.ui addAccountDialog.ui addCommunityDialog.ui communityTabWidget.ui issuanceDialog.ui transferDialog.ui addContactDialog.ui
#Qt resource files to compile
RESOURCES =
diff --git a/src/cutecoin/gui/transferMoneyDialog.py b/src/cutecoin/gui/transferMoneyDialog.py
index 442941e1..4e667694 100644
--- a/src/cutecoin/gui/transferMoneyDialog.py
+++ b/src/cutecoin/gui/transferMoneyDialog.py
@@ -62,7 +62,7 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog):
pass
def accept(self):
- sentCoins = self.listView_coinsSent.model().toString()
+ sentCoins = self.listView_coinsSent.model().toList()
recipient = None
if self.radio_keyFingerprint.isChecked():
diff --git a/src/cutecoin/models/account/__init__.py b/src/cutecoin/models/account/__init__.py
index e01f9bb8..e780da64 100644
--- a/src/cutecoin/models/account/__init__.py
+++ b/src/cutecoin/models/account/__init__.py
@@ -95,14 +95,12 @@ class Account(object):
def issuedLastDividend(self, community):
currentAmendmentNumber = community.amendmentNumber()
-
if community in self.communities.communitiesList:
dividendsData = community.ucoinRequest(ucoin.hdc.transactions.sender.issuance.Dividend(self.keyFingerprint(), currentAmendmentNumber))
for dividend in dividendsData:
# Small bug in ucoinpy library
if not isinstance(dividend, str):
return True
-
return False
def issueDividend(self, community, coins):
@@ -112,7 +110,7 @@ class Account(object):
return issuance()
def transferCoins(self, node, recipient, coins, message):
- transfer = ucoin.wrappers.transactions.Transfer(self.keyFingerprint(), recipient.fingerprint, coins, message, keyid=self.pgpKeyId, server=node.server, port=node.port)
+ transfer = ucoin.wrappers.transactions.RawTransfer(self.keyFingerprint(), recipient.fingerprint, coins, message, keyid=self.pgpKeyId, server=node.server, port=node.port)
return transfer()
def jsonify(self):
diff --git a/src/cutecoin/models/coin/listModel.py b/src/cutecoin/models/coin/listModel.py
index 3b7d9735..f167e467 100644
--- a/src/cutecoin/models/coin/listModel.py
+++ b/src/cutecoin/models/coin/listModel.py
@@ -29,9 +29,8 @@ class CoinsListModel(QAbstractListModel):
def flags(self,index):
return Qt.ItemIsSelectable | Qt.ItemIsEnabled
- def toString(self):
+ def toList(self):
coinsList = []
for c in self.coins:
coinsList.append(c.getId())
- coinsStr = ",".join(coinsList)
- return coinsStr
\ No newline at end of file
+ return coinsList
\ No newline at end of file
--
GitLab