From e2e7e16ab703477a42e25e4d411572fdb2d64035 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Fri, 13 Oct 2017 01:36:54 +0300 Subject: [PATCH] Moved aboutDialog and iconGlossaryDialog also into dialogs module --- src/bitmessageqt/__init__.py | 37 +----- src/bitmessageqt/about.py | 74 ------------ src/bitmessageqt/about.ui | 187 ++++++++++++++----------------- src/bitmessageqt/dialogs.py | 26 +++++ src/bitmessageqt/iconglossary.py | 98 ---------------- src/bitmessageqt/iconglossary.ui | 2 +- 6 files changed, 113 insertions(+), 311 deletions(-) delete mode 100644 src/bitmessageqt/about.py delete mode 100644 src/bitmessageqt/iconglossary.py diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 10cbc8f9..a4ce38ac 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -35,9 +35,7 @@ from emailgateway import * from settings import * import settingsmixin import support -from about import * from help import * -from iconglossary import * from connect import * import locale import sys @@ -62,6 +60,7 @@ from helper_generic import powQueueSize from inventory import ( Inventory, PendingDownloadQueue, PendingUpload, PendingUploadDeadlineException) +from uisignaler import UISignaler import knownnodes import paths from proofofwork import getPowType @@ -70,9 +69,9 @@ import shutdown import state from statusbar import BMStatusBar from network.asyncore_pollchoose import set_rates -from version import softwareVersion import sound + try: from plugins.plugin import get_plugin, get_plugins except ImportError: @@ -2220,10 +2219,7 @@ class MyForm(settingsmixin.SMainWindow): )) def click_pushButtonStatusIcon(self): - logger.debug('click_pushButtonStatusIcon') - self.iconGlossaryInstance = iconGlossaryDialog(self) - if self.iconGlossaryInstance.exec_(): - pass + dialogs.IconGlossaryDialog(self, config=BMConfigParser()).exec_() def click_actionHelp(self): self.helpDialogInstance = helpDialog(self) @@ -2233,8 +2229,7 @@ class MyForm(settingsmixin.SMainWindow): support.createSupportMessage(self) def click_actionAbout(self): - self.aboutDialogInstance = aboutDialog(self) - self.aboutDialogInstance.exec_() + dialogs.AboutDialog(self).exec_() def click_actionSettings(self): self.settingsDialogInstance = settingsDialog(self) @@ -3975,16 +3970,6 @@ class connectDialog(QtGui.QDialog): self.parent = parent QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) -class aboutDialog(QtGui.QDialog): - - def __init__(self, parent): - QtGui.QWidget.__init__(self, parent) - self.ui = Ui_aboutDialog() - self.ui.setupUi(self) - self.parent = parent - self.ui.label.setText("PyBitmessage " + softwareVersion) - self.ui.labelVersion.setText(paths.lastCommit()) - class regenerateAddressesDialog(QtGui.QDialog): @@ -4312,18 +4297,6 @@ class NewAddressDialog(QtGui.QDialog): QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) -class iconGlossaryDialog(QtGui.QDialog): - - def __init__(self, parent): - QtGui.QWidget.__init__(self, parent) - self.ui = Ui_iconGlossaryDialog() - self.ui.setupUi(self) - self.parent = parent - self.ui.labelPortNumber.setText(_translate( - "MainWindow", "You are using TCP port %1. (This can be changed in the settings).").arg(str(BMConfigParser().getint('bitmessagesettings', 'port')))) - QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) - - # In order for the time columns on the Inbox and Sent tabs to be sorted # correctly (rather than alphabetically), we need to overload the < # operator and use this class instead of QTableWidgetItem. @@ -4332,8 +4305,6 @@ class myTableWidgetItem(QTableWidgetItem): def __lt__(self, other): return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject()) -from uisignaler import UISignaler - app = None myapp = None diff --git a/src/bitmessageqt/about.py b/src/bitmessageqt/about.py deleted file mode 100644 index a3483675..00000000 --- a/src/bitmessageqt/about.py +++ /dev/null @@ -1,74 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'about.ui' -# -# Created: Tue Jan 21 22:29:38 2014 -# by: PyQt4 UI code generator 4.10.3 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(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_aboutDialog(object): - def setupUi(self, aboutDialog): - aboutDialog.setObjectName(_fromUtf8("aboutDialog")) - aboutDialog.resize(360, 315) - self.buttonBox = QtGui.QDialogButtonBox(aboutDialog) - self.buttonBox.setGeometry(QtCore.QRect(20, 280, 311, 32)) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.label = QtGui.QLabel(aboutDialog) - self.label.setGeometry(QtCore.QRect(10, 106, 341, 20)) - font = QtGui.QFont() - font.setBold(True) - font.setWeight(75) - self.label.setFont(font) - self.label.setAlignment(QtCore.Qt.AlignCenter|QtCore.Qt.AlignVCenter) - self.label.setObjectName(_fromUtf8("label")) - self.labelVersion = QtGui.QLabel(aboutDialog) - self.labelVersion.setGeometry(QtCore.QRect(10, 116, 341, 41)) - self.labelVersion.setObjectName(_fromUtf8("labelVersion")) - self.labelVersion.setAlignment(QtCore.Qt.AlignCenter|QtCore.Qt.AlignVCenter) - self.label_2 = QtGui.QLabel(aboutDialog) - self.label_2.setGeometry(QtCore.QRect(10, 150, 341, 41)) - self.label_2.setAlignment(QtCore.Qt.AlignCenter) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.label_3 = QtGui.QLabel(aboutDialog) - self.label_3.setGeometry(QtCore.QRect(20, 200, 331, 71)) - self.label_3.setWordWrap(True) - self.label_3.setOpenExternalLinks(True) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.label_5 = QtGui.QLabel(aboutDialog) - self.label_5.setGeometry(QtCore.QRect(10, 190, 341, 20)) - self.label_5.setAlignment(QtCore.Qt.AlignCenter) - self.label_5.setObjectName(_fromUtf8("label_5")) - - self.retranslateUi(aboutDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), aboutDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), aboutDialog.reject) - QtCore.QMetaObject.connectSlotsByName(aboutDialog) - - def retranslateUi(self, aboutDialog): - aboutDialog.setWindowTitle(_translate("aboutDialog", "About", None)) - self.label.setText(_translate("aboutDialog", "PyBitmessage", None)) - self.labelVersion.setText(_translate("aboutDialog", "version ?", None)) - self.label_2.setText(_translate("aboutDialog", "

