Skip to content
Snippets Groups Projects
Commit d103855f authored by inso's avatar inso
Browse files

Merge branch 'dev' of https://github.com/ucoin-io/cutecoin into dev

parents 92b04e83 4d78e660
Branches
Tags
No related merge requests found
...@@ -159,7 +159,7 @@ class CommunityTabWidget(QWidget, Ui_CommunityTabWidget): ...@@ -159,7 +159,7 @@ class CommunityTabWidget(QWidget, Ui_CommunityTabWidget):
pubkey = person pubkey = person
else: else:
pubkey = person.pubkey pubkey = person.pubkey
dialog = TransferMoneyDialog(self.account, self.password_asker) dialog = TransferMoneyDialog(self.app, self.account, self.password_asker)
dialog.edit_pubkey.setText(pubkey) dialog.edit_pubkey.setText(pubkey)
dialog.combo_community.setCurrentText(self.community.name) dialog.combo_community.setCurrentText(self.community.name)
dialog.radio_pubkey.setChecked(True) dialog.radio_pubkey.setChecked(True)
......
...@@ -176,7 +176,7 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget): ...@@ -176,7 +176,7 @@ class TransactionsTabWidget(QWidget, Ui_transactionsTabWidget):
send_money.setData(identity) send_money.setData(identity)
menu.addAction(send_money) menu.addAction(send_money)
if isinstance(identity, identity): if isinstance(identity, Identity):
view_wot = QAction(self.tr("View in Web of Trust"), self) view_wot = QAction(self.tr("View in Web of Trust"), self)
view_wot.triggered.connect(self.currency_tab.tab_community.view_wot) view_wot.triggered.connect(self.currency_tab.tab_community.view_wot)
view_wot.setData(identity) view_wot.setData(identity)
......
...@@ -248,7 +248,7 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab): ...@@ -248,7 +248,7 @@ class WalletsTabWidget(QWidget, Ui_WalletsTab):
def transfer_to_wallet(self): def transfer_to_wallet(self):
wallets = self.sender().data() wallets = self.sender().data()
dialog = TransferMoneyDialog(self.account, self.password_asker) dialog = TransferMoneyDialog(self.app, self.account, self.password_asker)
dialog.edit_pubkey.setText(wallets[1].pubkey) dialog.edit_pubkey.setText(wallets[1].pubkey)
dialog.combo_community.setCurrentText(self.community.name) dialog.combo_community.setCurrentText(self.community.name)
dialog.combo_wallets.setCurrentText(wallets[0].name) dialog.combo_wallets.setCurrentText(wallets[0].name)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment