- added "send to chan" button

- added "chanonymous" button ;)

src/bitmessageqt/__init__.py

@@ -142,6 +142,10 @@ class MyForm(QtGui.QMainWindow):
             "clicked()"), self.click_pushButtonSend)
         QtCore.QObject.connect(self.ui.pushButtonLoadFromAddressBook, QtCore.SIGNAL(
             "clicked()"), self.click_pushButtonLoadFromAddressBook)
+        QtCore.QObject.connect(self.ui.pushButtonChanonymous, QtCore.SIGNAL(
+            "clicked()"), self.click_pushButtonChanonymous)
+        QtCore.QObject.connect(self.ui.pushButtonSendToChan, QtCore.SIGNAL(
+            "clicked()"), self.click_pushButtonSendToChan)
         QtCore.QObject.connect(self.ui.pushButtonFetchNamecoinID, QtCore.SIGNAL(
             "clicked()"), self.click_pushButtonFetchNamecoinID)
         QtCore.QObject.connect(self.ui.radioButtonBlacklist, QtCore.SIGNAL(
@@ -850,18 +854,8 @@ class MyForm(QtGui.QMainWindow):
             for currentRow in range(tableWidget.rowCount()):
                 label = str(tableWidget.item(currentRow,0).text())
                 address = str(tableWidget.item(currentRow,1).text())
-                if address in shared.config.sections():
+                self.ui.comboboxFindLabel.addItem(label, address)
-                    # this is one of your addresses
+                self.ui.comboboxFindAddress.addItem(address,label)
-                    if shared.safeConfigGetBoolean(address, 'enabled'):
-                        self.ui.comboboxFindLabel.addItem(label, address)
-                        self.ui.comboboxFindAddress.addItem(address,label)
-                    else:
-                        pass
-                        #print label, address, 'is disabled'
-                else:
-                    # print label, address, 'is a foreign address'
-                    self.ui.comboboxFindLabel.addItem(label, address)
-                    self.ui.comboboxFindAddress.addItem(address,label)
         self.ui.tableWidgetRecipients.keyPressEvent = self.tableWidgetRecipientsKeyPressEvent
         
     # create application indicator
@@ -1778,6 +1772,28 @@ class MyForm(QtGui.QMainWindow):
             self.statusBar().showMessage(_translate(
                 "MainWindow", "Right click one or more entries in your address book and select \'Send message to this address\'."))
             
+    def click_pushButtonChanonymous(self):
+        currentRecipientsRow = self.ui.tableWidgetRecipients.currentRow()
+        addressAtCurrentRecipientsRow = str(self.ui.tableWidgetRecipients.item(currentRecipientsRow,1).text())
+        found = self.ui.comboBoxSendFrom.findData(addressAtCurrentRecipientsRow, Qt.UserRole, Qt.MatchCaseSensitive)
+        if (found > 0) & shared.safeConfigGetBoolean(str(addressAtCurrentRecipientsRow), 'chan'):
+            self.ui.comboBoxSendFrom.setCurrentIndex(found)
+            self.redrawLabelFrom(found)
+        elif (addressAtCurrentRecipientsRow in shared.config.sections()) & (not shared.safeConfigGetBoolean(str(addressAtCurrentRecipientsRow), 'enabled')):
+            for i in range(4):
+                time.sleep(0.1)
+                self.statusBar().showMessage('')
+                time.sleep(0.1)
+                self.statusBar().showMessage(_translate(
+                "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."))
+        else:
+            self.statusBar().showMessage(_translate(
+                "MainWindow", "Error: Cannot send message from this address because you don't have this address in Your Identities."))
+        
+    def click_pushButtonSendToChan(self):
+        index = self.ui.comboBoxSendFrom.currentIndex()
+        self.on_addRecipient_submit(str(self.ui.comboBoxSendFrom.itemData(index).toString()))
+        
     def click_pushButtonFetchNamecoinID(self):
         currentText = str(self.ui.comboboxFindAddress.currentText())
         addressList = currentText.replace(',',';').split(';')
@@ -1810,8 +1826,10 @@ class MyForm(QtGui.QMainWindow):
         if shared.safeConfigGetBoolean(str(address), 'chan'):
             self.ui.radioButtonSpecific.click()
             self.ui.radioButtonBroadcast.setEnabled(False)
+            self.ui.pushButtonSendToChan.setEnabled(True)
         else:
             self.ui.radioButtonBroadcast.setEnabled(True)
+            self.ui.pushButtonSendToChan.setEnabled(False)
 
     def rerenderComboBoxSendFrom(self):
         self.ui.comboBoxSendFrom.clear()

src/bitmessageqt/bitmessageui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Wed Sep 11 21:08:23 2013
+# Created: Sun Sep 15 00:29:16 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(895, 576)
+        MainWindow.resize(1145, 586)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
@@ -105,70 +105,59 @@ class Ui_MainWindow(object):
         self.send.setObjectName(_fromUtf8("send"))
         self.gridLayout_2 = QtGui.QGridLayout(self.send)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.pushButtonFetchNamecoinID = QtGui.QPushButton(self.send)
+        self.radioButtonSpecific = QtGui.QRadioButton(self.send)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pushButtonFetchNamecoinID.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.radioButtonSpecific.sizePolicy().hasHeightForWidth())
-        self.pushButtonFetchNamecoinID.setSizePolicy(sizePolicy)
+        self.radioButtonSpecific.setSizePolicy(sizePolicy)
-        self.pushButtonFetchNamecoinID.setMinimumSize(QtCore.QSize(110, 0))
+        self.radioButtonSpecific.setChecked(True)
-        font = QtGui.QFont()
+        self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific"))
-        font.setPointSize(7)
+        self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 2, 1, 1)
-        self.pushButtonFetchNamecoinID.setFont(font)
-        self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
-        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 12, 4, 1, 1)
         self.label_4 = QtGui.QLabel(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_4.sizePolicy().hasHeightForWidth())
