modified: __init__.py

modified:   bitmessageui.py
	modified:   bitmessageui.ui

src/bitmessageqt/__init__.py

@@ -29,6 +29,8 @@ import os
 from pyelliptic.openssl import OpenSSL
 import pickle
 import platform
+import base64
+
 
 try:
     from PyQt4 import QtCore, QtGui
@@ -57,6 +59,9 @@ class MyForm(QtGui.QMainWindow):
         self.ui = Ui_MainWindow()
         self.ui.setupUi(self)
 
+        #init attach array
+        self.attach=[]
+
         # Ask the user if we may delete their old version 1 addresses if they
         # have any.
         configSections = shared.config.sections()
@@ -543,6 +548,13 @@ class MyForm(QtGui.QMainWindow):
             "itemChanged(QTableWidgetItem *)"), self.tableWidgetSubscriptionsItemChanged)
         QtCore.QObject.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL(
             "itemSelectionChanged ()"), self.tableWidgetInboxItemClicked)
+        
+        QtCore.QObject.connect(self.ui.textEditInboxMessage,
+             QtCore.SIGNAL("anchorClicked(const QUrl&)"), self.openURL)
+        
+        QtCore.QObject.connect(self.ui.AddAttach, QtCore.SIGNAL("clicked()"), self.AddAttach)
+        
+        
         QtCore.QObject.connect(self.ui.tableWidgetSent, QtCore.SIGNAL(
             "itemSelectionChanged ()"), self.tableWidgetSentItemClicked)
 
@@ -615,6 +627,43 @@ class MyForm(QtGui.QMainWindow):
     # The most recent broadcast
     newBroadcastItem = None
 
+
+    def openURL(self,link):
+        print "jest link"
+
+    def AddAttach(self):
+        attachFile=QtGui.QFileDialog.getOpenFileName(self, 'Open file', '')
+        f = open(attachFile, 'r')
+        
+        
+        attachFile=str(attachFile)
+        AFile = attachFile.split("/")[-1]
+        
+        ext = AFile.split(".")[-1]
+        
+        ext = ext.lower()
+                
+        with f:        
+            data = f.read()
+        
+        if ext == 'jpg' or ext == 'png' or ext == 'gif':
+            if ext == 'jpg' or ext == 'jpeg':
+                t='image/jpeg'
+            else:
+                t='image/'+ext
+        else:
+            t='application/octet-stream;'
+        
+        #encode base64 file
+        dataenc = base64.b64encode(data)
+        content = "\nContent-Type: image/pjpeg;"
+        content+="name=\""+AFile+"\""
+        content+="\nContent-Transfer-Encoding: base64\n"
+        content+="Content-Disposition: attachment; filename=\""+AFile+"\"\n\n"
+        content+=dataenc
+        self.ui.attachmentListSend.addItem(AFile)
+        self.attach.append(content)
+
     # show the application window
     def appIndicatorShow(self):
         if self.actionShow is None:
@@ -1278,6 +1327,12 @@ class MyForm(QtGui.QMainWindow):
         subject = str(self.ui.lineEditSubject.text().toUtf8())
         message = str(
         self.ui.textEditMessage.document().toPlainText().toUtf8())
+        message+=str("\n".join(self.attach)+"\n")
+        self.attach=[]
+        #self.ui.attachmentListSend
+            
+            
+            
         if self.ui.radioButtonSpecific.isChecked():  # To send a message to specific people (rather than broadcast)
             toAddressesList = [s.strip()
                                for s in toAddresses.replace(',', ';').split(';')]

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: Fri Jul 12 22:39:30 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,21 +12,12 @@ 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):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(795, 561)
+        MainWindow.resize(835, 578)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
@@ -55,6 +46,11 @@ class Ui_MainWindow(object):
         self.verticalLayout_2 = QtGui.QVBoxLayout(self.inbox)
         self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
         self.tableWidgetInbox = QtGui.QTableWidget(self.inbox)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.tableWidgetInbox.sizePolicy().hasHeightForWidth())
+        self.tableWidgetInbox.setSizePolicy(sizePolicy)
         self.tableWidgetInbox.setAlternatingRowColors(True)
         self.tableWidgetInbox.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
         self.tableWidgetInbox.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
@@ -79,8 +75,14 @@ class Ui_MainWindow(object):
         self.tableWidgetInbox.verticalHeader().setVisible(False)
         self.tableWidgetInbox.verticalHeader().setDefaultSectionSize(26)
         self.verticalLayout_2.addWidget(self.tableWidgetInbox)
