From 9f07b06eb1cb195dd77eeeb95630d9e96344ac23 Mon Sep 17 00:00:00 2001 From: Arnukk Date: Mon, 18 Nov 2013 22:57:40 +0400 Subject: [PATCH] Bug fix - Doesn't reload sent and inbox tables when message is received/sent --- .idea/workspace.xml | 206 +++++++++++++++++++++++++++---- src/bitmessageqt/__init__.py | 13 +- src/bitmessageqt/bitmessageui.py | 20 +-- src/bitmessageqt/bitmessageui.ui | 22 +++- src/class_receiveDataThread.py | 8 +- src/class_singleWorker.py | 2 +- src/helper_inbox.py | 2 +- 7 files changed, 225 insertions(+), 48 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index dc27f306..0a3d3a59 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,13 @@ - + + + + + + + @@ -14,7 +20,7 @@ - + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + @@ -42,21 +79,54 @@ - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + @@ -76,8 +146,11 @@ @@ -173,6 +246,11 @@ + + + + + - - - + + + - + - + - - + + - + @@ -416,12 +498,40 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -450,25 +560,79 @@ - + - - + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index f5ea52e5..2c37b280 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -223,6 +223,8 @@ class MyForm(QtGui.QMainWindow): self.timer.start(2000) # milliseconds QtCore.QObject.connect(self.timer, QtCore.SIGNAL("timeout()"), self.runEveryTwoSeconds) + #Sent and Inbox Tabs + QtCore.QObject.connect(self.ui.tabWidget, QtCore.SIGNAL("currentChanged(int)"), self.loadInbox) # FILE MENU and other buttons QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL( "triggered()"), self.quit) @@ -1778,7 +1780,7 @@ class MyForm(QtGui.QMainWindow): ackdata = OpenSSL.rand(32) t = () sqlExecute( - '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''', + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', '', toAddress, ripe, @@ -1791,7 +1793,8 @@ class MyForm(QtGui.QMainWindow): 1, 1, 'sent', - 2) + 2, + 0) toLabel = '' queryreturn = sqlQuery('''select label from addressbook where address=?''', @@ -1809,6 +1812,7 @@ class MyForm(QtGui.QMainWindow): self.ui.lineEditTo.setText('') self.ui.lineEditSubject.setText('') self.ui.textEditMessage.setText('') + self.loadSent() self.ui.tabWidget.setCurrentIndex(2) self.ui.tableWidgetSent.setCurrentCell(0, 0) else: @@ -1827,9 +1831,9 @@ class MyForm(QtGui.QMainWindow): toAddress = self.str_broadcast_subscribers ripe = '' t = ('', toAddress, ripe, fromAddress, subject, message, ackdata, int( - time.time()), 'broadcastqueued', 1, 1, 'sent', 2) + time.time()), 'broadcastqueued', 1, 1, 'sent', 2, 0) sqlExecute( - '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) + '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) toLabel = self.str_broadcast_subscribers @@ -1843,6 +1847,7 @@ class MyForm(QtGui.QMainWindow): self.ui.lineEditTo.setText('') self.ui.lineEditSubject.setText('') self.ui.textEditMessage.setText('') + self.loadSent() self.ui.tabWidget.setCurrentIndex(2) self.ui.tableWidgetSent.setCurrentCell(0, 0) diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index a468a12f..33b0bca5 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/src/bitmessageqt/bitmessageui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'bitmessageui.ui' # -# Created: Sun Nov 17 14:29:34 2013 +# Created: Mon Nov 18 22:23:35 2013 # by: PyQt4 UI code generator 4.10.3 # # WARNING! All changes made in this file will be lost! @@ -93,9 +93,9 @@ class Ui_MainWindow(object): item.setTextAlignment(QtCore.Qt.AlignLeft|QtCore.Qt.AlignVCenter) self.tableWidgetInbox.setHorizontalHeaderItem(4, item) self.tableWidgetInbox.horizontalHeader().setCascadingSectionResizes(True) - self.tableWidgetInbox.horizontalHeader().setDefaultSectionSize(178) + self.tableWidgetInbox.horizontalHeader().setDefaultSectionSize(179) self.tableWidgetInbox.horizontalHeader().setHighlightSections(False) - self.tableWidgetInbox.horizontalHeader().setMinimumSectionSize(28) + self.tableWidgetInbox.horizontalHeader().setMinimumSectionSize(27) self.tableWidgetInbox.horizontalHeader().setSortIndicatorShown(False) self.tableWidgetInbox.horizontalHeader().setStretchLastSection(True) self.tableWidgetInbox.verticalHeader().setVisible(False) @@ -225,9 +225,9 @@ class Ui_MainWindow(object): item = QtGui.QTableWidgetItem() self.tableWidgetSent.setHorizontalHeaderItem(4, item) self.tableWidgetSent.horizontalHeader().setCascadingSectionResizes(True) - self.tableWidgetSent.horizontalHeader().setDefaultSectionSize(178) + self.tableWidgetSent.horizontalHeader().setDefaultSectionSize(179) self.tableWidgetSent.horizontalHeader().setHighlightSections(False) - self.tableWidgetSent.horizontalHeader().setMinimumSectionSize(28) + self.tableWidgetSent.horizontalHeader().setMinimumSectionSize(29) self.tableWidgetSent.horizontalHeader().setSortIndicatorShown(False) self.tableWidgetSent.horizontalHeader().setStretchLastSection(True) self.tableWidgetSent.verticalHeader().setVisible(False) @@ -508,7 +508,7 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuHelp.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(2) QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled) QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide) QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show) @@ -650,12 +650,4 @@ class Ui_MainWindow(object): import bitmessage_icons_rc -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - MainWindow = QtGui.QMainWindow() - ui = Ui_MainWindow() - ui.setupUi(MainWindow) - MainWindow.show() - sys.exit(app.exec_()) diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index 5ddc41d2..2f0309f5 100644 --- a/src/bitmessageqt/bitmessageui.ui +++ b/src/bitmessageqt/bitmessageui.ui @@ -57,7 +57,7 @@ QTabWidget::Rounded - 0 + 2 @@ -1290,8 +1290,24 @@ p, li { white-space: pre-wrap; } 84 - 218 - 546 + 275 + 544 + + + + + tabWidget + tabCloseRequested(int) + tableWidgetSent + update() + + + 201 + 36 + + + 204 + 101 diff --git a/src/class_receiveDataThread.py b/src/class_receiveDataThread.py index b1a62261..2d2a4588 100644 --- a/src/class_receiveDataThread.py +++ b/src/class_receiveDataThread.py @@ -541,7 +541,7 @@ class receiveDataThread(threading.Thread): if messageEncodingType != 0: t = (self.inventoryHash, toAddress, fromAddress, subject, int( - time.time()), body, 'inbox', messageEncodingType, 0) + time.time()), body, 'inbox', messageEncodingType, 0, 0) helper_inbox.insert(t) shared.UISignalQueue.put(('displayNewInboxMessage', ( @@ -688,7 +688,7 @@ class receiveDataThread(threading.Thread): if messageEncodingType != 0: t = (self.inventoryHash, toAddress, fromAddress, subject, int( - time.time()), body, 'inbox', messageEncodingType, 0) + time.time()), body, 'inbox', messageEncodingType, 0, 0) helper_inbox.insert(t) shared.UISignalQueue.put(('displayNewInboxMessage', ( @@ -834,7 +834,7 @@ class receiveDataThread(threading.Thread): if messageEncodingType != 0: t = (self.inventoryHash, toAddress, fromAddress, subject, int( - time.time()), body, 'inbox', messageEncodingType, 0) + time.time()), body, 'inbox', messageEncodingType, 0, 0) helper_inbox.insert(t) shared.UISignalQueue.put(('displayNewInboxMessage', ( @@ -1144,7 +1144,7 @@ class receiveDataThread(threading.Thread): subject = '' if messageEncodingType != 0: t = (self.inventoryHash, toAddress, fromAddress, subject, int( - time.time()), body, 'inbox', messageEncodingType, 0) + time.time()), body, 'inbox', messageEncodingType, 0, 0) helper_inbox.insert(t) shared.UISignalQueue.put(('displayNewInboxMessage', ( diff --git a/src/class_singleWorker.py b/src/class_singleWorker.py index 2680f307..2a80271e 100644 --- a/src/class_singleWorker.py +++ b/src/class_singleWorker.py @@ -835,7 +835,7 @@ class singleWorker(threading.Thread): # our own inbox. if shared.config.has_section(toaddress): t = (inventoryHash, toaddress, fromaddress, subject, int( - time.time()), message, 'inbox', 2, 0) + time.time()), message, 'inbox', 2, 0, 0) helper_inbox.insert(t) shared.UISignalQueue.put(('displayNewInboxMessage', ( diff --git a/src/helper_inbox.py b/src/helper_inbox.py index 20fff505..1c0c5c66 100644 --- a/src/helper_inbox.py +++ b/src/helper_inbox.py @@ -2,7 +2,7 @@ from helper_sql import * import shared def insert(t): - sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?)''', *t) + sqlExecute('''INSERT INTO inbox VALUES (?,?,?,?,?,?,?,?,?,?)''', *t) def trash(msgid): sqlExecute('''UPDATE inbox SET folder='trash' WHERE msgid=?''', msgid)