jepler/openscad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove flattr icon and use styled link instead.

Browse source 
This change is mainly driven by Debian declaring the button non-free so
it must be removed when distributing OpenSCAD in Debian.
This commit is contained in:
Torsten Paul 2015-06-28 19:25:12 +02:00 committed by Marius Kintel
parent 85aa71bb4b
commit 9768a0adc9
4 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
icons/flattr.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

1
openscad.qrc
View file

@ -29,7 +29,6 @@
<file>icons/prefs3DView.png</file> <file>icons/prefs3DView.png</file>
<file>icons/prefsEditor.png</file> <file>icons/prefsEditor.png</file>
<file>icons/prefsUpdate.png</file> <file>icons/prefsUpdate.png</file>
<file>icons/flattr.png</file>
<file>src/AboutDialog.html</file> <file>src/AboutDialog.html</file>
<file>images/export.png</file> <file>images/export.png</file>
<file>images/axes.png</file> <file>images/axes.png</file>

2
src/AboutDialog.h
View file

@ -11,8 +11,6 @@ public:
AboutDialog(QWidget *) { AboutDialog(QWidget *) {
setupUi(this); setupUi(this);
this->setWindowTitle( QString(_("About OpenSCAD")) + " " + openscad_shortversionnumber.c_str()); this->setWindowTitle( QString(_("About OpenSCAD")) + " " + openscad_shortversionnumber.c_str());
QUrl flattr_qurl(":icons/flattr.png" );
this->aboutText->loadResource( QTextDocument::ImageResource, flattr_qurl );
QString tmp = this->aboutText->toHtml(); QString tmp = this->aboutText->toHtml();
tmp.replace("__VERSION__", openscad_detailedversionnumber.c_str()); tmp.replace("__VERSION__", openscad_detailedversionnumber.c_str());
this->aboutText->setHtml(tmp); this->aboutText->setHtml(tmp);

24
src/AboutDialog.html
View file

@ -9,13 +9,29 @@
<head> <head>
<meta charset="UTF-8"/> <meta charset="UTF-8"/>
<meta http-equiv="Content-Type" content="text/html;charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"/>
<style type=text/css>
body {
font: 13pt Arial,sans-serif;
}
.flattr-link {
color: white;
background: #88B058;
font: bold 14px Helvetica,sans-serif;
}
.donate-link {
color: white;
background: dodgerblue;
font: bold 14px Helvetica,sans-serif;
}
</style>
</head> </head>
<body>
<body style="font-family:'Arial'; font-size:13pt;"> <p align="right">
<a class="flattr-link" href="https://flattr.com/submit/auto?user_id=openscad&amp;url=http://openscad.org&amp;title=OpenSCAD&amp;language=&amp;tags=github&amp;category=software">&nbsp;Flattr&nbsp;this!&nbsp;</a>
<p> <a class="donate-link" href="http://www.openscad.org/community.html">&nbsp;Donate&nbsp;</a>
<a align=right href="https://flattr.com/submit/auto?user_id=openscad&amp;url=http://openscad.org&amp;title=OpenSCAD&amp;language=&amp;tags=github&amp;category=software"><img align=right src=":icons/flattr.png" /></a>
</p> </p>
<p> <p>