Copyright © 2012-2016 Jonathan Warren
Copyright © 2013-2016 The Bitmessage Developers

", None)) - self.label_3.setText(_translate("aboutDialog", "

Distributed under the MIT/X11 software license; see http://www.opensource.org/licenses/mit-license.php

", None)) - self.label_5.setText(_translate("aboutDialog", "This is Beta software.", None)) - diff --git a/src/bitmessageqt/about.ui b/src/bitmessageqt/about.ui index 3deab41b..d09cbc4d 100644 --- a/src/bitmessageqt/about.ui +++ b/src/bitmessageqt/about.ui @@ -6,117 +6,94 @@ 0 0 - 360 - 315 + 430 + 340 About - - - - 20 - 280 - 311 - 32 - - - - Qt::Horizontal - - - QDialogButtonBox::Ok - - - - - - 70 - 126 - 111 - 20 - - - - - 75 - true - - - - PyBitmessage - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - 190 - 126 - 161 - 20 - - - - version ? - - - - - - 10 - 150 - 341 - 41 - - - - <html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html> - - - Qt::AlignCenter - - - - - - 20 - 200 - 331 - 71 - - - - <html><head/><body><p>Distributed under the MIT/X11 software license; see <a href="http://www.opensource.org/licenses/mit-license.php"><span style=" text-decoration: underline; color:#0000ff;">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html> - - - true - - - true - - - - - - 10 - 190 - 341 - 20 - - - - This is Beta software. - - - Qt::AlignCenter - - + + + + + + + + :/newPrefix/images/can-icon-24px.png + + + true + + + Qt::AlignCenter + + + + + + + + 75 + true + + + + PyBitmessage + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + <html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2017 The Bitmessage Developers</p></body></html> + + + Qt::AlignLeft + + + + + + + This is Beta software. + + + Qt::AlignCenter + + + + + + + <html><head/><body><p>Distributed under the MIT/X11 software license; see <a href="http://www.opensource.org/licenses/mit-license.php"><span style=" text-decoration: underline; color:#0000ff;">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html> + + + true + + + true + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + - + + + buttonBox diff --git a/src/bitmessageqt/dialogs.py b/src/bitmessageqt/dialogs.py index 5eeaaadd..f9615612 100644 --- a/src/bitmessageqt/dialogs.py +++ b/src/bitmessageqt/dialogs.py @@ -5,7 +5,9 @@ from retranslateui import RetranslateMixin import widgets import hashlib +import paths from inventory import Inventory +from version import softwareVersion class AddressCheckMixin(object): @@ -105,3 +107,27 @@ class NewSubscriptionDialog( "MainWindow", "Display the %1 recent broadcast(s) from this address." ).arg(count)) + + +class AboutDialog(QtGui.QDialog, RetranslateMixin): + def __init__(self, parent=None): + super(AboutDialog, self).__init__(parent) + widgets.load('about.ui', self) + commit = paths.lastCommit()[:7] + label = "PyBitmessage " + softwareVersion + if commit: + label += '-' + commit + self.labelVersion.setText(label) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + + +class IconGlossaryDialog(QtGui.QDialog, RetranslateMixin): + def __init__(self, parent=None, config=None): + super(IconGlossaryDialog, self).__init__(parent) + widgets.load('iconglossary.ui', self) + + self.labelPortNumber.setText(_translate( + "iconGlossaryDialog", + "You are using TCP port %1. (This can be changed in the settings)." + ).arg(config.getint('bitmessagesettings', 'port'))) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) diff --git a/src/bitmessageqt/iconglossary.py b/src/bitmessageqt/iconglossary.py deleted file mode 100644 index 32d92db6..00000000 --- a/src/bitmessageqt/iconglossary.py +++ /dev/null @@ -1,98 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'iconglossary.ui' -# -# Created: Thu Jun 13 20:15:48 2013 -# by: PyQt4 UI code generator 4.10.1 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - def _fromUtf8(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_iconGlossaryDialog(object): - def setupUi(self, iconGlossaryDialog): - iconGlossaryDialog.setObjectName(_fromUtf8("iconGlossaryDialog")) - iconGlossaryDialog.resize(424, 282) - self.gridLayout = QtGui.QGridLayout(iconGlossaryDialog) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.groupBox = QtGui.QGroupBox(iconGlossaryDialog) - self.groupBox.setObjectName(_fromUtf8("groupBox")) - self.gridLayout_2 = QtGui.QGridLayout(self.groupBox) - self.gridLayout_2.setObjectName(_fromUtf8("gridLayout_2")) - self.label = QtGui.QLabel(self.groupBox) - self.label.setText(_fromUtf8("")) - self.label.setPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/redicon.png"))) - self.label.setObjectName(_fromUtf8("label")) - self.gridLayout_2.addWidget(self.label, 0, 0, 1, 1) - self.label_2 = QtGui.QLabel(self.groupBox) - self.label_2.setObjectName(_fromUtf8("label_2")) - self.gridLayout_2.addWidget(self.label_2, 0, 1, 1, 1) - self.label_3 = QtGui.QLabel(self.groupBox) - self.label_3.setText(_fromUtf8("")) - self.label_3.setPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/yellowicon.png"))) - self.label_3.setObjectName(_fromUtf8("label_3")) - self.gridLayout_2.addWidget(self.label_3, 1, 0, 1, 1) - self.label_4 = QtGui.QLabel(self.groupBox) - self.label_4.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) - self.label_4.setWordWrap(True) - self.label_4.setObjectName(_fromUtf8("label_4")) - self.gridLayout_2.addWidget(self.label_4, 1, 1, 2, 1) - spacerItem = QtGui.QSpacerItem(20, 73, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_2.addItem(spacerItem, 2, 0, 2, 1) - self.labelPortNumber = QtGui.QLabel(self.groupBox) - self.labelPortNumber.setObjectName(_fromUtf8("labelPortNumber")) - self.gridLayout_2.addWidget(self.labelPortNumber, 3, 1, 1, 1) - self.label_5 = QtGui.QLabel(self.groupBox) - self.label_5.setText(_fromUtf8("")) - self.label_5.setPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/greenicon.png"))) - self.label_5.setObjectName(_fromUtf8("label_5")) - self.gridLayout_2.addWidget(self.label_5, 4, 0, 1, 1) - self.label_6 = QtGui.QLabel(self.groupBox) - self.label_6.setWordWrap(True) - self.label_6.setObjectName(_fromUtf8("label_6")) - self.gridLayout_2.addWidget(self.label_6, 4, 1, 1, 1) - self.gridLayout.addWidget(self.groupBox, 0, 0, 1, 1) - self.buttonBox = QtGui.QDialogButtonBox(iconGlossaryDialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.gridLayout.addWidget(self.buttonBox, 1, 0, 1, 1) - - self.retranslateUi(iconGlossaryDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), iconGlossaryDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), iconGlossaryDialog.reject) - QtCore.QMetaObject.connectSlotsByName(iconGlossaryDialog) - - def retranslateUi(self, iconGlossaryDialog): - iconGlossaryDialog.setWindowTitle(_translate("iconGlossaryDialog", "Icon Glossary", None)) - self.groupBox.setTitle(_translate("iconGlossaryDialog", "Icon Glossary", None)) - self.label_2.setText(_translate("iconGlossaryDialog", "You have no connections with other peers. ", None)) - self.label_4.setText(_translate("iconGlossaryDialog", "You have made at least one connection to a peer using an outgoing connection but you have not yet received any incoming connections. Your firewall or home router probably isn\'t configured to forward incoming TCP connections to your computer. Bitmessage will work just fine but it would help the Bitmessage network if you allowed for incoming connections and will help you be a better-connected node.", None)) - self.labelPortNumber.setText(_translate("iconGlossaryDialog", "You are using TCP port ?. (This can be changed in the settings).", None)) - self.label_6.setText(_translate("iconGlossaryDialog", "You do have connections with other peers and your firewall is correctly configured.", None)) - -import bitmessage_icons_rc - -if __name__ == "__main__": - import sys - app = QtGui.QApplication(sys.argv) - iconGlossaryDialog = QtGui.QDialog() - ui = Ui_iconGlossaryDialog() - ui.setupUi(iconGlossaryDialog) - iconGlossaryDialog.show() - sys.exit(app.exec_()) - diff --git a/src/bitmessageqt/iconglossary.ui b/src/bitmessageqt/iconglossary.ui index 870a90ee..1bac94c8 100644 --- a/src/bitmessageqt/iconglossary.ui +++ b/src/bitmessageqt/iconglossary.ui @@ -76,7 +76,7 @@ - You are using TCP port ?. (This can be changed in the settings). + You are using TCP port ?. (This can be changed in the settings).