From 5d7b89a4af080e9a122cb94d3f57b43ee2988be9 Mon Sep 17 00:00:00 2001 From: Adam Gibson Date: Fri, 24 Feb 2017 15:49:57 +0200 Subject: [PATCH] disable single join donation --- scripts/joinmarket-qt.py | 13 ++++--------- scripts/qtsupport.py | 13 ++++++++++++- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index 8613a6e..762f151 100644 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -60,7 +60,7 @@ from qtsupport import (ScheduleWizard, warnings, config_tips, config_types, CopyButton, CopyCloseButton, OkButton, CancelButton, check_password_strength, update_password_strength, make_password_dialog, PasswordDialog, MyTreeWidget, - JMQtMessageBox, BLUE_FG) + JMQtMessageBox, BLUE_FG, donation_more_message) def satoshis_to_amt_str(x): return str(Decimal(x)/Decimal('1e8')) + " BTC" @@ -362,6 +362,8 @@ class SpendTab(QWidget): donateLayout = QHBoxLayout() self.donateCheckBox = QCheckBox() self.donateCheckBox.setChecked(False) + #Temporarily disabled + self.donateCheckBox.setEnabled(False) self.donateCheckBox.setMaximumWidth(30) self.donateLimitBox = QDoubleSpinBox() self.donateLimitBox.setMinimum(0.001) @@ -382,14 +384,7 @@ class SpendTab(QWidget): donateLayout.addWidget(label2) label2.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) donateLayout.setAlignment(label2, QtCore.Qt.AlignLeft) - label3 = HelpLabel('More', '\n'.join( - ['If the calculated change for your transaction', - 'is smaller than the value you choose (default 0.01 btc)', - 'then that change is sent as a donation. If your change', - 'is larger than that, there will be no donation.', '', - 'As well as helping the developers, this feature can,', - 'in certain circumstances, improve privacy, because there', - 'is no change output that can be linked with your inputs later.']), + label3 = HelpLabel('More', donation_more_message, 'About the donation feature') label3.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed) donateLayout.setAlignment(label3, QtCore.Qt.AlignLeft) diff --git a/scripts/qtsupport.py b/scripts/qtsupport.py index 6bae93f..0394eb0 100644 --- a/scripts/qtsupport.py +++ b/scripts/qtsupport.py @@ -100,7 +100,18 @@ config_tips = { 'the message channel, default is 30s' } - +#Temporarily disabled +donation_more_message = "Currently disabled" +""" +donation_more_message = '\n'.join( + ['If the calculated change for your transaction', + 'is smaller than the value you choose (default 0.01 btc)', + 'then that change is sent as a donation. If your change', + 'is larger than that, there will be no donation.', '', + 'As well as helping the developers, this feature can,', + 'in certain circumstances, improve privacy, because there', + 'is no change output that can be linked with your inputs later.']) +""" def JMQtMessageBox(obj, msg, mbtype='info', title=''): mbtypes = {'info': QMessageBox.information,