V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit 059f113d95 - Show all commits

View File

@ -3301,11 +3301,16 @@ class MyForm(QtGui.QMainWindow):
return False return False
# Group of functions for the Your Identities dialog box # Group of functions for the Your Identities dialog box
def getCurrentAccount(self): def getCurrentItem(self):
treeWidget = self.getCurrentTreeWidget() treeWidget = self.getCurrentTreeWidget()
#treeWidget = self.ui.treeWidgetYourIdentities
if treeWidget: if treeWidget:
currentItem = treeWidget.currentItem() currentItem = treeWidget.currentItem()
if currentItem:
return currentItem
return False
def getCurrentAccount(self):
currentItem = self.getCurrentItem()
if currentItem: if currentItem:
account = currentItem.address account = currentItem.address
return account return account
@ -3519,10 +3524,10 @@ class MyForm(QtGui.QMainWindow):
if (not isinstance(item, Ui_AddressWidget)) or item.type != 'normal' or not self.getCurrentTreeWidget() or self.getCurrentTreeWidget().currentItem() is None: if (not isinstance(item, Ui_AddressWidget)) or item.type != 'normal' or not self.getCurrentTreeWidget() or self.getCurrentTreeWidget().currentItem() is None:
return return
# not visible # not visible
if (not self.getCurrentAccount()) or (not isinstance (self.getCurrentAccount(), Ui_AddressWidget)): if (not self.getCurrentItem()) or (not isinstance (self.getCurrentItem(), Ui_AddressWidget)):
return return
# only currently selected item # only currently selected item
if item.address != self.getCurrentTreeWidget().currentItem().address: if item.address != self.getCurrentAccount():
return return
newLabel = str(item.text(0)) newLabel = str(item.text(0))