From fcaa7bca0b4befc4f60dcb3a29ac648671fae3e8 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 00:57:04 -0400 Subject: [PATCH 01/12] Update bitcoingui.cpp --- src/qt/bitcoingui.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index fd71a70b..5161ceab 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -139,6 +139,7 @@ BitcoinGUI::BitcoinGUI(const PlatformStyle *_platformStyle, const NetworkStyle * prevBlocks(0), spinnerFrame(0), governanceAction(0), + externalDonate(0), platformStyle(_platformStyle) { /* Open CSS when configured */ @@ -595,6 +596,11 @@ void BitcoinGUI::createActions() showPrivateSendHelpAction->setStatusTip(tr("Show the PrivateSend basic information")); + // HTHW Donate + externalDonate = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Donate To HTHW"), this); + externalDonate->setStatusTip(tr("Donate to Help The Homeless Worldwide")); + + connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked())); connect(aboutQtAction, SIGNAL(triggered()), qApp, SLOT(aboutQt())); @@ -603,6 +609,10 @@ void BitcoinGUI::createActions() connect(showHelpMessageAction, SIGNAL(triggered()), this, SLOT(showHelpMessageClicked())); connect(showPrivateSendHelpAction, SIGNAL(triggered()), this, SLOT(showPrivateSendHelpClicked())); + + // HTHW Donate + connect(externalDonate, SIGNAL(triggered()), this, SLOT(openDonate())); + // Jump directly to tabs in RPC-console connect(openInfoAction, SIGNAL(triggered()), this, SLOT(showInfo())); connect(openRPCConsoleAction, SIGNAL(triggered()), this, SLOT(showConsole())); @@ -693,6 +703,8 @@ void BitcoinGUI::createMenuBar() } + QMenu* donate = appMenuBar->addMenu(tr("&HTHW Donate")); + donate->addAction(externalDonate); QMenu *help = appMenuBar->addMenu(tr("&Help")); help->addAction(showHelpMessageAction); @@ -1024,6 +1036,23 @@ void BitcoinGUI::openClicked() } } +void BitcoinGUI::openDonate() +{ + openExternalURL("https://odinblockchain.org"); +} + +void BitcoinGUI::openExternalURL(QString url) +{ + QMessageBox::StandardButton reply = QMessageBox::question(this, tr("Notice – External Link"), + QStringLiteral("This action will open up the following website in your default browser:

%1

To continue, hit your Enter key or press Ok.
Remember, never share your personal information or private keys on any social website.").arg(url), + QMessageBox::Cancel | QMessageBox::Ok, + QMessageBox::Ok); + + if (reply == QMessageBox::Ok) { + QDesktopServices::openUrl(QUrl(url)); + } +} + void BitcoinGUI::gotoGovernancePage() { governanceAction->setChecked(true); From 0d55e0d1e2dbeb39c822212a2d655ca389b71760 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 00:59:18 -0400 Subject: [PATCH 02/12] Update bitcoingui.h --- src/qt/bitcoingui.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/qt/bitcoingui.h b/src/qt/bitcoingui.h index 27f45d5e..0763d909 100644 --- a/src/qt/bitcoingui.h +++ b/src/qt/bitcoingui.h @@ -103,6 +103,7 @@ class BitcoinGUI : public QMainWindow QMenuBar *appMenuBar; + QAction* externalDonate; QAction *governanceAction; QAction* overviewaAction; QAction *overviewAction; @@ -259,6 +260,9 @@ private Q_SLOTS: void aboutClicked(); /** Show debug window */ void showDebugWindow(); + /** Open external URL */ + void openDonate(); + void openExternalURL(QString url = ""); /** Show debug window and set focus to the appropriate tab */ void showInfo(); From 337baf737701a921f0398cee49382f7d42ca61a2 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:04:12 -0400 Subject: [PATCH 03/12] Update bitcoingui.cpp --- src/qt/bitcoingui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 5161ceab..cd16d4a7 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1038,13 +1038,13 @@ void BitcoinGUI::openClicked() void BitcoinGUI::openDonate() { - openExternalURL("https://odinblockchain.org"); + openExternalURL("https://www.paypal.com/donate/?token=FobylA07oFyKxjbW63UkRTP5eZETbFORbodTooL86A-C7cAfVJOUE-MBCM2dM80l_sBm00&country.x=US&locale.x=US"); } void BitcoinGUI::openExternalURL(QString url) { QMessageBox::StandardButton reply = QMessageBox::question(this, tr("Notice – External Link"), - QStringLiteral("This action will open up the following website in your default browser:

%1

To continue, hit your Enter key or press Ok.
Remember, never share your personal information or private keys on any social website.").arg(url), + QStringLiteral("This action will open up the following website in your default browser:

HTH PayPal Donation Page



To continue, hit your Enter key or press Ok.
Remember, never share your personal information or private keys on any social website.").arg(url), QMessageBox::Cancel | QMessageBox::Ok, QMessageBox::Ok); From 1ca8453d122e45a592df6c23231f9d024e4b4dd2 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:22:14 -0400 Subject: [PATCH 04/12] Update sendcoinsentry.cpp --- src/qt/sendcoinsentry.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index edbeb77d..8dad9460 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -285,3 +285,10 @@ bool SendCoinsEntry::updateLabel(const QString &address) return false; } + + +void OverviewPage::on_pushButton_Website_6_clicked() { // HTH Partners + + QDesktopServices::openUrl(QUrl("https://helpthehomelessworldwide.org/donate", QUrl::TolerantMode)); + +} From 5a472cf6c642f2edc2955b8e09b56a97a1ff33ce Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:22:57 -0400 Subject: [PATCH 05/12] Update sendcoinsentry.h --- src/qt/sendcoinsentry.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 6671b13e..6d029d70 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -61,6 +61,7 @@ private Q_SLOTS: void on_pasteButton_clicked(); void updateDisplayUnit(); void updateFoundationAddress(); + void on_pushButton_Website_6_clicked(); private: SendCoinsRecipient recipient; From 5919c1925ee7dfe036791fda27e4984570ab2f95 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:25:59 -0400 Subject: [PATCH 06/12] Update bitcoingui.cpp --- src/qt/bitcoingui.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index cd16d4a7..fac8544c 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -1038,7 +1038,7 @@ void BitcoinGUI::openClicked() void BitcoinGUI::openDonate() { - openExternalURL("https://www.paypal.com/donate/?token=FobylA07oFyKxjbW63UkRTP5eZETbFORbodTooL86A-C7cAfVJOUE-MBCM2dM80l_sBm00&country.x=US&locale.x=US"); + openExternalURL("https://helpthehomelessworldwide.org/donate"); } void BitcoinGUI::openExternalURL(QString url) From 0d8cba84b7b9adb83f07de671935caef53a797cd Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:26:52 -0400 Subject: [PATCH 07/12] Update sendcoinsentry.cpp --- src/qt/sendcoinsentry.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 8dad9460..e001a9ce 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -287,8 +287,8 @@ bool SendCoinsEntry::updateLabel(const QString &address) } -void OverviewPage::on_pushButton_Website_6_clicked() { // HTH Partners +void OverviewPage::on_pushButton_Donate_clicked() { // HTH Partners - QDesktopServices::openUrl(QUrl("https://helpthehomelessworldwide.org/donate", QUrl::TolerantMode)); + QDesktopServices::openUrl(QUrl("https://www.paypal.com/donate/?token=FobylA07oFyKxjbW63UkRTP5eZETbFORbodTooL86A-C7cAfVJOUE-MBCM2dM80l_sBm00&country.x=US&locale.x=US", QUrl::TolerantMode)); } From a5883ed84014e076e331fc17b012a4a7c9e6cc53 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:27:18 -0400 Subject: [PATCH 08/12] Update sendcoinsentry.h --- src/qt/sendcoinsentry.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/sendcoinsentry.h b/src/qt/sendcoinsentry.h index 6d029d70..35b76f3c 100644 --- a/src/qt/sendcoinsentry.h +++ b/src/qt/sendcoinsentry.h @@ -61,7 +61,7 @@ private Q_SLOTS: void on_pasteButton_clicked(); void updateDisplayUnit(); void updateFoundationAddress(); - void on_pushButton_Website_6_clicked(); + void on_pushButton_Donate_clicked(); private: SendCoinsRecipient recipient; From c7f304ba56e88685e980f814b650d15d48ecf872 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:29:15 -0400 Subject: [PATCH 09/12] Update sendcoinsentry.ui --- src/qt/forms/sendcoinsentry.ui | 53 +++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index ba3efcdc..2a2f2e73 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -268,7 +268,7 @@ - 260 + 10 10 291 31 @@ -302,6 +302,57 @@ + + + + 380 + 10 + 120 + 30 + + + + + 100 + 30 + + + + + 120 + 30 + + + + Visit Help The Homeless Coin Explorer and Track Your HTH Coins + + + border-style: solid; +border-width: 2px; +border-color: #34bcaa; +border-radius: 10px; +font-size: 11px; + + + HTH PayPal + + + + + + 510 + 15 + 161 + 21 + + + + Donate using PayPal! + + + Qt::AlignCenter + + From fc6e033d7fc9ba67271460936851f6288275fb69 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:36:25 -0400 Subject: [PATCH 10/12] Update sendcoinsentry.cpp --- src/qt/sendcoinsentry.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index e001a9ce..19ba5317 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -287,7 +287,7 @@ bool SendCoinsEntry::updateLabel(const QString &address) } -void OverviewPage::on_pushButton_Donate_clicked() { // HTH Partners +void SendCoinsEntry::on_pushButton_Donate_clicked() { // HTH Partners QDesktopServices::openUrl(QUrl("https://www.paypal.com/donate/?token=FobylA07oFyKxjbW63UkRTP5eZETbFORbodTooL86A-C7cAfVJOUE-MBCM2dM80l_sBm00&country.x=US&locale.x=US", QUrl::TolerantMode)); From 19d494f7ede77e0f72fff4a48c59d9c9f0e6b9e6 Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:37:26 -0400 Subject: [PATCH 11/12] Update sendcoinsentry.cpp --- src/qt/sendcoinsentry.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/qt/sendcoinsentry.cpp b/src/qt/sendcoinsentry.cpp index 19ba5317..bf11631b 100644 --- a/src/qt/sendcoinsentry.cpp +++ b/src/qt/sendcoinsentry.cpp @@ -15,6 +15,7 @@ #include #include +#include SendCoinsEntry::SendCoinsEntry(const PlatformStyle *_platformStyle, QWidget *parent) : QStackedWidget(parent), From ce0f8268025e400ab0b7f3df112df40f937a40ca Mon Sep 17 00:00:00 2001 From: devilking6105 <43361618+devilking6105@users.noreply.github.com> Date: Tue, 19 May 2020 01:42:59 -0400 Subject: [PATCH 12/12] Update bitcoingui.cpp --- src/qt/bitcoingui.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index fac8544c..e939054a 100644 --- a/src/qt/bitcoingui.cpp +++ b/src/qt/bitcoingui.cpp @@ -597,9 +597,9 @@ void BitcoinGUI::createActions() // HTHW Donate - externalDonate = new QAction(QApplication::style()->standardIcon(QStyle::SP_FileIcon), tr("Donate To HTHW"), this); + externalDonate = new QAction(QIcon(":/icons/" + theme + "/about"), tr("Donate To HTHW"), this); externalDonate->setStatusTip(tr("Donate to Help The Homeless Worldwide")); - + connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit())); connect(aboutAction, SIGNAL(triggered()), this, SLOT(aboutClicked()));