Skip to content

Commit

Permalink
New method foldertree.AccountMixin.accountString():
Browse files Browse the repository at this point in the history
composes the 'label <address>' string which is used in
MyForm.on_action_Send() instead of bare address.
  • Loading branch information
g1itch committed Mar 28, 2019
1 parent 5a9a2dd commit 9a58af4
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
12 changes: 6 additions & 6 deletions src/bitmessageqt/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2610,7 +2610,10 @@ def click_actionSettings(self):
def on_action_Send(self):
"""Send message to current selected address"""
self.click_pushButtonClear()
self.ui.lineEditTo.setText(self.getCurrentAccount())
account_item = self.getCurrentItem()
if not account_item:
return
self.ui.lineEditTo.setText(account_item.accountString())
self.ui.tabWidget.setCurrentIndex(
self.ui.tabWidget.indexOf(self.ui.send)
)
Expand Down Expand Up @@ -3662,11 +3665,8 @@ def getCurrentItem(self, treeWidget=None):
if treeWidget is None:
treeWidget = self.getCurrentTreeWidget()
if treeWidget:
currentItem = treeWidget.currentItem()
if currentItem:
return currentItem
return False

return treeWidget.currentItem()

def getCurrentAccount(self, treeWidget=None):
currentItem = self.getCurrentItem(treeWidget)
if currentItem:
Expand Down
11 changes: 11 additions & 0 deletions src/bitmessageqt/foldertree.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,14 @@ def folderBrush(self):
brush.setStyle(QtCore.Qt.NoBrush)
return brush

def accountString(self):
"""Account string suitable for use in To: field: label <address>"""
label = self._getLabel()
return (
self.address if label == self.address
else '%s <%s>' % (label, self.address)
)

def setAddress(self, address):
"""Set bitmessage address of the object"""
if address is None:
Expand Down Expand Up @@ -359,6 +367,9 @@ class BMAddressWidget(BMTableWidgetItem, AccountMixin):
def _setup(self):
self.setEnabled(True)

def _getLabel(self):
return self.label

def data(self, role):
"""Return object data (QT UI)"""
if role == QtCore.Qt.ToolTipRole:
Expand Down

0 comments on commit 9a58af4

Please sign in to comment.