-        self.textEditInboxMessage = QtGui.QTextEdit(self.inbox)
+        self.textEditInboxMessage = QtGui.QTextBrowser(self.inbox)
+        sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.textEditInboxMessage.sizePolicy().hasHeightForWidth())
+        self.textEditInboxMessage.setSizePolicy(sizePolicy)
         self.textEditInboxMessage.setBaseSize(QtCore.QSize(0, 500))
+        self.textEditInboxMessage.setOpenLinks(False)
         self.textEditInboxMessage.setObjectName(_fromUtf8("textEditInboxMessage"))
         self.verticalLayout_2.addWidget(self.textEditInboxMessage)
         icon1 = QtGui.QIcon()
@@ -90,56 +92,44 @@ class Ui_MainWindow(object):
         self.send.setObjectName(_fromUtf8("send"))
         self.gridLayout_2 = QtGui.QGridLayout(self.send)
         self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2"))
-        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
-        font = QtGui.QFont()
-        font.setPointSize(7)
-        self.pushButtonLoadFromAddressBook.setFont(font)
-        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
-        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 3, 2, 1, 2)
         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)
+        self.gridLayout_2.addWidget(self.label_4, 10, 0, 1, 1)
         self.comboBoxSendFrom = QtGui.QComboBox(self.send)
         self.comboBoxSendFrom.setMinimumSize(QtCore.QSize(300, 0))
         self.comboBoxSendFrom.setObjectName(_fromUtf8("comboBoxSendFrom"))
         self.gridLayout_2.addWidget(self.comboBoxSendFrom, 2, 1, 1, 1)
         self.label_3 = QtGui.QLabel(self.send)
         self.label_3.setObjectName(_fromUtf8("label_3"))
-        self.gridLayout_2.addWidget(self.label_3, 4, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label_3, 9, 0, 1, 1)
-        self.labelFrom = QtGui.QLabel(self.send)
-        self.labelFrom.setText(_fromUtf8(""))
-        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
-        self.gridLayout_2.addWidget(self.labelFrom, 2, 2, 1, 3)
         self.radioButtonSpecific = QtGui.QRadioButton(self.send)
         self.radioButtonSpecific.setChecked(True)
         self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific"))
         self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 1, 1, 1)
         self.lineEditTo = QtGui.QLineEdit(self.send)
         self.lineEditTo.setObjectName(_fromUtf8("lineEditTo"))
-        self.gridLayout_2.addWidget(self.lineEditTo, 3, 1, 1, 1)
+        self.gridLayout_2.addWidget(self.lineEditTo, 6, 1, 1, 1)
         self.textEditMessage = QtGui.QTextEdit(self.send)
         self.textEditMessage.setObjectName(_fromUtf8("textEditMessage"))
-        self.gridLayout_2.addWidget(self.textEditMessage, 5, 1, 2, 5)
+        self.gridLayout_2.addWidget(self.textEditMessage, 10, 1, 2, 5)
+        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
+        self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
+        self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 1, 1, 3)
         self.label = QtGui.QLabel(self.send)
         self.label.setObjectName(_fromUtf8("label"))
-        self.gridLayout_2.addWidget(self.label, 3, 0, 1, 1)
+        self.gridLayout_2.addWidget(self.label, 6, 0, 1, 1)
         self.label_2 = QtGui.QLabel(self.send)
         self.label_2.setObjectName(_fromUtf8("label_2"))
         self.gridLayout_2.addWidget(self.label_2, 2, 0, 1, 1)
         spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding)
-        self.gridLayout_2.addItem(spacerItem, 6, 0, 1, 1)
+        self.gridLayout_2.addItem(spacerItem, 11, 0, 1, 1)
-        self.radioButtonBroadcast = QtGui.QRadioButton(self.send)
-        self.radioButtonBroadcast.setObjectName(_fromUtf8("radioButtonBroadcast"))
-        self.gridLayout_2.addWidget(self.radioButtonBroadcast, 1, 1, 1, 3)
         self.lineEditSubject = QtGui.QLineEdit(self.send)
         self.lineEditSubject.setText(_fromUtf8(""))
         self.lineEditSubject.setObjectName(_fromUtf8("lineEditSubject"))
-        self.gridLayout_2.addWidget(self.lineEditSubject, 4, 1, 1, 5)
+        self.gridLayout_2.addWidget(self.lineEditSubject, 9, 1, 1, 5)
-        spacerItem1 = QtGui.QSpacerItem(20, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_2.addItem(spacerItem1, 3, 4, 1, 1)
         self.pushButtonSend = QtGui.QPushButton(self.send)
         self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend"))
-        self.gridLayout_2.addWidget(self.pushButtonSend, 7, 5, 1, 1)
+        self.gridLayout_2.addWidget(self.pushButtonSend, 12, 5, 1, 1)
         self.labelSendBroadcastWarning = QtGui.QLabel(self.send)
         self.labelSendBroadcastWarning.setEnabled(True)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Preferred)
