Skip to content

Commit

Permalink
Merge #1645: Qt: Remove donation link from "About" dialog
Browse files Browse the repository at this point in the history
9ab8ad6 Remove mention of donations from JoinMarketQt guide (Kristaps Kaupe)
cb60774 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
  • Loading branch information
kristapsk committed Jan 30, 2024
2 parents d21f7c0 + 9ab8ad6 commit adc73e9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 16 deletions.
2 changes: 0 additions & 2 deletions docs/JOINMARKET-QT-GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 2 additions & 14 deletions scripts/joinmarket-qt.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@
import qt5reactor
qt5reactor.install()

donation_address_url = "https://bitcoinprivacy.me/joinmarket-donations"

#Version of this Qt script specifically
JM_GUI_VERSION = '33dev'

Expand Down Expand Up @@ -1803,23 +1801,13 @@ def showAboutDialog(self):
["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)
Expand Down

0 comments on commit adc73e9

Please sign in to comment.