src/bitmessageqt/__init__.py

@@ -117,6 +117,8 @@ 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.pushButtonFetchNamecoinID, QtCore.SIGNAL(
+            "clicked()"), self.click_pushButtonFetchNamecoinID)
         QtCore.QObject.connect(self.ui.radioButtonBlacklist, QtCore.SIGNAL(
             "clicked()"), self.click_radioButtonBlacklist)
         QtCore.QObject.connect(self.ui.radioButtonWhitelist, QtCore.SIGNAL(
@@ -1454,6 +1456,9 @@ 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_pushButtonFetchNamecoinID(self):
+        self.ui.lineEditTo.setText ("BM-Foobar")
+
     def redrawLabelFrom(self, index):
         self.ui.labelFrom.setText(
             self.ui.comboBoxSendFrom.itemData(index).toPyObject())

src/bitmessageqt/bitmessageui.py

@@ -2,8 +2,8 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Thu Jun 13 01:02:50 2013
+# Created: Thu Jul  4 22:00:02 2013
-#      by: PyQt4 UI code generator 4.10.1
+#      by: PyQt4 UI code generator 4.9.3
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,16 +12,7 @@ from PyQt4 import QtCore, QtGui
 try:
     _fromUtf8 = QtCore.QString.fromUtf8
 except AttributeError:
-    def _fromUtf8(s):
+    _fromUtf8 = lambda s: s
-        return s
-
-try:
-    _encoding = QtGui.QApplication.UnicodeUTF8
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
-    def _translate(context, text, disambig):
-        return QtGui.QApplication.translate(context, text, disambig)
 
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
@@ -95,7 +86,13 @@ class Ui_MainWindow(object):
         font.setPointSize(7)
         self.pushButtonLoadFromAddressBook.setFont(font)
         self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
-        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 3, 2, 1, 2)
+        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 3, 2, 1, 1)
+        self.pushButtonFetchNamecoinID = QtGui.QPushButton(self.send)
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonFetchNamecoinID.setFont(font)
+        self.pushButtonFetchNamecoinID.setObjectName(_fromUtf8("pushButtonFetchNamecoinID"))
+        self.gridLayout_2.addWidget(self.pushButtonFetchNamecoinID, 3, 3, 1, 1)
         self.label_4 = QtGui.QLabel(self.send)
         self.label_4.setObjectName(_fromUtf8("label_4"))
         self.gridLayout_2.addWidget(self.label_4, 5, 0, 1, 1)
@@ -466,106 +463,97 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.tableWidgetConnectionCount, self.pushButtonStatusIcon)
 
     def retranslateUi(self, MainWindow):
