From c965a1d2aaad6b387868d5f7e0cd21c5e60df731 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Mon, 16 Oct 2017 16:09:52 +0300 Subject: [PATCH] Moved helpDialog and connectDialog also into dialogs module --- src/bitmessageqt/__init__.py | 35 ++++---------------- src/bitmessageqt/connect.py | 64 ------------------------------------ src/bitmessageqt/connect.ui | 11 +++++-- src/bitmessageqt/dialogs.py | 14 ++++++++ src/bitmessageqt/help.py | 48 --------------------------- 5 files changed, 29 insertions(+), 143 deletions(-) delete mode 100644 src/bitmessageqt/connect.py delete mode 100644 src/bitmessageqt/help.py diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index a4ce38ac..ac753f5f 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -35,8 +35,6 @@ from emailgateway import * from settings import * import settingsmixin import support -from help import * -from connect import * import locale import sys import time @@ -1465,13 +1463,13 @@ class MyForm(settingsmixin.SMainWindow): NewChanDialog(self) def showConnectDialog(self): - self.connectDialogInstance = connectDialog(self) - if self.connectDialogInstance.exec_(): - if self.connectDialogInstance.ui.radioButtonConnectNow.isChecked(): + dialog = dialogs.ConnectDialog(self) + if dialog.exec_(): + if dialog.radioButtonConnectNow.isChecked(): BMConfigParser().remove_option( 'bitmessagesettings', 'dontconnect') BMConfigParser().save() - elif self.connectDialogInstance.ui.radioButtonConfigureNetwork.isChecked(): + elif dialog.radioButtonConfigureNetwork.isChecked(): self.click_actionSettings() def showMigrationWizard(self, level): @@ -1480,7 +1478,7 @@ class MyForm(settingsmixin.SMainWindow): pass else: pass - + def changeEvent(self, event): if event.type() == QtCore.QEvent.LanguageChange: self.ui.retranslateUi(self) @@ -2222,8 +2220,7 @@ class MyForm(settingsmixin.SMainWindow): dialogs.IconGlossaryDialog(self, config=BMConfigParser()).exec_() def click_actionHelp(self): - self.helpDialogInstance = helpDialog(self) - self.helpDialogInstance.exec_() + dialogs.HelpDialog(self).exec_() def click_actionSupport(self): support.createSupportMessage(self) @@ -3949,26 +3946,6 @@ class MyForm(settingsmixin.SMainWindow): loadMethod = getattr(obj, "loadSettings", None) if callable (loadMethod): obj.loadSettings() - - -class helpDialog(QtGui.QDialog): - - def __init__(self, parent): - QtGui.QWidget.__init__(self, parent) - self.ui = Ui_helpDialog() - self.ui.setupUi(self) - self.parent = parent - self.ui.labelHelpURI.setOpenExternalLinks(True) - QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) - -class connectDialog(QtGui.QDialog): - - def __init__(self, parent): - QtGui.QWidget.__init__(self, parent) - self.ui = Ui_connectDialog() - self.ui.setupUi(self) - self.parent = parent - QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) class regenerateAddressesDialog(QtGui.QDialog): diff --git a/src/bitmessageqt/connect.py b/src/bitmessageqt/connect.py deleted file mode 100644 index 9151156f..00000000 --- a/src/bitmessageqt/connect.py +++ /dev/null @@ -1,64 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'connect.ui' -# -# Created: Wed Jul 24 12:42:01 2013 -# by: PyQt4 UI code generator 4.10 -# -# 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_connectDialog(object): - def setupUi(self, connectDialog): - connectDialog.setObjectName(_fromUtf8("connectDialog")) - connectDialog.resize(400, 124) - self.gridLayout = QtGui.QGridLayout(connectDialog) - self.gridLayout.setObjectName(_fromUtf8("gridLayout")) - self.label = QtGui.QLabel(connectDialog) - self.label.setObjectName(_fromUtf8("label")) - self.gridLayout.addWidget(self.label, 0, 0, 1, 2) - self.radioButtonConnectNow = QtGui.QRadioButton(connectDialog) - self.radioButtonConnectNow.setChecked(True) - self.radioButtonConnectNow.setObjectName(_fromUtf8("radioButtonConnectNow")) - self.gridLayout.addWidget(self.radioButtonConnectNow, 1, 0, 1, 2) - self.radioButtonConfigureNetwork = QtGui.QRadioButton(connectDialog) - self.radioButtonConfigureNetwork.setObjectName(_fromUtf8("radioButtonConfigureNetwork")) - self.gridLayout.addWidget(self.radioButtonConfigureNetwork, 2, 0, 1, 2) - self.radioButtonWorkOffline = QtGui.QRadioButton(connectDialog) - self.radioButtonWorkOffline.setObjectName(_fromUtf8("radioButtonWorkOffline")) - self.gridLayout.addWidget(self.radioButtonWorkOffline, 3, 0, 1, 2) - spacerItem = QtGui.QSpacerItem(185, 24, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.gridLayout.addItem(spacerItem, 4, 0, 1, 1) - self.buttonBox = QtGui.QDialogButtonBox(connectDialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.gridLayout.addWidget(self.buttonBox, 4, 1, 1, 1) - - self.retranslateUi(connectDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), connectDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), connectDialog.reject) - QtCore.QMetaObject.connectSlotsByName(connectDialog) - - def retranslateUi(self, connectDialog): - connectDialog.setWindowTitle(_translate("connectDialog", "Bitmessage", None)) - self.label.setText(_translate("connectDialog", "Bitmessage won\'t connect to anyone until you let it. ", None)) - self.radioButtonConnectNow.setText(_translate("connectDialog", "Connect now", None)) - self.radioButtonConfigureNetwork.setText(_translate("connectDialog", "Let me configure special network settings first", None)) - self.radioButtonWorkOffline.setText(_translate("connectDialog", "Work offline", None)) - diff --git a/src/bitmessageqt/connect.ui b/src/bitmessageqt/connect.ui index 74173860..8b76f5ac 100644 --- a/src/bitmessageqt/connect.ui +++ b/src/bitmessageqt/connect.ui @@ -38,7 +38,14 @@ - + + + + Work offline + + + + Qt::Horizontal @@ -51,7 +58,7 @@ - + Qt::Horizontal diff --git a/src/bitmessageqt/dialogs.py b/src/bitmessageqt/dialogs.py index f9615612..3b2cce2d 100644 --- a/src/bitmessageqt/dialogs.py +++ b/src/bitmessageqt/dialogs.py @@ -131,3 +131,17 @@ class IconGlossaryDialog(QtGui.QDialog, RetranslateMixin): "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)) + + +class HelpDialog(QtGui.QDialog, RetranslateMixin): + def __init__(self, parent=None): + super(HelpDialog, self).__init__(parent) + widgets.load('help.ui', self) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) + + +class ConnectDialog(QtGui.QDialog, RetranslateMixin): + def __init__(self, parent=None): + super(ConnectDialog, self).__init__(parent) + widgets.load('connect.ui', self) + QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) diff --git a/src/bitmessageqt/help.py b/src/bitmessageqt/help.py deleted file mode 100644 index ff876514..00000000 --- a/src/bitmessageqt/help.py +++ /dev/null @@ -1,48 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'help.ui' -# -# Created: Wed Jan 14 22:42:39 2015 -# by: PyQt4 UI code generator 4.9.4 -# -# WARNING! All changes made in this file will be lost! - -from PyQt4 import QtCore, QtGui - -try: - _fromUtf8 = QtCore.QString.fromUtf8 -except AttributeError: - _fromUtf8 = lambda s: s - -class Ui_helpDialog(object): - def setupUi(self, helpDialog): - helpDialog.setObjectName(_fromUtf8("helpDialog")) - helpDialog.resize(335, 96) - self.formLayout = QtGui.QFormLayout(helpDialog) - self.formLayout.setObjectName(_fromUtf8("formLayout")) - self.labelHelpURI = QtGui.QLabel(helpDialog) - self.labelHelpURI.setOpenExternalLinks(True) - self.labelHelpURI.setObjectName(_fromUtf8("labelHelpURI")) - self.formLayout.setWidget(1, QtGui.QFormLayout.LabelRole, self.labelHelpURI) - self.label = QtGui.QLabel(helpDialog) - self.label.setWordWrap(True) - self.label.setObjectName(_fromUtf8("label")) - self.formLayout.setWidget(0, QtGui.QFormLayout.SpanningRole, self.label) - spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.formLayout.setItem(2, QtGui.QFormLayout.LabelRole, spacerItem) - self.buttonBox = QtGui.QDialogButtonBox(helpDialog) - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Ok) - self.buttonBox.setObjectName(_fromUtf8("buttonBox")) - self.formLayout.setWidget(2, QtGui.QFormLayout.FieldRole, self.buttonBox) - - self.retranslateUi(helpDialog) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("accepted()")), helpDialog.accept) - QtCore.QObject.connect(self.buttonBox, QtCore.SIGNAL(_fromUtf8("rejected()")), helpDialog.reject) - QtCore.QMetaObject.connectSlotsByName(helpDialog) - - def retranslateUi(self, helpDialog): - helpDialog.setWindowTitle(QtGui.QApplication.translate("helpDialog", "Help", None, QtGui.QApplication.UnicodeUTF8)) - self.labelHelpURI.setText(QtGui.QApplication.translate("helpDialog", "https://bitmessage.org/wiki/PyBitmessage_Help", None, QtGui.QApplication.UnicodeUTF8)) - self.label.setText(QtGui.QApplication.translate("helpDialog", "As Bitmessage is a collaborative project, help can be found online in the Bitmessage Wiki:", None, QtGui.QApplication.UnicodeUTF8)) -