Merge pull request #34 from Atheros1/master

Added ability to send Sent items to the trash
10 years ago · b1ad72a4e1
parent 57b8b1bd13 e086868896
commit b1ad72a4e1
3 changed files with 41 additions and 22 deletions
--- a/about.py
+++ b/about.py
@ -2,8 +2,8 @@

 # Form implementation generated from reading ui file 'about.ui'
 #
-# Created: Mon Jan 21 22:32:55 2013
-#      by: PyQt4 UI code generator 4.9.5
+# Created: Thu Jan 31 13:35:03 2013
+#      by: PyQt4 UI code generator 4.9.4
 #
 # WARNING! All changes made in this file will be lost!

@ -39,7 +39,7 @@ class Ui_aboutDialog(object):
        self.label_2.setAlignment(QtCore.Qt.AlignCenter)
        self.label_2.setObjectName(_fromUtf8("label_2"))
        self.label_3 = QtGui.QLabel(aboutDialog)
-        self.label_3.setGeometry(QtCore.QRect(20, 210, 331, 61))
+        self.label_3.setGeometry(QtCore.QRect(20, 200, 331, 71))
        self.label_3.setWordWrap(True)
        self.label_3.setObjectName(_fromUtf8("label_3"))
        self.label_5 = QtGui.QLabel(aboutDialog)
