From cb6077498cb127287ee127eb9d411db79b67a734 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sat, 27 Jan 2024 03:23:39 +0200 Subject: [PATCH 1/2] Qt: Remove donation link from "About" dialog --- scripts/joinmarket-qt.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py index f0b8379..40daabf 100755 --- a/scripts/joinmarket-qt.py +++ b/scripts/joinmarket-qt.py @@ -50,8 +50,6 @@ if 'twisted.internet.reactor' in sys.modules: import qt5reactor qt5reactor.install() -donation_address_url = "https://bitcoinprivacy.me/joinmarket-donations" - #Version of this Qt script specifically JM_GUI_VERSION = '33dev' @@ -1803,23 +1801,13 @@ class JMMainWindow(QMainWindow): ["Joinmarket core software version: " + JM_CORE_VERSION + "
JoinmarketQt version: " + JM_GUI_VERSION + "
Messaging protocol version:" + " %s" % ( str(jm_single().JM_VERSION) - ), "JoinMarket is an open source project which does not have a funding model, " - + "fortunately the project itself has very low running costs as it is almost-fully " - + "decentralized and available to everyone for free. Developers contribute only as " - + "volunteers and donations are divided amongst them. Many developers have also been " - + "important in advocating for privacy and educating the wider bitcoin user base. " - + "Be part of the effort to improve bitcoin privacy and fungibility. Every donated " - + "coin helps us spend more time on JoinMarket instead of doing other stuff."])) + )])) about_text_label.setWordWrap(True) - donation_url_label = QLabel(donation_address_url) - for l in [about_text_label, donation_url_label]: + for l in [about_text_label]: l.setTextFormat(QtCore.Qt.RichText) l.setTextInteractionFlags(QtCore.Qt.TextBrowserInteraction) l.setOpenExternalLinks(True) - donation_url_label.setText("" + - donation_address_url + "") lyt.addWidget(about_text_label) - lyt.addWidget(donation_url_label) btnbox = QDialogButtonBox(msgbox) btnbox.setStandardButtons(QDialogButtonBox.Ok) btnbox.accepted.connect(msgbox.accept) From 9ab8ad632e7d3d3ad388252be47f7daccaed2122 Mon Sep 17 00:00:00 2001 From: Kristaps Kaupe Date: Sat, 27 Jan 2024 13:05:46 +0200 Subject: [PATCH 2/2] Remove mention of donations from JoinMarketQt guide --- docs/JOINMARKET-QT-GUIDE.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/JOINMARKET-QT-GUIDE.md b/docs/JOINMARKET-QT-GUIDE.md index 4463aa5..9e46528 100644 --- a/docs/JOINMARKET-QT-GUIDE.md +++ b/docs/JOINMARKET-QT-GUIDE.md @@ -128,8 +128,6 @@ Next, we'll send a test transaction: In the Coinjoins tab, select the "Single Join" subtab. -The donation feature is disabled; you can donate to the general JM donation address found in the `About` window from the menu. - Paste the address you want to send to under `Recipient address`. The number of counterparties can be anything from 4 up to 20 (in theory you can make