Manual merge github issue #212

src/bitmessageqt/__init__.py

@@ -188,6 +188,8 @@ class MyForm(QtGui.QMainWindow):
             "MainWindow", "Send message to this address"), self.on_action_AddressBookSend)
         self.actionAddressBookClipboard = self.ui.addressBookContextMenuToolbar.addAction(_translate(
             "MainWindow", "Copy address to clipboard"), self.on_action_AddressBookClipboard)
+        self.actionAddressBookSubscribe = self.ui.addressBookContextMenuToolbar.addAction(_translate(
+            "MainWindow", "Subscribe to this address"), self.on_action_AddressBookSubscribe)
         self.actionAddressBookNew = self.ui.addressBookContextMenuToolbar.addAction(_translate(
             "MainWindow", "Add New Address"), self.on_action_AddressBookNew)
         self.actionAddressBookDelete = self.ui.addressBookContextMenuToolbar.addAction(_translate(
@@ -199,6 +201,7 @@ class MyForm(QtGui.QMainWindow):
         self.popMenuAddressBook = QtGui.QMenu(self)
         self.popMenuAddressBook.addAction(self.actionAddressBookSend)
         self.popMenuAddressBook.addAction(self.actionAddressBookClipboard)
+        self.popMenuAddressBook.addAction( self.actionAddressBookSubscribe )
         self.popMenuAddressBook.addSeparator()
         self.popMenuAddressBook.addAction(self.actionAddressBookNew)
         self.popMenuAddressBook.addAction(self.actionAddressBookDelete)
@@ -1646,51 +1649,44 @@ class MyForm(QtGui.QMainWindow):
                 self.statusBar().showMessage(_translate(
                     "MainWindow", "The address you entered was invalid. Ignoring it."))
 
-    def click_pushButtonAddSubscription(self):
+    def addSubscription(self, label, address):
-        self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self)
+        address = addBMIfNotPresent(address)
-
+        #This should be handled outside of this function, for error displaying and such, but it must also be checked here.
-        if self.NewSubscriptionDialogInstance.exec_():
+        if shared.isAddressInMySubscriptionsList(address):
-            if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() == _translate("MainWindow", "Address is valid."):
+            return
-                # First we must check to see if the address is already in the
+        #Add to UI list
-                # subscriptions list. The user cannot add it again or else it
-                # will cause problems when updating and deleting the entry.
-                shared.sqlLock.acquire()
-                t = (addBMIfNotPresent(str(
-                    self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())),)
-                shared.sqlSubmitQueue.put(
-                    '''select * from subscriptions where address=?''')
-                shared.sqlSubmitQueue.put(t)
-                queryreturn = shared.sqlReturnQueue.get()
-                shared.sqlLock.release()
-                if queryreturn == []:
         self.ui.tableWidgetSubscriptions.setSortingEnabled(False)
         self.ui.tableWidgetSubscriptions.insertRow(0)
-                    newItem = QtGui.QTableWidgetItem(unicode(
+        newItem =  QtGui.QTableWidgetItem(unicode(label, 'utf-8'))
-                        self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8(), 'utf-8'))
         self.ui.tableWidgetSubscriptions.setItem(0,0,newItem)
-                    newItem = QtGui.QTableWidgetItem(addBMIfNotPresent(
+        newItem =  QtGui.QTableWidgetItem(address)
-                        self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text()))
+        newItem.setFlags( QtCore.Qt.ItemIsSelectable |  QtCore.Qt.ItemIsEnabled )
-                    newItem.setFlags(
-                        QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
         self.ui.tableWidgetSubscriptions.setItem(0,1,newItem)
         self.ui.tableWidgetSubscriptions.setSortingEnabled(True)
-                    t = (str(self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()), addBMIfNotPresent(
+        #Add to database (perhaps this should be separated from the MyForm class)
-                        str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text())), True)
+        t = (str(label),address,True)
         shared.sqlLock.acquire()
-                    shared.sqlSubmitQueue.put(
+        shared.sqlSubmitQueue.put('''INSERT INTO subscriptions VALUES (?,?,?)''')
-                        '''INSERT INTO subscriptions VALUES (?,?,?)''')
         shared.sqlSubmitQueue.put(t)
         queryreturn = shared.sqlReturnQueue.get()
         shared.sqlSubmitQueue.put('commit')
         shared.sqlLock.release()
         self.rerenderInboxFromLabels()
         shared.reloadBroadcastSendersForWhichImWatching()
-                else:
+
-                    self.statusBar().showMessage(_translate(
+    def click_pushButtonAddSubscription(self):
-                        "MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want."))
+        self.NewSubscriptionDialogInstance = NewSubscriptionDialog(self)
-            else:
+        if self.NewSubscriptionDialogInstance.exec_():
-                self.statusBar().showMessage(_translate(
+            if self.NewSubscriptionDialogInstance.ui.labelSubscriptionAddressCheck.text() != _translate("MainWindow", "Address is valid."):
-                    "MainWindow", "The address you entered was invalid. Ignoring it."))
+                self.statusBar().showMessage(_translate("MainWindow", "The address you entered was invalid. Ignoring it."))
+                return
+            address = addBMIfNotPresent(str(self.NewSubscriptionDialogInstance.ui.lineEditSubscriptionAddress.text()))
+            # We must check to see if the address is already in the subscriptions list. The user cannot add it again or else it will cause problems when updating and deleting the entry.
+            if shared.isAddressInMySubscriptionsList(address):
+                self.statusBar().showMessage(_translate("MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want."))
+                return
+            label = self.NewSubscriptionDialogInstance.ui.newsubscriptionlabel.text().toUtf8()
+            self.addSubscription(label, address)
 
     def loadBlackWhiteList(self):
         # Initialize the Blacklist or Whitelist table
@@ -2242,6 +2238,20 @@ class MyForm(QtGui.QMainWindow):
             self.statusBar().showMessage('')
             self.ui.tabWidget.setCurrentIndex(1)
 
+    def on_action_AddressBookSubscribe(self):
+        listOfSelectedRows = {}
+        for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())):
+            listOfSelectedRows[self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0
+        for currentRow in listOfSelectedRows:
+            addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow,1).text())
+            # Then subscribe to it... provided it's not already in the address book
+            if shared.isAddressInMySubscriptionsList(addressAtCurrentRow):
+                self.statusBar().showMessage(QtGui.QApplication.translate("MainWindow", "Error: You cannot add the same address to your subsciptions twice. Perhaps rename the existing one if you want."))
+                continue
+            labelAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow,0).text())
+            self.addSubscription(labelAtCurrentRow, addressAtCurrentRow)
+            self.ui.tabWidget.setCurrentIndex(4)
+
     def on_context_menuAddressBook(self, point):
         self.popMenuAddressBook.exec_(
             self.ui.tableWidgetAddressBook.mapToGlobal(point))

src/shared.py

@@ -59,6 +59,16 @@ def isAddressInMyAddressBook(address):
     sqlLock.release()
     return queryreturn != []
 
+#At this point we should really just have a isAddressInMy(book, address)...
+def isAddressInMySubscriptionsList(address):
+    t = (str(address),) # As opposed to Qt str
+    sqlLock.acquire()
+    sqlSubmitQueue.put('''select * from subscriptions where address=?''')
+    sqlSubmitQueue.put(t)
+    queryreturn = sqlReturnQueue.get()
+    sqlLock.release()
+    return queryreturn != []
+
 def isAddressInMyAddressBookSubscriptionsListOrWhitelist(address):
     if isAddressInMyAddressBook(address):
         return True
@@ -185,7 +195,7 @@ def doCleanShutdown():
         printLock.release()
         os._exit(0)
 
-#Wen you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
+#When you want to command a sendDataThread to do something, like shutdown or send some data, this function puts your data into the queues for each of the sendDataThreads. The sendDataThreads are responsible for putting their queue into (and out of) the sendDataQueues list.
 def broadcastToSendDataQueues(data):
     #print 'running broadcastToSendDataQueues'
     for q in sendDataQueues: