diff --git a/lib/ucoinpy/documents/peer.py b/lib/ucoinpy/documents/peer.py index 6733c538e43aa5861381ccb0e1096feb7c43857e..128da67ba160b656412dd679234701b391a87e22 100644 --- a/lib/ucoinpy/documents/peer.py +++ b/lib/ucoinpy/documents/peer.py @@ -142,11 +142,11 @@ class BMAEndpoint(Endpoint): self.port = port def inline(self): - return "BASIC_MERKLED_API {DNS} {IPv4} {IPv6} {PORT}" \ - .format(DNS=(self.server if self.server else ""), - IPv4=(self.ipv4 if self.ipv4 else ""), - IPv6=(self.ipv6 if self.ipv6 else ""), - PORT=(self.port if self.port else "")) + return "BASIC_MERKLED_API{DNS}{IPv4}{IPv6}{PORT}" \ + .format(DNS=(" {0}".format(self.server) if self.server else ""), + IPv4=(" {0}".format(self.ipv4) if self.ipv4 else ""), + IPv6=(" {0}".format(self.ipv6) if self.ipv6 else ""), + PORT=(" {0}".format(self.port) if self.port else "")) def conn_handler(self): if self.server: diff --git a/res/ui/addContactDialog.ui b/res/ui/addContactDialog.ui index 818f2da602276aa43786f659198cd2e20335371c..ac9d87ad5e523d59aecfb82ff390bdee317c8f65 100644 --- a/res/ui/addContactDialog.ui +++ b/res/ui/addContactDialog.ui @@ -92,7 +92,7 @@ <sender>edit_pubkey</sender> <signal>textChanged(QString)</signal> <receiver>AddContactDialog</receiver> - <slot>fingerprint_edited()</slot> + <slot>pubkey_edited()</slot> <hints> <hint type="sourcelabel"> <x>145</x> diff --git a/src/cutecoin/core/account.py b/src/cutecoin/core/account.py index b2627b5f49cef02802144a1889064915707c5fbf..60204357150815b4e1d6662e2552341431a30175 100644 --- a/src/cutecoin/core/account.py +++ b/src/cutecoin/core/account.py @@ -7,7 +7,6 @@ Created on 1 févr. 2014 from ucoinpy.api import bma from ucoinpy.api.bma import ConnectionHandler from ucoinpy.documents.peer import Peer -from ucoinpy.key import SigningKey import logging from .wallet import Wallet from .community import Community diff --git a/src/cutecoin/core/wallet.py b/src/cutecoin/core/wallet.py index 07e95c188e27424397ec40b46bf43389ede24d1d..129e07307035183e4d7ef6fd5c5ee355c200fe7a 100644 --- a/src/cutecoin/core/wallet.py +++ b/src/cutecoin/core/wallet.py @@ -11,14 +11,12 @@ from ucoinpy.documents.transaction import InputSource, OutputSource, Transaction from ucoinpy.key import SigningKey from ..tools.exceptions import NotEnoughMoneyError import logging -import base64 class Wallet(object): ''' - A wallet is list of coins. - It's only used to sort coins. + A wallet is used to manage money with a unique key. ''' def __init__(self, walletid, pubkey, currency, name): diff --git a/src/cutecoin/gui/addContactDialog.py b/src/cutecoin/gui/addContactDialog.py index f5cabef6e58fb50008cc4a79ea2f8cbdb2968f26..35fdd903f5f5f163dafc05d0eabf180672ae28db 100644 --- a/src/cutecoin/gui/addContactDialog.py +++ b/src/cutecoin/gui/addContactDialog.py @@ -33,6 +33,7 @@ class AddContactDialog(QDialog, Ui_AddContactDialog): pubkey = self.edit_pubkey.text() self.account.add_contact(Person(name, pubkey)) self.main_window.menu_contacts_list.addAction(name) + self.main_window.app.save(self.account) self.close() def name_edited(self, new_name): @@ -43,4 +44,4 @@ class AddContactDialog(QDialog, Ui_AddContactDialog): pattern = re.compile("([1-9A-Za-z][^OIl]{42,45})") self.button_box.button( QDialogButtonBox.Ok).setEnabled( - pattern.match(new_pubkey)) + pattern.match(new_pubkey)is not None) diff --git a/src/cutecoin/gui/transferMoneyDialog.py b/src/cutecoin/gui/transferMoneyDialog.py index 8f5c9a012f6e94ad67e451ba76689470bbb3f966..18b548dcd27f99969ede4a282e7182d882540c54 100644 --- a/src/cutecoin/gui/transferMoneyDialog.py +++ b/src/cutecoin/gui/transferMoneyDialog.py @@ -40,7 +40,12 @@ class TransferMoneyDialog(QDialog, Ui_TransferMoneyDialog): def accept(self): message = self.edit_message.text() - recipient = self.edit_key_fingerprint.text() + recipient = "" + if self.radio_contact.isEnabled(): + index = self.combo_contact.currentIndex() + recipient = self.sender.contacts[index].pubkey + else: + recipient = self.edit_key_fingerprint.text() amount = self.spinbox_amount.value() password = QInputDialog.getText(self, "Wallet password", "Please enter your password",