Browse Source

Merge JoinMarket-Org/joinmarket-clientserver#1645: Qt: Remove donation link from "About" dialog

9ab8ad632e Remove mention of donations from JoinMarketQt guide (Kristaps Kaupe)
cb6077498c Qt: Remove donation link from "About" dialog (Kristaps Kaupe)

Pull request description:

  Donation address link was removed from README in #1611, as it is not in control of any of the current active developers. This removes it also from JoinMarketQt "About" dialog.

Top commit has no ACKs.

Tree-SHA512: 5ea77093dbc94d08f7757eac75a32cabe46272d080fc931194840886d63bd7d5d337be8564a2755df3a32ea34632641e7a42068d41cd87a525801bd66df35827
master
Kristaps Kaupe 2 years ago
parent
commit
adc73e9bed
No known key found for this signature in database
GPG Key ID: 33E472FE870C7E5D
  1. 2
      docs/JOINMARKET-QT-GUIDE.md
  2. 16
      scripts/joinmarket-qt.py

2
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

16
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 + "<br/>JoinmarketQt version: "
+ JM_GUI_VERSION + "<br/>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("<a href='" + donation_address_url + "'>" +
donation_address_url + "</a>")
lyt.addWidget(about_text_label)
lyt.addWidget(donation_url_label)
btnbox = QDialogButtonBox(msgbox)
btnbox.setStandardButtons(QDialogButtonBox.Ok)
btnbox.accepted.connect(msgbox.accept)

Loading…
Cancel
Save