+        self.label_4.setSizePolicy(sizePolicy)
         self.label_4.setObjectName(_fromUtf8("label_4"))
-        self.gridLayout_2.addWidget(self.label_4, 15, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_4, 16, 0, 1, 1)
-        spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem, 16, 0, 1, 1)
         self.label_2 = QtGui.QLabel(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_2.sizePolicy().hasHeightForWidth())
+        self.label_2.setSizePolicy(sizePolicy)
         self.label_2.setObjectName(_fromUtf8("label_2"))
         self.gridLayout_2.addWidget(self.label_2, 2, 0, 1, 1)
         self.label_3 = QtGui.QLabel(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label_3.sizePolicy().hasHeightForWidth())
+        self.label_3.setSizePolicy(sizePolicy)
         self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.gridLayout_2.addWidget(self.label_3, 14, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_3, 15, 0, 1, 1)
-        self.lineEditSubject = QtGui.QLineEdit(self.send)
-        self.lineEditSubject.setText(_fromUtf8(""))
-        self.lineEditSubject.setObjectName(_fromUtf8("lineEditSubject"))
-        self.gridLayout_2.addWidget(self.lineEditSubject, 14, 2, 1, 3)
         self.comboBoxSendFrom = QtGui.QComboBox(self.send)
-        self.comboBoxSendFrom.setMinimumSize(QtCore.QSize(300, 0))
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.comboBoxSendFrom.sizePolicy().hasHeightForWidth())
+        self.comboBoxSendFrom.setSizePolicy(sizePolicy)
         self.comboBoxSendFrom.setEditable(True)
         self.comboBoxSendFrom.setInsertPolicy(QtGui.QComboBox.NoInsert)
         self.comboBoxSendFrom.setObjectName(_fromUtf8("comboBoxSendFrom"))
         self.gridLayout_2.addWidget(self.comboBoxSendFrom, 2, 2, 1, 1)
-        self.radioButtonSpecific = QtGui.QRadioButton(self.send)
+        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
-        self.radioButtonSpecific.setChecked(True)
-        self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific"))
-        self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 2, 1, 1)
-        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.pushButtonLoadFromAddressBook.sizePolicy().hasHeightForWidth())
+        sizePolicy.setHeightForWidth(self.radioButtonBroadcast.sizePolicy().hasHeightForWidth())
-        self.pushButtonLoadFromAddressBook.setSizePolicy(sizePolicy)
+        self.radioButtonBroadcast.setSizePolicy(sizePolicy)
-        self.pushButtonLoadFromAddressBook.setMinimumSize(QtCore.QSize(110, 0))
-        font = QtGui.QFont()
-        font.setPointSize(7)
-        self.pushButtonLoadFromAddressBook.setFont(font)
-        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
-        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 11, 4, 1, 1)
-        self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
-        self.labelSendBroadcastWarning.setEnabled(True)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.labelSendBroadcastWarning.sizePolicy().hasHeightForWidth())
-        self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
-        self.labelSendBroadcastWarning.setIndent(-1)
-        self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
-        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 17, 2, 1, 1)
-        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
         self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
         self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 2, 1, 1)
         self.tableWidgetRecipients = QtGui.QTableWidget(self.send)
