Skip to content

Commit

Permalink
Release Copy 1 !
Browse files Browse the repository at this point in the history
  • Loading branch information
etotheipi committed Feb 1, 2012
1 parent 79ee391 commit c90c828
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion ArmoryQt.py
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ def newTxFunc(pytxObj):
TheBDM.addNewZeroConfTx(pytxObj.serialize(), long(RightNow()), True)
for wltID,wlt in self.walletMap.iteritems():
TheBDM.rescanWalletZeroConf(self.walletMap[wltID].cppWallet)
self.walletListChanged()
#self.walletListChanged()
self.ledgerModel.reset()

self.NetworkingFactory = ArmoryClientFactory( \
Expand Down
18 changes: 9 additions & 9 deletions qtdialogs.py
Original file line number Diff line number Diff line change
Expand Up @@ -728,7 +728,8 @@ def showContextMenu(self, pos):
if action==actionCopyAddr:
s = self.wltAddrView.model().index(idx.row(), ADDRESSCOLS.Address).data().toString()
elif dev and action==actionCopyHash160:
s = self.wltAddrView.model().index(idx.row(), ADDRESSCOLS.Address).data().toString()
s = str(self.wltAddrView.model().index(idx.row(), ADDRESSCOLS.Address).data().toString())
s = binary_to_hex(addrStr_to_hash160(s))
elif action==actionCopyComment:
s = self.wltAddrView.model().index(idx.row(), ADDRESSCOLS.Comment).data().toString()
elif action==actionCopyBalance:
Expand Down Expand Up @@ -2150,14 +2151,13 @@ def sweepAddr(self):
dispIn = 'address <b>%s</b>' % addrToSweep.getAddrStr()
dispOut = 'wallet <b>"%s"</b> (%s) ' % (self.wlt.labelName, self.wlt.uniqueIDB58)
if DlgVerifySweep(dispIn, dispOut, outVal, fee).exec_():
if self.wlt.useEncryption and self.wlt.isLocked:
unlockdlg = DlgUnlockWallet(self.wlt, self, self.main, 'Sweep Address')
if not unlockdlg.exec_():
QMessageBox.critical(self, 'Wallet is Locked', \
'Cannot sweep an address while its keys are locked.', \
QMessageBox.Ok)
return

#if self.wlt.useEncryption and self.wlt.isLocked:
#unlockdlg = DlgUnlockWallet(self.wlt, self, self.main, 'Sweep Address')
#if not unlockdlg.exec_():
#QMessageBox.critical(self, 'Wallet is Locked', \
#'Cannot sweep an address while its keys are locked.', \
#QMessageBox.Ok)
#return
self.main.broadcastTransaction(finishedTx, dryRun=False)

def deleteAddr(self):
Expand Down

0 comments on commit c90c828

Please sign in to comment.