Skip to content

Commit

Permalink
Fix musescore#7970: Help > About... Replace link to donate page, chan…
Browse files Browse the repository at this point in the history 
…ge its text, say GPL version

Fixes issue musescore#7970 for the 3.x branch
  • Loading branch information
@Jojo-Schmitz
Jojo-Schmitz committed Jul 28, 2021
1 parent f9942d0 commit de9a24f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions mscore/aboutbox.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,11 +157,11 @@
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit</span><span style=" font-family:'Arial'; font-size:10pt; color:#0000ff;"> </span><a href="http://www.musescore.org/en/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for new versions and more information.</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Support MuseScore with </span><a href="http://www.musescore.org/en/donate"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">your donation</span></a>.</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Visit</span><span style=" font-family:'Arial'; font-size:10pt; color:#0000ff;"> </span><a href="https://www.musescore.org/"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">www.musescore.org</span></a><span style=" font-family:'Arial'; font-size:10pt;"> for new versions and more information.</span></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Get </span><a href="https://www.musescore.org/forum"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">help</span></a><span style=" font-family:'Arial'; font-size:10pt;"> with the program or </span><a href="https://www.musescore.org/contribute"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">contribute</span></a><span style=" font-family:'Arial'; font-size:10pt;"> to its development.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Arial'; font-size:10pt;"><br /></p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Arial'; font-size:10pt;">Copyright </span><span style=" font-size:10pt;">©</span><span style=" font-family:'Arial'; font-size:10pt;"> 1999-2021 MuseScore BVBA and others. </span></p>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:10pt;&quot;&gt;Published under the GNU General Public License.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Arial'; font-size:10pt;&quot;&gt;Published under the &lt;/span&gt;&lt;a href=&quot;https://www.gnu.org/licenses/old-licenses/gpl-2.0.html&quot;&gt;&lt;span style=&quot; font-size:10pt; text-decoration: underline; color:#0000ff;&quot;&gt;GNU General Public License version 2&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-family:'Arial'; font-size:10pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
Expand Down
12 changes: 6 additions & 6 deletions mscore/musescoredialogs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ AboutBoxDialog::AboutBoxDialog()

QString visitAndDonateString;
#if !defined(FOR_WINSTORE)
visitAndDonateString = tr("Visit %1www.musescore.org%2 for new versions and more information.\nSupport MuseScore with your %3donation%4.")
.arg("<a href=\"https://www.musescore.org/\">")
.arg("</a>")
.arg("<a href=\"https://www.musescore.org/donate\">")
.arg("</a>");
visitAndDonateString = tr("Visit %1 for new versions and more information.\nGet %2help%3 with the program or %4contribute%5 to its development.")
.arg("<a href=\"https://www.musescore.org/\">www.musescore.org</a>",
"<a href=\"https://www.musescore.org/forum\">", "</a>",
"<a href=\"https://www.musescore.org/contribute\">", "</a>");
visitAndDonateString += "\n\n";
#endif
QString finalString = visitAndDonateString + tr("Copyright &copy; 1999-2021 MuseScore BVBA and others.\nPublished under the GNU General Public License.");
QString finalString = visitAndDonateString + tr("Copyright &copy; 1999-2021 MuseScore BVBA and others.\nPublished under the %1GNU General Public License version 2%2.")
.arg("<a href=\"https://www.gnu.org/licenses/old-licenses/gpl-2.0.html\">", "</a>");
finalString.replace("\n", "<br/>");
copyrightLabel->setText(QString("<span style=\"font-size:10pt;\">%1</span>").arg(finalString));
connect(copyRevisionButton, SIGNAL(clicked()), this, SLOT(copyRevisionToClipboard()));
Expand Down

0 comments on commit de9a24f

Please sign in to comment.