-        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Fixed)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.tableWidgetRecipients.sizePolicy().hasHeightForWidth())
@@ -190,19 +179,97 @@ class Ui_MainWindow(object):
         self.tableWidgetRecipients.horizontalHeader().setStretchLastSection(True)
         self.tableWidgetRecipients.verticalHeader().setVisible(False)
         self.tableWidgetRecipients.verticalHeader().setDefaultSectionSize(20)
-        self.gridLayout_2.addWidget(self.tableWidgetRecipients, 11, 2, 2, 1)
+        self.gridLayout_2.addWidget(self.tableWidgetRecipients, 11, 2, 4, 3)
+        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonLoadFromAddressBook.sizePolicy().hasHeightForWidth())
+        self.pushButtonLoadFromAddressBook.setSizePolicy(sizePolicy)
+        self.pushButtonLoadFromAddressBook.setMinimumSize(QtCore.QSize(110, 0))
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonLoadFromAddressBook.setFont(font)
+        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
+        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 14, 5, 1, 1)
+        spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
+        self.gridLayout_2.addItem(spacerItem, 17, 0, 1, 1)
         self.textEditMessage = QtGui.QTextEdit(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.textEditMessage.sizePolicy().hasHeightForWidth())
+        self.textEditMessage.setSizePolicy(sizePolicy)
         self.textEditMessage.setObjectName(_fromUtf8("textEditMessage"))
-        self.gridLayout_2.addWidget(self.textEditMessage, 15, 2, 2, 3)
+        self.gridLayout_2.addWidget(self.textEditMessage, 16, 2, 2, 4)
+        self.lineEditSubject = QtGui.QLineEdit(self.send)
+        self.lineEditSubject.setText(_fromUtf8(""))
+        self.lineEditSubject.setObjectName(_fromUtf8("lineEditSubject"))
+        self.gridLayout_2.addWidget(self.lineEditSubject, 15, 2, 1, 4)
+        self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
+        self.labelSendBroadcastWarning.setEnabled(True)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.labelSendBroadcastWarning.sizePolicy().hasHeightForWidth())
+        self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
+        self.labelSendBroadcastWarning.setIndent(-1)
+        self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
+        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 18, 2, 1, 3)
+        self.pushButtonFetchNamecoinID = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonFetchNamecoinID.sizePolicy().hasHeightForWidth())
+        self.pushButtonFetchNamecoinID.setSizePolicy(sizePolicy)
+        self.pushButtonFetchNamecoinID.setMinimumSize(QtCore.QSize(110, 0))
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonFetchNamecoinID.setFont(font)
+        self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
+        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 12, 5, 1, 1)
         self.pushButtonSend = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonSend.sizePolicy().hasHeightForWidth())
+        self.pushButtonSend.setSizePolicy(sizePolicy)
         self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend"))
-        self.gridLayout_2.addWidget(self.pushButtonSend, 17, 4, 1, 1)
+        self.gridLayout_2.addWidget(self.pushButtonSend, 18, 5, 1, 1)
-        self.labelFrom = QtGui.QLabel(self.send)
-        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
-        self.gridLayout_2.addWidget(self.labelFrom, 2, 4, 1, 1)
         self.label = QtGui.QLabel(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.label.sizePolicy().hasHeightForWidth())
+        self.label.setSizePolicy(sizePolicy)
         self.label.setObjectName(_fromUtf8("label"))
