From a2c30b1849c1a7256eb8837d55066b5a539c3f1e Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 6 Aug 2015 00:13:59 +0200 Subject: [PATCH] [Companion] Blacklist added (for companies who don't respect the GPL) --- BLACKLIST.txt | 3 +++ companion/src/companion.qrc | 1 + companion/src/contributorsdialog.cpp | 12 ++++++++---- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 BLACKLIST.txt diff --git a/BLACKLIST.txt b/BLACKLIST.txt new file mode 100644 index 000000000..e1af2dde4 --- /dev/null +++ b/BLACKLIST.txt @@ -0,0 +1,3 @@ +3D Robotics +They sell the Iris+ with a modified version of OpenTX which doesn't fullfil the GPL requirements. +No donations, no thanks, we are just free staff for them!!! diff --git a/companion/src/companion.qrc b/companion/src/companion.qrc index 907154c77..c31939f85 100644 --- a/companion/src/companion.qrc +++ b/companion/src/companion.qrc @@ -4,6 +4,7 @@ icon.png ../../CREDITS.txt ../../DONATIONS.txt + ../../BLACKLIST.txt ../releasenotes.txt images/9xdb.png images/9xdl.png diff --git a/companion/src/contributorsdialog.cpp b/companion/src/contributorsdialog.cpp index fd6d7617f..9d7e45fac 100644 --- a/companion/src/contributorsdialog.cpp +++ b/companion/src/contributorsdialog.cpp @@ -59,12 +59,16 @@ ContributorsDialog::ContributorsDialog(QWidget * parent): str.append(formatTable(tr("People who have donated to OpenTX"), names, 6)); } - str.append("  " \ - " " + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "
" \ - " " + tr("Thank you all !!!") + "" \ + str.append("" \ + " " \ "
 
" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "
"); - + QFile blacklist(":/BLACKLIST.txt"); + if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) { + QStringList names; + names << blacklist.readAll(); + str.append(formatTable(tr("OpenTX Blacklist"), names, 1)); + } str.append(""); ui->textEditor->setHtml(str); ui->textEditor->scroll(0, 0);