diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 2c37b280..9b195171 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -224,7 +224,7 @@ class MyForm(QtGui.QMainWindow): 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) + QtCore.QObject.connect(self.ui.tabWidget, QtCore.SIGNAL("currentChanged(int)"), self.ReloadOnlyInboxTable) # FILE MENU and other buttons QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL( "triggered()"), self.quit) @@ -823,6 +823,13 @@ class MyForm(QtGui.QMainWindow): self.ui.tableWidgetSent.sortItems(3, Qt.DescendingOrder) self.ui.tableWidgetSent.keyPressEvent = self.tableWidgetSentKeyPressEvent + # Reload inbox Table when Inbox tab is selected + def ReloadOnlyInboxTable(self): + if self.ui.tabWidget.currentIndex() == self.ui.tabWidget.indexOf(self.ui.inbox): + self.loadInbox() + elif self.ui.tabWidget.currentIndex() == self.ui.tabWidget.indexOf(self.ui.sent): + self.loadSent() + # Load inbox from messages database file def loadInbox(self, where="", what=""): what = "%" + what + "%" @@ -1812,7 +1819,6 @@ 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: @@ -1847,7 +1853,6 @@ 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 33b0bca5..53babc8c 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: Mon Nov 18 22:23:35 2013 +# Created: Mon Nov 18 23:17:56 2013 # by: PyQt4 UI code generator 4.10.3 # # WARNING! All changes made in this file will be lost! @@ -508,10 +508,11 @@ class Ui_MainWindow(object): self.menubar.addAction(self.menuHelp.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(2) + self.tabWidget.setCurrentIndex(0) 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) + QtCore.QObject.connect(self.tabWidget, QtCore.SIGNAL(_fromUtf8("tabCloseRequested(int)")), self.tableWidgetSent.update) QtCore.QMetaObject.connectSlotsByName(MainWindow) MainWindow.setTabOrder(self.tabWidget, self.tableWidgetInbox) MainWindow.setTabOrder(self.tableWidgetInbox, self.textEditInboxMessage) diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index 2f0309f5..9a982a6a 100644 --- a/src/bitmessageqt/bitmessageui.ui +++ b/src/bitmessageqt/bitmessageui.ui @@ -57,7 +57,7 @@ QTabWidget::Rounded - 2 + 0