-        self.gridLayout_2.addWidget(self.label, 11, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label, 12, 0, 1, 1)
+        self.pushButtonChanonymous = QtGui.QPushButton(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.pushButtonChanonymous.sizePolicy().hasHeightForWidth())
+        self.pushButtonChanonymous.setSizePolicy(sizePolicy)
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonChanonymous.setFont(font)
+        self.pushButtonChanonymous.setObjectName(_fromUtf8("pushButtonChanonymous"))
+        self.gridLayout_2.addWidget(self.pushButtonChanonymous, 13, 5, 1, 1)
+        self.labelFrom = QtGui.QLabel(self.send)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Preferred)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.labelFrom.sizePolicy().hasHeightForWidth())
+        self.labelFrom.setSizePolicy(sizePolicy)
+        self.labelFrom.setMinimumSize(QtCore.QSize(250, 0))
+        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
+        self.gridLayout_2.addWidget(self.labelFrom, 2, 3, 1, 1)
+        self.pushButtonSendToChan = QtGui.QPushButton(self.send)
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonSendToChan.setFont(font)
+        self.pushButtonSendToChan.setObjectName(_fromUtf8("pushButtonSendToChan"))
+        self.gridLayout_2.addWidget(self.pushButtonSendToChan, 2, 5, 1, 1)
         icon2 = QtGui.QIcon()
         icon2.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/send.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.send, icon2, _fromUtf8(""))
@@ -458,10 +525,10 @@ class Ui_MainWindow(object):
         icon9 = QtGui.QIcon()
         icon9.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/networkstatus.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.networkstatus, icon9, _fromUtf8(""))
-        self.gridLayout.addWidget(self.tabWidget, 1, 0, 1, 1)
+        self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
         MainWindow.setCentralWidget(self.centralwidget)
         self.menubar = QtGui.QMenuBar(MainWindow)
-        self.menubar.setGeometry(QtCore.QRect(0, 0, 895, 18))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 1145, 18))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -566,27 +633,30 @@ class Ui_MainWindow(object):
         item = self.tableWidgetInbox.horizontalHeaderItem(3)
         item.setText(_translate("MainWindow", "Received", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), _translate("MainWindow", "Inbox", None))
-        self.pushButtonFetchNamecoinID.setText(_translate("MainWindow", "Fetch Namecoin ID", None))
+        self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
         self.label_4.setText(_translate("MainWindow", "Message:", None))
         self.label_2.setText(_translate("MainWindow", "From:", None))
         self.label_3.setText(_translate("MainWindow", "Subject:", None))
-        self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
-        self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None))
-        self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
         self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
         self.tableWidgetRecipients.setSortingEnabled(True)
         item = self.tableWidgetRecipients.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Name or Label", None))
         item = self.tableWidgetRecipients.horizontalHeaderItem(1)
         item.setText(_translate("MainWindow", "Address", None))
+        self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None))
         self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
 "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p></body></html>", None))
+        self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
+        self.pushButtonFetchNamecoinID.setText(_translate("MainWindow", "Fetch Namecoin ID", None))
         self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
-        self.labelFrom.setText(_translate("MainWindow", "BM-…", None))
         self.label.setText(_translate("MainWindow", "To:", None))
+        self.pushButtonChanonymous.setToolTip(_translate("MainWindow", "Sets the selected chan address as the \'From\' field.", None))
+        self.pushButtonChanonymous.setText(_translate("MainWindow", "chanonymous", None))
+        self.labelFrom.setText(_translate("MainWindow", "BM-…", None))
+        self.pushButtonSendToChan.setText(_translate("MainWindow", "Send to chan", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
         self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
         self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))

src/bitmessageqt/bitmessageui.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>895</width>
+    <width>1145</width>
-    <height>576</height>
+    <height>586</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
     <property name="margin">
      <number>0</number>
     </property>
-    <item row="1" column="0">
+    <item row="0" column="0">
      <widget class="QTabWidget" name="tabWidget">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -192,78 +192,68 @@
         <string>Send</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="12" column="4">
+        <item row="0" column="2">
-         <widget class="QPushButton" name="pushButtonFetchNamecoinID">
+         <widget class="QRadioButton" name="radioButtonSpecific">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>7</pointsize>
-           </font>
-          </property>
           <property name="text">
-           <string>Fetch Namecoin ID</string>
+           <string>Send to one or more specific people</string>
+          </property>
+          <property name="checked">
+           <bool>true</bool>
           </property>
          </widget>
         </item>
-        <item row="15" column="0">
+        <item row="16" column="0">
          <widget class="QLabel" name="label_4">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Message:</string>
           </property>
          </widget>
         </item>
-        <item row="16" column="0">
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>297</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
         <item row="2" column="0">
          <widget class="QLabel" name="label_2">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>From:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="0">