-        MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None))
+        MainWindow.setWindowTitle(QtGui.QApplication.translate("MainWindow", "Bitmessage", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetInbox.setSortingEnabled(True)
         item = self.tableWidgetInbox.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "To", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "To", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetInbox.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "From", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "From", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetInbox.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Subject", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Subject", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetInbox.horizontalHeaderItem(3)
-        item.setText(_translate("MainWindow", "Received", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Received", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), _translate("MainWindow", "Inbox", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.inbox), QtGui.QApplication.translate("MainWindow", "Inbox", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonLoadFromAddressBook.setText(_translate("MainWindow", "Load from Address book", None))
+        self.pushButtonLoadFromAddressBook.setText(QtGui.QApplication.translate("MainWindow", "Load from Address book", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_4.setText(_translate("MainWindow", "Message:", None))
+        self.pushButtonFetchNamecoinID.setText(QtGui.QApplication.translate("MainWindow", "Fetch Namecoin ID", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_3.setText(_translate("MainWindow", "Subject:", None))
+        self.label_4.setText(QtGui.QApplication.translate("MainWindow", "Message:", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
+        self.label_3.setText(QtGui.QApplication.translate("MainWindow", "Subject:", None, QtGui.QApplication.UnicodeUTF8))
-        self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
+        self.radioButtonSpecific.setText(QtGui.QApplication.translate("MainWindow", "Send to one or more specific people", None, QtGui.QApplication.UnicodeUTF8))
+        self.textEditMessage.setHtml(QtGui.QApplication.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))
+"<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, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(_translate("MainWindow", "To:", None))
+        self.label.setText(QtGui.QApplication.translate("MainWindow", "To:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(_translate("MainWindow", "From:", None))
+        self.label_2.setText(QtGui.QApplication.translate("MainWindow", "From:", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
+        self.radioButtonBroadcast.setText(QtGui.QApplication.translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
+        self.pushButtonSend.setText(QtGui.QApplication.translate("MainWindow", "Send", None, QtGui.QApplication.UnicodeUTF8))
-        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.labelSendBroadcastWarning.setText(QtGui.QApplication.translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), QtGui.QApplication.translate("MainWindow", "Send", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetSent.setSortingEnabled(True)
         item = self.tableWidgetSent.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "To", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "To", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetSent.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "From", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "From", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetSent.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Subject", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Subject", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetSent.horizontalHeaderItem(3)
-        item.setText(_translate("MainWindow", "Status", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Status", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.sent), _translate("MainWindow", "Sent", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.sent), QtGui.QApplication.translate("MainWindow", "Sent", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonNewAddress.setText(_translate("MainWindow", "New", None))
+        self.pushButtonNewAddress.setText(QtGui.QApplication.translate("MainWindow", "New", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetYourIdentities.setSortingEnabled(True)
         item = self.tableWidgetYourIdentities.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Label (not shown to anyone)", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Label (not shown to anyone)", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetYourIdentities.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Address", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetYourIdentities.horizontalHeaderItem(2)
-        item.setText(_translate("MainWindow", "Stream", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Stream", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.youridentities), _translate("MainWindow", "Your Identities", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.youridentities), QtGui.QApplication.translate("MainWindow", "Your Identities", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_5.setText(_translate("MainWindow", "Here you can subscribe to \'broadcast messages\' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.", None))
+        self.label_5.setText(QtGui.QApplication.translate("MainWindow", "Here you can subscribe to \'broadcast messages\' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonAddSubscription.setText(_translate("MainWindow", "Add new Subscription", None))
+        self.pushButtonAddSubscription.setText(QtGui.QApplication.translate("MainWindow", "Add new Subscription", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetSubscriptions.setSortingEnabled(True)
         item = self.tableWidgetSubscriptions.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Label", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Label", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetSubscriptions.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Address", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.subscriptions), _translate("MainWindow", "Subscriptions", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.subscriptions), QtGui.QApplication.translate("MainWindow", "Subscriptions", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_6.setText(_translate("MainWindow", "The Address book is useful for adding names or labels to other people\'s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the \'Add\' button, or from your inbox by right-clicking on a message.", None))
+        self.label_6.setText(QtGui.QApplication.translate("MainWindow", "The Address book is useful for adding names or labels to other people\'s Bitmessage addresses so that you can recognize them more easily in your inbox. You can add entries here using the \'Add\' button, or from your inbox by right-clicking on a message.", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonAddAddressBook.setText(_translate("MainWindow", "Add new entry", None))
+        self.pushButtonAddAddressBook.setText(QtGui.QApplication.translate("MainWindow", "Add new entry", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetAddressBook.setSortingEnabled(True)
         item = self.tableWidgetAddressBook.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Name or Label", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Name or Label", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetAddressBook.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Address", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.addressbook), _translate("MainWindow", "Address Book", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.addressbook), QtGui.QApplication.translate("MainWindow", "Address Book", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonBlacklist.setText(_translate("MainWindow", "Use a Blacklist (Allow all incoming messages except those on the Blacklist)", None))
+        self.radioButtonBlacklist.setText(QtGui.QApplication.translate("MainWindow", "Use a Blacklist (Allow all incoming messages except those on the Blacklist)", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonWhitelist.setText(_translate("MainWindow", "Use a Whitelist (Block all incoming messages except those on the Whitelist)", None))
+        self.radioButtonWhitelist.setText(QtGui.QApplication.translate("MainWindow", "Use a Whitelist (Block all incoming messages except those on the Whitelist)", None, QtGui.QApplication.UnicodeUTF8))
-        self.pushButtonAddBlacklist.setText(_translate("MainWindow", "Add new entry", None))
+        self.pushButtonAddBlacklist.setText(QtGui.QApplication.translate("MainWindow", "Add new entry", None, QtGui.QApplication.UnicodeUTF8))
         self.tableWidgetBlacklist.setSortingEnabled(True)
         item = self.tableWidgetBlacklist.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Name or Label", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Name or Label", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetBlacklist.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Address", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Address", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.blackwhitelist), _translate("MainWindow", "Blacklist", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.blackwhitelist), QtGui.QApplication.translate("MainWindow", "Blacklist", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetConnectionCount.horizontalHeaderItem(0)
-        item.setText(_translate("MainWindow", "Stream #", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Stream #", None, QtGui.QApplication.UnicodeUTF8))
         item = self.tableWidgetConnectionCount.horizontalHeaderItem(1)
-        item.setText(_translate("MainWindow", "Connections", None))
+        item.setText(QtGui.QApplication.translate("MainWindow", "Connections", None, QtGui.QApplication.UnicodeUTF8))
-        self.labelTotalConnections.setText(_translate("MainWindow", "Total connections: 0", None))
+        self.labelTotalConnections.setText(QtGui.QApplication.translate("MainWindow", "Total connections: 0", None, QtGui.QApplication.UnicodeUTF8))
-        self.labelStartupTime.setText(_translate("MainWindow", "Since startup at asdf:", None))
+        self.labelStartupTime.setText(QtGui.QApplication.translate("MainWindow", "Since startup at asdf:", None, QtGui.QApplication.UnicodeUTF8))
-        self.labelMessageCount.setText(_translate("MainWindow", "Processed 0 person-to-person message.", None))
+        self.labelMessageCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 person-to-person message.", None, QtGui.QApplication.UnicodeUTF8))
-        self.labelPubkeyCount.setText(_translate("MainWindow", "Processed 0 public key.", None))
+        self.labelPubkeyCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 public key.", None, QtGui.QApplication.UnicodeUTF8))
-        self.labelBroadcastCount.setText(_translate("MainWindow", "Processed 0 broadcast.", None))
+        self.labelBroadcastCount.setText(QtGui.QApplication.translate("MainWindow", "Processed 0 broadcast.", None, QtGui.QApplication.UnicodeUTF8))
-        self.tabWidget.setTabText(self.tabWidget.indexOf(self.networkstatus), _translate("MainWindow", "Network Status", None))
+        self.tabWidget.setTabText(self.tabWidget.indexOf(self.networkstatus), QtGui.QApplication.translate("MainWindow", "Network Status", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuFile.setTitle(_translate("MainWindow", "File", None))
+        self.menuFile.setTitle(QtGui.QApplication.translate("MainWindow", "File", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuSettings.setTitle(_translate("MainWindow", "Settings", None))
+        self.menuSettings.setTitle(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
-        self.menuHelp.setTitle(_translate("MainWindow", "Help", None))
+        self.menuHelp.setTitle(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionImport_keys.setText(_translate("MainWindow", "Import keys", None))
+        self.actionImport_keys.setText(QtGui.QApplication.translate("MainWindow", "Import keys", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionManageKeys.setText(_translate("MainWindow", "Manage keys", None))
+        self.actionManageKeys.setText(QtGui.QApplication.translate("MainWindow", "Manage keys", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionExit.setText(_translate("MainWindow", "Quit", None))
+        self.actionExit.setText(QtGui.QApplication.translate("MainWindow", "Quit", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionHelp.setText(_translate("MainWindow", "Help", None))
+        self.actionHelp.setText(QtGui.QApplication.translate("MainWindow", "Help", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionAbout.setText(_translate("MainWindow", "About", None))
+        self.actionAbout.setText(QtGui.QApplication.translate("MainWindow", "About", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionSettings.setText(_translate("MainWindow", "Settings", None))
+        self.actionSettings.setText(QtGui.QApplication.translate("MainWindow", "Settings", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionRegenerateDeterministicAddresses.setText(_translate("MainWindow", "Regenerate deterministic addresses", None))
+        self.actionRegenerateDeterministicAddresses.setText(QtGui.QApplication.translate("MainWindow", "Regenerate deterministic addresses", None, QtGui.QApplication.UnicodeUTF8))
-        self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
+        self.actionDeleteAllTrashedMessages.setText(QtGui.QApplication.translate("MainWindow", "Delete all trashed messages", None, QtGui.QApplication.UnicodeUTF8))
 
 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_())
-

src/bitmessageqt/bitmessageui.ui

@@ -152,7 +152,7 @@
         <string>Send</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="3" column="2" colspan="2">
+        <item row="3" column="2">
          <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
           <property name="font">
            <font>
@@ -164,6 +164,18 @@
           </property>
          </widget>
         </item>
+        <item row="3" column="3">
+         <widget class="QPushButton" name="pushButtonFetchNamecoinID">
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Fetch Namecoin ID</string>
+          </property>
+         </widget>
+        </item>
         <item row="5" column="0">
          <widget class="QLabel" name="label_4">
           <property name="text">