@ -56,7 +56,7 @@ class Ui_aboutDialog(object):
        aboutDialog.setWindowTitle(QtGui.QApplication.translate("aboutDialog", "About", None, QtGui.QApplication.UnicodeUTF8))
        self.label.setText(QtGui.QApplication.translate("aboutDialog", "PyBitmessage", None, QtGui.QApplication.UnicodeUTF8))
        self.labelVersion.setText(QtGui.QApplication.translate("aboutDialog", "version ?", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(QtGui.QApplication.translate("aboutDialog", "Copyright © 2012 Jonathan Warren", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_3.setText(QtGui.QApplication.translate("aboutDialog", "<html><head/><body><p>Distributed under the MIT/X11 software license, see the accompanying file license.txt or <a href=\"http://www.opensource.org/licenses/mit-license.php\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_2.setText(QtGui.QApplication.translate("aboutDialog", "Copyright © 2013 Jonathan Warren", None, QtGui.QApplication.UnicodeUTF8))
+        self.label_3.setText(QtGui.QApplication.translate("aboutDialog", "<html><head/><body><p>Distributed under the MIT/X11 software license; see <a href=\"http://www.opensource.org/licenses/mit-license.php\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
        self.label_5.setText(QtGui.QApplication.translate("aboutDialog", "This is Beta software.", None, QtGui.QApplication.UnicodeUTF8))

--- a/about.ui
+++ b/about.ui
@ -74,7 +74,7 @@
    </rect>
   </property>
   <property name="text">
-    <string>Copyright © 2012 Jonathan Warren</string>
+    <string>Copyright © 2013 Jonathan Warren</string>
   </property>
   <property name="alignment">
    <set>Qt::AlignCenter</set>
@ -84,13 +84,13 @@
   <property name="geometry">
    <rect>
     <x>20</x>
-     <y>210</y>
+     <y>200</y>
     <width>331</width>
-     <height>61</height>
+     <height>71</height>
    </rect>
   </property>
   <property name="text">
-    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license, see the accompanying file license.txt or &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+    <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Distributed under the MIT/X11 software license; see &lt;a href=&quot;http://www.opensource.org/licenses/mit-license.php&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;http://www.opensource.org/licenses/mit-license.php&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
   </property>
   <property name="wordWrap">
    <bool>true</bool>
--- a/bitmessagemain.py
+++ b/bitmessagemain.py
@ -1136,8 +1136,7 @@ class receiveDataThread(QThread):

        readPosition = 24 #for the message header
        readPosition += 8 #for the nonce
-        #bitfieldBehaviors = self.data[readPosition:readPosition+4] The bitfieldBehaviors used to be here
-        embeddedTime = self.data[readPosition:readPosition+4]
+        embeddedTime = self.data[readPosition:readPosition+4]#We currently are not checking the embeddedTime for any sort of validity in pubkey messages.
        readPosition += 4 #for the time
        addressVersion, varintLength = decodeVarint(self.data[readPosition:readPosition+10])
        readPosition += varintLength
@ -1189,7 +1188,7 @@ class receiveDataThread(QThread):
            print 'publicEncryptionKey in hex:', publicEncryptionKey.encode('hex')
            printLock.release()

-            t = (ripe,True,self.data[24:24+self.payloadLength],int(time.time())+604800) #after one week we may remove this pub key from our database.
+            t = (ripe,True,self.data[24:24+self.payloadLength],embeddedTime+604800) #after one week we may remove this pub key from our database.
            sqlLock.acquire()
            sqlSubmitQueue.put('''INSERT INTO pubkeys VALUES (?,?,?,?)''')
            sqlSubmitQueue.put(t)
@ -2080,7 +2079,7 @@ class singleCleaner(QThread):
                sqlReturnQueue.get()

                t = ()
-                sqlSubmitQueue.put('''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE (status='findingpubkey' OR status='sentmessage') ''')
+                sqlSubmitQueue.put('''select toaddress, toripe, fromaddress, subject, message, ackdata, lastactiontime, status, pubkeyretrynumber, msgretrynumber FROM sent WHERE ((status='findingpubkey' OR status='sentmessage') AND folder='sent') ''') #If the message's folder='trash' then we'll ignore it.
                sqlSubmitQueue.put(t)
                queryreturn = sqlReturnQueue.get()
                for row in queryreturn:
@ -2089,7 +2088,7 @@ class singleCleaner(QThread):
                        if int(time.time()) - lastactiontime > (maximumAgeOfAnObjectThatIAmWillingToAccept * (2 ** (pubkeyretrynumber))):
                            print 'It has been a long time and we haven\'t heard a response to our getpubkey request. Sending again.'
                            try:
-                                del neededPubkeys[toripe]
+                                del neededPubkeys[toripe] #We need to take this entry out of the neededPubkeys structure because the workerQueue checks to see whether the entry is already present and will not do the POW and send the message because it assumes that it has already done it recently.
                            except:
                                pass
                            workerQueue.put(('sendmessage',toaddress))
@ -2116,7 +2115,7 @@ class singleWorker(QThread):

    def run(self):
        sqlLock.acquire()
-        sqlSubmitQueue.put('SELECT toripe FROM sent WHERE status=?')
+        sqlSubmitQueue.put('''SELECT toripe FROM sent WHERE (status=? AND folder='sent')''')
        sqlSubmitQueue.put(('findingpubkey',))
        queryreturn = sqlReturnQueue.get()
        sqlLock.release()
@ -2197,10 +2196,6 @@ class singleWorker(QThread):
        pubSigningKey = highlevelcrypto.privToPub(privSigningKeyHex).decode('hex')
        pubEncryptionKey = highlevelcrypto.privToPub(privEncryptionKeyHex).decode('hex')

-        #print 'within recgetpubkey'
-        #print 'pubSigningKey in hex:', pubSigningKey.encode('hex')
-        #print 'pubEncryptionKey in hex:', pubEncryptionKey.encode('hex')
-
        payload += pubSigningKey[1:]
        payload += pubEncryptionKey[1:]

@ -3104,6 +3099,14 @@ class MyForm(QtGui.QMainWindow):
        self.popMenuSubscriptions.addSeparator()
        self.popMenuSubscriptions.addAction( self.actionsubscriptionsClipboard )

+        #Popup menu for the Sent page
+        self.ui.sentContextMenuToolbar = QtGui.QToolBar()
+          # Actions
+        self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction("Move to Trash", self.on_action_SentTrash)
+        self.ui.tableWidgetSent.setContextMenuPolicy( QtCore.Qt.CustomContextMenu )
+        self.connect(self.ui.tableWidgetSent, QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), self.on_context_menuSent)
+        self.popMenuSent = QtGui.QMenu( self )
+        self.popMenuSent.addAction( self.actionTrashSentMessage )

        #Initialize the user's list of addresses on the 'Your Identities' tab.
        configSections = config.sections()
@ -3187,7 +3190,7 @@ class MyForm(QtGui.QMainWindow):
            #self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item(0,2).data(Qt.UserRole).toPyObject())

        #Load Sent items from database
-        sqlSubmitQueue.put('SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent ORDER BY lastactiontime')
+        sqlSubmitQueue.put('''SELECT toaddress, fromaddress, subject, message, status, ackdata, lastactiontime FROM sent where folder = 'sent' ORDER BY lastactiontime''')
        sqlSubmitQueue.put('')
        queryreturn = sqlReturnQueue.get()
        for row in queryreturn:
@ -3242,7 +3245,7 @@ class MyForm(QtGui.QMainWindow):
                newItem =  myTableWidgetItem('Broadcast on ' + strftime(config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))
            else:
                newItem =  myTableWidgetItem('Unknown status.  ' + strftime(config.get('bitmessagesettings', 'timeformat'),localtime(int(lastactiontime))))
-            newItem.setData(Qt.UserRole,ackdata)
+            newItem.setData(Qt.UserRole,QByteArray(ackdata))
            newItem.setData(33,int(lastactiontime))
            newItem.setFlags( QtCore.Qt.ItemIsSelectable |  QtCore.Qt.ItemIsEnabled )
            self.ui.tableWidgetSent.setItem(0,3,newItem)
@ -3609,7 +3612,7 @@ class MyForm(QtGui.QMainWindow):
                        newItem.setData(Qt.UserRole,unicode(message,'utf-8)'))
                        self.ui.tableWidgetSent.setItem(0,2,newItem)
                        newItem =  myTableWidgetItem('Just pressed ''send'' '+strftime(config.get('bitmessagesettings', 'timeformat'),localtime(int(time.time()))))
-                        newItem.setData(Qt.UserRole,ackdata)
+                        newItem.setData(Qt.UserRole,QByteArray(ackdata))
                        newItem.setData(33,int(time.time()))
                        self.ui.tableWidgetSent.setItem(0,3,newItem)

@ -4109,6 +4112,7 @@ class MyForm(QtGui.QMainWindow):
        else:
            self.statusBar().showMessage('Error: You cannot add the same address to your address book twice. Try renaming the existing one if you want.')

+    #Send item on the Inbox tab to trash
    def on_action_InboxTrash(self):
        currentRow = self.ui.tableWidgetInbox.currentRow()
        inventoryHashToTrash = str(self.ui.tableWidgetInbox.item(currentRow,3).data(Qt.UserRole).toPyObject())
@ -4122,6 +4126,19 @@ class MyForm(QtGui.QMainWindow):
        self.ui.tableWidgetInbox.removeRow(currentRow)
        self.statusBar().showMessage('Moved item to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.')

+    #Send item on the Sent tab to trash
+    def on_action_SentTrash(self):
+        currentRow = self.ui.tableWidgetSent.currentRow()
+        ackdataToTrash = str(self.ui.tableWidgetSent.item(currentRow,3).data(Qt.UserRole).toPyObject())
+        t = (ackdataToTrash,)
+        sqlLock.acquire()
+        sqlSubmitQueue.put('''UPDATE sent SET folder='trash' WHERE ackdata=?''')
+        sqlSubmitQueue.put(t)
+        sqlReturnQueue.get()
+        sqlLock.release()
+        self.ui.tableWidgetSent.removeRow(currentRow)
+        self.statusBar().showMessage('Moved item to trash. There is no user interface to view your trash, but it is still on disk if you are desperate to get it back.')
+
    #Group of functions for the Address Book dialog box
    def on_action_AddressBookNew(self):
        self.click_pushButtonAddAddressBook()
@ -4213,6 +4230,8 @@ class MyForm(QtGui.QMainWindow):
        self.popMenu.exec_( self.ui.tableWidgetYourIdentities.mapToGlobal(point) )
    def on_context_menuInbox(self, point):
        self.popMenuInbox.exec_( self.ui.tableWidgetInbox.mapToGlobal(point) )
+    def on_context_menuSent(self, point):
+        self.popMenuSent.exec_( self.ui.tableWidgetSent.mapToGlobal(point) )

    def tableWidgetInboxItemClicked(self):
        currentRow = self.ui.tableWidgetInbox.currentRow()