Skip to content

Commit

Permalink
Actually drawing QR codes, but not there yet...
Browse files Browse the repository at this point in the history
  • Loading branch information
etotheipi committed Dec 18, 2011
1 parent 2fa18ee commit 1316a4c
Show file tree
Hide file tree
Showing 3 changed files with 1,140 additions and 10 deletions.
8 changes: 3 additions & 5 deletions ArmoryQt.py
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def __init__(self, parent=None, settingsPath=None):
ledgFrame.setFrameStyle(QFrame.Box|QFrame.Sunken)
ledgLayout = QGridLayout()
ledgLayout.addWidget(QLabel("<b>Ledger</b>:"), 0,0)
ledgLayout.addWidget(self.comboWalletSelect, 0,1, 1,2)
ledgLayout.addWidget(self.comboWalletSelect, 4,0, 2,1)
ledgLayout.addWidget(self.ledgerView, 1,0, 3,4)
ledgLayout.addWidget(self.lblTotalFunds, 4,2, 1,2)
ledgLayout.addWidget(self.lblUnconfirmed, 5,2, 1,2)
Expand Down Expand Up @@ -572,7 +572,6 @@ def createCombinedLedger(self, wltIDList=None, withZeroConf=True):
# We need to figure out which wallets to combine here...
currIdx = self.comboWalletSelect.currentIndex()
currText = str(self.comboWalletSelect.currentText()).lower()
print 'CurrIdx:', currIdx, 'CurrText: "' + currText + '"'
if currIdx>=4:
wltIDList = [self.walletIDList[currIdx-6]]
else:
Expand All @@ -595,6 +594,8 @@ def createCombinedLedger(self, wltIDList=None, withZeroConf=True):


self.combinedLedger = []
if not wltIDList:
return
for wltID in wltIDList:
wlt = self.walletMap[wltID]
index = self.walletIndices[wltID]
Expand Down Expand Up @@ -699,7 +700,6 @@ def populateLedgerComboBox(self):
self.comboWalletSelect.addItem( 'Offline Wallets' )
self.comboWalletSelect.addItem( 'Other\'s wallets' )
for wltID in self.walletIDList:
print wltID
self.comboWalletSelect.addItem( self.walletMap[wltID].labelName )
self.comboWalletSelect.insertSeparator(4)
self.comboWalletSelect.insertSeparator(4)
Expand Down Expand Up @@ -926,8 +926,6 @@ def Heartbeat(self, nextBeatSec=3):



class DlgPaperBackup(QDialog):
pass



Expand Down
Loading

0 comments on commit 1316a4c

Please sign in to comment.