[PATCH 1 of 2] (issue72) Set font color in red circle to white. Cleanup old code
Wald Commits
scm-commit at wald.intevation.org
Fri Aug 29 16:09:25 CEST 2014
# HG changeset patch
# User Emanuel Schuetze <emanuel at intevation.de>
# Date 1409321313 -7200
# Node ID 947a880ec5d322e319a4e45f28b4e3f8890b6e66
# Parent 01128d63226d23dd36fc7f27d4d794411f14cc45
(issue72) Set font color in red circle to white. Cleanup old code.
diff -r 01128d63226d -r 947a880ec5d3 ui/l10n/administrator_de_DE.ts
--- a/ui/l10n/administrator_de_DE.ts Fri Aug 29 14:28:00 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts Fri Aug 29 16:08:33 2014 +0200
@@ -485,38 +485,38 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="390"/>
+ <location filename="../createinstallerdialog.cpp" line="415"/>
<source>Signing binaries...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="400"/>
+ <location filename="../createinstallerdialog.cpp" line="422"/>
<source>Failed to copy binaries to temporary location.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="406"/>
+ <location filename="../createinstallerdialog.cpp" line="434"/>
<source>Failed to sign binaries with osslsigncode.
Please check that %1 is a valid code signing certificate and thatosslsigncode can be found in the PATH.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="427"/>
+ <location filename="../createinstallerdialog.cpp" line="455"/>
<source>Failed to load certificate: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="439"/>
+ <location filename="../createinstallerdialog.cpp" line="467"/>
<source>Only 3072 bit RSA keys are supported by the current format.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="445"/>
+ <location filename="../createinstallerdialog.cpp" line="473"/>
<source>Failed to open input file: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="454"/>
+ <location filename="../createinstallerdialog.cpp" line="482"/>
<source>Failed to read input file: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -524,22 +524,22 @@
<context>
<name>FinishedDialog</name>
<message>
- <location filename="../createinstallerdialog.cpp" line="491"/>
+ <location filename="../createinstallerdialog.cpp" line="519"/>
<source>Successfully created installation package</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="495"/>
+ <location filename="../createinstallerdialog.cpp" line="523"/>
<source>Error!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="503"/>
+ <location filename="../createinstallerdialog.cpp" line="531"/>
<source>Details</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../createinstallerdialog.cpp" line="507"/>
+ <location filename="../createinstallerdialog.cpp" line="535"/>
<source>OK</source>
<translation type="unfinished"></translation>
</message>
diff -r 01128d63226d -r 947a880ec5d3 ui/textoverlaybutton.cpp
--- a/ui/textoverlaybutton.cpp Fri Aug 29 14:28:00 2014 +0200
+++ b/ui/textoverlaybutton.cpp Fri Aug 29 16:08:33 2014 +0200
@@ -30,16 +30,6 @@
QRect myRect = e->rect().translated(26, -29);
// circle
-/* old manually painted background
- QLinearGradient gradient(myRect.topLeft(),
- myRect.bottomRight());
- gradient.setColorAt(0, Qt::white);
- gradient.setColorAt(0.7, Qt::red);
- QBrush brush(gradient);
- painter.setBrush(brush);
- painter.setPen(Qt::white);
- painter.drawEllipse(75.5, 6, 20, 20);
- */
painter.drawPixmap(75.5, 5, mBackground);
// font
@@ -47,6 +37,7 @@
font.setPixelSize(11);
font.setWeight(QFont::Bold);
painter.setFont(font);
+ painter.setPen(Qt::white);
painter.drawText(myRect, Qt::AlignCenter | Qt::AlignVCenter, mOverlay);
return;
More information about the Trustbridge-commits
mailing list