diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index 4aa751b..75484d7 100644 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -54,9 +54,9 @@ from jmclient import (load_program_config, get_network, Wallet, from qtsupport import (ScheduleWizard, warnings, config_tips, config_types, TaskThread, QtHandler, XStream, Buttons, CloseButton, CopyButton, CopyCloseButton, OkButton, CancelButton, - HelpLabel, check_password_strength, - update_password_strength, make_password_dialog, - PasswordDialog, MyTreeWidget, JMQtMessageBox) + check_password_strength, update_password_strength, + make_password_dialog, PasswordDialog, MyTreeWidget, + JMQtMessageBox, BLUE_FG) def satoshis_to_amt_str(x): return str(Decimal(x)/Decimal('1e8')) + " BTC" @@ -134,6 +134,30 @@ handler = QtHandler() handler.setFormatter(logging.Formatter("%(levelname)s:%(message)s")) log.addHandler(handler) +class HelpLabel(QLabel): + + def __init__(self, text, help_text, wtitle): + QLabel.__init__(self, text) + self.help_text = help_text + self.wtitle = wtitle + self.font = QFont() + self.setStyleSheet(BLUE_FG) + + def mouseReleaseEvent(self, x): + QMessageBox.information(w, self.wtitle, self.help_text, 'OK') + + def enterEvent(self, event): + self.font.setUnderline(True) + self.setFont(self.font) + app.setOverrideCursor(QCursor(QtCore.Qt.PointingHandCursor)) + return QLabel.enterEvent(self, event) + + def leaveEvent(self, event): + self.font.setUnderline(False) + self.setFont(self.font) + app.setOverrideCursor(QCursor(QtCore.Qt.ArrowCursor)) + return QLabel.leaveEvent(self, event) + class SettingsTab(QDialog): def __init__(self): diff --git a/scripts/qtsupport.py b/scripts/qtsupport.py index 646ab1f..dd728a1 100644 --- a/scripts/qtsupport.py +++ b/scripts/qtsupport.py @@ -242,31 +242,6 @@ class CancelButton(QPushButton): self.clicked.connect(dialog.reject) -class HelpLabel(QLabel): - - def __init__(self, text, help_text, wtitle): - QLabel.__init__(self, text) - self.help_text = help_text - self.wtitle = wtitle - self.font = QFont() - self.setStyleSheet(BLUE_FG) - - def mouseReleaseEvent(self, x): - QMessageBox.information(w, self.wtitle, self.help_text, 'OK') - - def enterEvent(self, event): - self.font.setUnderline(True) - self.setFont(self.font) - app.setOverrideCursor(QCursor(QtCore.Qt.PointingHandCursor)) - return QLabel.enterEvent(self, event) - - def leaveEvent(self, event): - self.font.setUnderline(False) - self.setFont(self.font) - app.setOverrideCursor(QCursor(QtCore.Qt.ArrowCursor)) - return QLabel.leaveEvent(self, event) - - def check_password_strength(password): ''' Check the strength of the password entered by the user and return back the same