@@ -149,7 +139,26 @@ class Ui_MainWindow(object):
         self.labelSendBroadcastWarning.setSizePolicy(sizePolicy)
         self.labelSendBroadcastWarning.setIndent(-1)
         self.labelSendBroadcastWarning.setObjectName(_fromUtf8("labelSendBroadcastWarning"))
-        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 7, 1, 1, 4)
+        self.gridLayout_2.addWidget(self.labelSendBroadcastWarning, 12, 1, 1, 4)
+        self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send)
+        font = QtGui.QFont()
+        font.setPointSize(7)
+        self.pushButtonLoadFromAddressBook.setFont(font)
+        self.pushButtonLoadFromAddressBook.setObjectName(_fromUtf8("pushButtonLoadFromAddressBook"))
+        self.gridLayout_2.addWidget(self.pushButtonLoadFromAddressBook, 6, 2, 1, 2)
+        self.attachmentListSend = QtGui.QListWidget(self.send)
+        self.attachmentListSend.setObjectName(_fromUtf8("attachmentListSend"))
+        self.gridLayout_2.addWidget(self.attachmentListSend, 0, 4, 4, 2)
+        self.DelAttach = QtGui.QPushButton(self.send)
+        self.DelAttach.setObjectName(_fromUtf8("DelAttach"))
+        self.gridLayout_2.addWidget(self.DelAttach, 6, 5, 1, 1)
+        self.AddAttach = QtGui.QPushButton(self.send)
+        self.AddAttach.setObjectName(_fromUtf8("AddAttach"))
+        self.gridLayout_2.addWidget(self.AddAttach, 6, 4, 1, 1)
+        self.labelFrom = QtGui.QLabel(self.send)
+        self.labelFrom.setText(_fromUtf8(""))
+        self.labelFrom.setObjectName(_fromUtf8("labelFrom"))
+        self.gridLayout_2.addWidget(self.labelFrom, 3, 1, 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(""))
@@ -195,8 +204,8 @@ class Ui_MainWindow(object):
         self.pushButtonNewAddress = QtGui.QPushButton(self.youridentities)
         self.pushButtonNewAddress.setObjectName(_fromUtf8("pushButtonNewAddress"))
         self.gridLayout_3.addWidget(self.pushButtonNewAddress, 0, 0, 1, 1)
-        spacerItem2 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        spacerItem1 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem2, 0, 1, 1, 1)
+        self.gridLayout_3.addItem(spacerItem1, 0, 1, 1, 1)
         self.tableWidgetYourIdentities = QtGui.QTableWidget(self.youridentities)
         self.tableWidgetYourIdentities.setFrameShadow(QtGui.QFrame.Sunken)
         self.tableWidgetYourIdentities.setLineWidth(1)
@@ -239,8 +248,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddSubscription = QtGui.QPushButton(self.subscriptions)
         self.pushButtonAddSubscription.setObjectName(_fromUtf8("pushButtonAddSubscription"))
         self.gridLayout_4.addWidget(self.pushButtonAddSubscription, 1, 0, 1, 1)
-        spacerItem3 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        spacerItem2 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_4.addItem(spacerItem3, 1, 1, 1, 1)
+        self.gridLayout_4.addItem(spacerItem2, 1, 1, 1, 1)
         self.tableWidgetSubscriptions = QtGui.QTableWidget(self.subscriptions)
         self.tableWidgetSubscriptions.setAlternatingRowColors(True)
         self.tableWidgetSubscriptions.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
@@ -273,8 +282,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddAddressBook = QtGui.QPushButton(self.addressbook)
         self.pushButtonAddAddressBook.setObjectName(_fromUtf8("pushButtonAddAddressBook"))
         self.gridLayout_5.addWidget(self.pushButtonAddAddressBook, 1, 0, 1, 1)
-        spacerItem4 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        spacerItem3 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_5.addItem(spacerItem4, 1, 1, 1, 1)
+        self.gridLayout_5.addItem(spacerItem3, 1, 1, 1, 1)
         self.tableWidgetAddressBook = QtGui.QTableWidget(self.addressbook)
         self.tableWidgetAddressBook.setAlternatingRowColors(True)
         self.tableWidgetAddressBook.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -309,8 +318,8 @@ class Ui_MainWindow(object):
         self.pushButtonAddBlacklist = QtGui.QPushButton(self.blackwhitelist)
         self.pushButtonAddBlacklist.setObjectName(_fromUtf8("pushButtonAddBlacklist"))
         self.gridLayout_6.addWidget(self.pushButtonAddBlacklist, 2, 0, 1, 1)
