diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 8cf96728..c07d8ff9 100644 --- a/src/bitmessageqt/__init__.py +++ b/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(): - # this is one of your addresses - 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.comboboxFindLabel.addItem(label, address) + self.ui.comboboxFindAddress.addItem(address,label) self.ui.tableWidgetRecipients.keyPressEvent = self.tableWidgetRecipientsKeyPressEvent # create application indicator @@ -1777,7 +1771,29 @@ class MyForm(QtGui.QMainWindow): time.sleep(0.1) 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() diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index 25443384..d8357a07 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/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()) - 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, 4, 1, 1) + sizePolicy.setHeightForWidth(self.radioButtonSpecific.sizePolicy().hasHeightForWidth()) + self.radioButtonSpecific.setSizePolicy(sizePolicy) + self.radioButtonSpecific.setChecked(True) + self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific")) + self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 2, 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) - spacerItem = QtGui.QSpacerItem(20, 297, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_2.addItem(spacerItem, 16, 0, 1, 1) + self.gridLayout_2.addWidget(self.label_4, 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.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.gridLayout_2.addWidget(self.label_3, 15, 0, 1, 1) 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.radioButtonSpecific.setChecked(True) - self.radioButtonSpecific.setObjectName(_fromUtf8("radioButtonSpecific")) - self.gridLayout_2.addWidget(self.radioButtonSpecific, 0, 2, 1, 1) - self.pushButtonLoadFromAddressBook = QtGui.QPushButton(self.send) + self.radioButtonBroadcast = QtGui.QRadioButton(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, 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) + sizePolicy.setHeightForWidth(self.radioButtonBroadcast.sizePolicy().hasHeightForWidth()) + self.radioButtonBroadcast.setSizePolicy(sizePolicy) 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.labelFrom = QtGui.QLabel(self.send) - self.labelFrom.setObjectName(_fromUtf8("labelFrom")) - self.gridLayout_2.addWidget(self.labelFrom, 2, 4, 1, 1) + self.gridLayout_2.addWidget(self.pushButtonSend, 18, 5, 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", "\n" "
\n" "