+        <item row="15" column="0">
          <widget class="QLabel" name="label_3">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Subject:</string>
           </property>
          </widget>
         </item>
-        <item row="14" column="2" colspan="3">
-         <widget class="QLineEdit" name="lineEditSubject">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
         <item row="2" column="2">
          <widget class="QComboBox" name="comboBoxSendFrom">
-          <property name="minimumSize">
+          <property name="sizePolicy">
-           <size>
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-            <width>300</width>
+            <horstretch>0</horstretch>
-            <height>0</height>
+            <verstretch>0</verstretch>
-           </size>
+           </sizepolicy>
           </property>
           <property name="editable">
            <bool>true</bool>
@@ -273,70 +263,23 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="2">
+        <item row="1" column="2">
-         <widget class="QRadioButton" name="radioButtonSpecific">
+         <widget class="QRadioButton" name="radioButtonBroadcast">
-          <property name="text">
-           <string>Send to one or more specific people</string>
-          </property>
-          <property name="checked">
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item row="11" column="4">
-         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
           <property name="sizePolicy">
            <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
           </property>
-          <property name="minimumSize">
-           <size>
-            <width>110</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="font">
-           <font>
-            <pointsize>7</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Load from Address book</string>
-          </property>
-         </widget>
-        </item>
-        <item row="17" column="2">
-         <widget class="QLabel" name="labelSendBroadcastWarning">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Ignored" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="text">
-           <string>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</string>
-          </property>
-          <property name="indent">
-           <number>-1</number>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QRadioButton" name="radioButtonBroadcast">
           <property name="text">
            <string>Broadcast to everyone who is subscribed to your address</string>
           </property>
          </widget>
         </item>
-        <item row="11" column="2" rowspan="2">
+        <item row="11" column="2" rowspan="4" colspan="3">
          <widget class="QTableWidget" name="tableWidgetRecipients">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>0</horstretch>
             <verstretch>0</verstretch>
            </sizepolicy>
@@ -389,8 +332,51 @@
           </column>
          </widget>
         </item>
-        <item row="15" column="2" rowspan="2" colspan="3">
+        <item row="14" column="5">
+         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Load from Address book</string>
+          </property>
+         </widget>
+        </item>
+        <item row="17" column="0">
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>297</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="16" column="2" rowspan="2" colspan="4">
          <widget class="QTextEdit" name="textEditMessage">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="html">
            <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
@@ -400,24 +386,131 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="17" column="4">
+        <item row="15" column="2" colspan="4">
+         <widget class="QLineEdit" name="lineEditSubject">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="2" colspan="3">
+         <widget class="QLabel" name="labelSendBroadcastWarning">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.</string>
+          </property>
+          <property name="indent">
+           <number>-1</number>
+          </property>
+         </widget>
+        </item>
+        <item row="12" column="5">
+         <widget class="QPushButton" name="pushButtonFetchNamecoinID">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>110</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Fetch Namecoin ID</string>
+          </property>
+         </widget>
+        </item>
+        <item row="18" column="5">
          <widget class="QPushButton" name="pushButtonSend">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="text">
            <string>Send</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="4">
+        <item row="12" column="0">
+         <widget class="QLabel" name="label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>To:</string>
+          </property>
+         </widget>
+        </item>
+        <item row="13" column="5">
+         <widget class="QPushButton" name="pushButtonChanonymous">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="toolTip">
+           <string>Sets the selected chan address as the 'From' field.</string>
+          </property>
+          <property name="text">
+           <string>chanonymous</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="3">
          <widget class="QLabel" name="labelFrom">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>250</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="text">
            <string>BM-…</string>
           </property>
          </widget>
         </item>
-        <item row="11" column="0">
+        <item row="2" column="5">
-         <widget class="QLabel" name="label">
+         <widget class="QPushButton" name="pushButtonSendToChan">
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
           <property name="text">
-           <string>To:</string>
+           <string>Send to chan</string>
           </property>
          </widget>
         </item>
@@ -1092,7 +1185,7 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>895</width>
+     <width>1145</width>
      <height>18</height>
     </rect>
    </property>

src/bitmessageqt/settings.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'settings.ui'
 #
-# Created: Wed Sep 11 21:08:23 2013
+# Created: Sun Sep 15 00:29:16 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!