-        spacerItem5 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
+        spacerItem4 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_6.addItem(spacerItem5, 2, 1, 1, 1)
+        self.gridLayout_6.addItem(spacerItem4, 2, 1, 1, 1)
         self.tableWidgetBlacklist = QtGui.QTableWidget(self.blackwhitelist)
         self.tableWidgetBlacklist.setAlternatingRowColors(True)
         self.tableWidgetBlacklist.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
@@ -392,7 +401,7 @@ class Ui_MainWindow(object):
         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, 795, 18))
+        self.menubar.setGeometry(QtCore.QRect(0, 0, 835, 25))
         self.menubar.setObjectName(_fromUtf8("menubar"))
         self.menuFile = QtGui.QMenu(self.menubar)
         self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -466,106 +475,98 @@ 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.label_4.setText(QtGui.QApplication.translate("MainWindow", "Message:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_4.setText(_translate("MainWindow", "Message:", None))
+        self.label_3.setText(QtGui.QApplication.translate("MainWindow", "Subject:", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_3.setText(_translate("MainWindow", "Subject:", None))
+        self.radioButtonSpecific.setText(QtGui.QApplication.translate("MainWindow", "Send to one or more specific people", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonSpecific.setText(_translate("MainWindow", "Send to one or more specific people", None))
+        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"
-        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"
+"</style></head><body style=\" font-family:\'Sans\'; 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; font-family:\'MS Shell Dlg 2\';\"><br /></p></body></html>", None, QtGui.QApplication.UnicodeUTF8))
-        self.label.setText(_translate("MainWindow", "To:", None))
+        self.radioButtonBroadcast.setText(QtGui.QApplication.translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None, QtGui.QApplication.UnicodeUTF8))
-        self.label_2.setText(_translate("MainWindow", "From:", None))
+        self.label.setText(QtGui.QApplication.translate("MainWindow", "To:", None, QtGui.QApplication.UnicodeUTF8))
-        self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
+        self.label_2.setText(QtGui.QApplication.translate("MainWindow", "From:", 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.pushButtonLoadFromAddressBook.setText(QtGui.QApplication.translate("MainWindow", "Load from Address book", None, QtGui.QApplication.UnicodeUTF8))
+        self.DelAttach.setText(QtGui.QApplication.translate("MainWindow", "Delete attach", None, QtGui.QApplication.UnicodeUTF8))
+        self.AddAttach.setText(QtGui.QApplication.translate("MainWindow", "Add attach", None, QtGui.QApplication.UnicodeUTF8))
+        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

@@ -6,15 +6,15 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>795</width>
+    <width>835</width>
-    <height>561</height>
+    <height>578</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Bitmessage</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="bitmessage_icons.qrc">
+   <iconset>
     <normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset>
   </property>
   <property name="tabShape">
@@ -61,7 +61,7 @@
       </property>
       <widget class="QWidget" name="inbox">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset>
        </attribute>
        <attribute name="title">
@@ -70,6 +70,12 @@
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QTableWidget" name="tableWidgetInbox">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="alternatingRowColors">
            <bool>true</bool>
           </property>
@@ -132,39 +138,36 @@
          </widget>
         </item>
         <item>
-         <widget class="QTextEdit" name="textEditInboxMessage">
+         <widget class="QTextBrowser" name="textEditInboxMessage">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
           <property name="baseSize">
            <size>
             <width>0</width>
             <height>500</height>
            </size>
           </property>
+          <property name="openLinks">
+           <bool>false</bool>
+          </property>
          </widget>
         </item>
        </layout>
       </widget>
       <widget class="QWidget" name="send">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset>
        </attribute>
        <attribute name="title">
         <string>Send</string>
        </attribute>
        <layout class="QGridLayout" name="gridLayout_2">
-        <item row="3" column="2" colspan="2">
+        <item row="10" column="0">
-         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
-          <property name="font">
-           <font>
-            <pointsize>7</pointsize>
-           </font>
-          </property>
-          <property name="text">
-           <string>Load from Address book</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="0">
          <widget class="QLabel" name="label_4">
           <property name="text">
            <string>Message:</string>
@@ -181,20 +184,13 @@
           </property>
          </widget>
         </item>
-        <item row="4" column="0">
+        <item row="9" column="0">
          <widget class="QLabel" name="label_3">
           <property name="text">
            <string>Subject:</string>
           </property>
          </widget>
         </item>
-        <item row="2" column="2" colspan="3">
-         <widget class="QLabel" name="labelFrom">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="1">
          <widget class="QRadioButton" name="radioButtonSpecific">
           <property name="text">
@@ -205,21 +201,28 @@
           </property>
          </widget>
         </item>
-        <item row="3" column="1">
+        <item row="6" column="1">
          <widget class="QLineEdit" name="lineEditTo"/>
         </item>
-        <item row="5" column="1" rowspan="2" colspan="5">
+        <item row="10" column="1" rowspan="2" colspan="5">
          <widget class="QTextEdit" name="textEditMessage">
           <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;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
           </property>
          </widget>
         </item>
-        <item row="3" column="0">
+        <item row="1" column="1" colspan="3">
+         <widget class="QRadioButton" name="radioButtonBroadcast">
+          <property name="text">
+           <string>Broadcast to everyone who is subscribed to your address</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="0">
          <widget class="QLabel" name="label">
           <property name="text">
            <string>To:</string>
@@ -233,7 +236,7 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
-        <item row="6" column="0">
+        <item row="11" column="0">
          <spacer name="verticalSpacer">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
@@ -246,41 +249,21 @@ p, li { white-space: pre-wrap; }
           </property>
          </spacer>
         </item>
-        <item row="1" column="1" colspan="3">
+        <item row="9" column="1" colspan="5">
-         <widget class="QRadioButton" name="radioButtonBroadcast">
-          <property name="text">
-           <string>Broadcast to everyone who is subscribed to your address</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1" colspan="5">
          <widget class="QLineEdit" name="lineEditSubject">
           <property name="text">
            <string/>
           </property>
          </widget>
         </item>
-        <item row="3" column="4">
+        <item row="12" column="5">
-         <spacer name="horizontalSpacer_6">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>20</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="7" column="5">
          <widget class="QPushButton" name="pushButtonSend">
           <property name="text">
            <string>Send</string>
           </property>
          </widget>
         </item>
-        <item row="7" column="1" colspan="4">
+        <item row="12" column="1" colspan="4">
          <widget class="QLabel" name="labelSendBroadcastWarning">
           <property name="enabled">
            <bool>true</bool>
@@ -299,11 +282,47 @@ p, li { white-space: pre-wrap; }
           </property>
          </widget>
         </item>
+        <item row="6" column="2" colspan="2">
+         <widget class="QPushButton" name="pushButtonLoadFromAddressBook">
+          <property name="font">
+           <font>
+            <pointsize>7</pointsize>
+           </font>
+          </property>
+          <property name="text">
+           <string>Load from Address book</string>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="4" rowspan="4" colspan="2">
+         <widget class="QListWidget" name="attachmentListSend"/>
+        </item>
+        <item row="6" column="5">
+         <widget class="QPushButton" name="DelAttach">
+          <property name="text">
+           <string>Delete attach</string>
+          </property>
+         </widget>
+        </item>
+        <item row="6" column="4">
+         <widget class="QPushButton" name="AddAttach">
+          <property name="text">
+           <string>Add attach</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLabel" name="labelFrom">
+          <property name="text">
+           <string/>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
       <widget class="QWidget" name="sent">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset>
        </attribute>
        <attribute name="title">
@@ -380,7 +399,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="youridentities">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset>
        </attribute>
        <attribute name="title">
@@ -480,7 +499,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="subscriptions">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset>
        </attribute>
        <attribute name="title">
@@ -565,7 +584,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="addressbook">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset>
        </attribute>
        <attribute name="title">
@@ -647,7 +666,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="blackwhitelist">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
        </attribute>
        <attribute name="title">
@@ -739,7 +758,7 @@ p, li { white-space: pre-wrap; }
       </widget>
       <widget class="QWidget" name="networkstatus">
        <attribute name="icon">
-        <iconset resource="bitmessage_icons.qrc">
+        <iconset>
          <normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
        </attribute>
        <attribute name="title">
@@ -758,7 +777,7 @@ p, li { white-space: pre-wrap; }
          <string/>
         </property>
         <property name="icon">
-         <iconset resource="bitmessage_icons.qrc">
+         <iconset>
           <normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
         </property>
         <property name="flat">
@@ -924,8 +943,8 @@ p, li { white-space: pre-wrap; }
     <rect>
      <x>0</x>
      <y>0</y>
-     <width>795</width>
+     <width>835</width>
-     <height>18</height>
+     <height>25</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">