Merge pull request #120 from Atheros1/master

increment version number to 0.2.8
This commit is contained in:
Jonathan Warren 2013-04-09 07:48:45 -07:00
commit c87fd93097

View File

@ -6,7 +6,7 @@
#Right now, PyBitmessage only support connecting to stream 1. It doesn't yet contain logic to expand into further streams. #Right now, PyBitmessage only support connecting to stream 1. It doesn't yet contain logic to expand into further streams.
softwareVersion = '0.2.7' softwareVersion = '0.2.8'
verbose = 1 verbose = 1
maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 #Equals two days and 12 hours. maximumAgeOfAnObjectThatIAmWillingToAccept = 216000 #Equals two days and 12 hours.
lengthOfTimeToLeaveObjectsInInventory = 237600 #Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice. lengthOfTimeToLeaveObjectsInInventory = 237600 #Equals two days and 18 hours. This should be longer than maximumAgeOfAnObjectThatIAmWillingToAccept so that we don't process messages twice.
@ -4934,6 +4934,13 @@ class MyForm(QtGui.QMainWindow):
else: else:
self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject()) self.ui.textEditInboxMessage.setPlainText(self.ui.tableWidgetInbox.item(currentRow,2).data(Qt.UserRole).toPyObject())
font = QFont()
font.setBold(False)
self.ui.tableWidgetInbox.item(currentRow,0).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,1).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,2).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,3).setFont(font)
inventoryHash = str(self.ui.tableWidgetInbox.item(currentRow,3).data(Qt.UserRole).toPyObject()) inventoryHash = str(self.ui.tableWidgetInbox.item(currentRow,3).data(Qt.UserRole).toPyObject())
t = (inventoryHash,) t = (inventoryHash,)
sqlLock.acquire() sqlLock.acquire()
@ -4942,14 +4949,6 @@ class MyForm(QtGui.QMainWindow):
sqlReturnQueue.get() sqlReturnQueue.get()
sqlSubmitQueue.put('commit') sqlSubmitQueue.put('commit')
sqlLock.release() sqlLock.release()
font = QFont()
font.setBold(False)
self.ui.tableWidgetInbox.item(currentRow,0).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,1).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,2).setFont(font)
self.ui.tableWidgetInbox.item(currentRow,3).setFont(font)
def tableWidgetSentItemClicked(self): def tableWidgetSentItemClicked(self):
currentRow = self.ui.tableWidgetSent.currentRow() currentRow = self.ui.tableWidgetSent.currentRow()