changeset 982:85c497b45488

Merged.
author Emanuel Schuetze <emanuel@intevation.de>
date Fri, 29 Aug 2014 16:08:50 +0200
parents 947a880ec5d3 (diff) 491327689ffc (current diff)
children 427e2e18b8c8
files
diffstat 2 files changed, 12 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/ui/l10n/administrator_de_DE.ts	Fri Aug 29 16:00:38 2014 +0200
+++ b/ui/l10n/administrator_de_DE.ts	Fri Aug 29 16:08:50 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>
--- a/ui/textoverlaybutton.cpp	Fri Aug 29 16:00:38 2014 +0200
+++ b/ui/textoverlaybutton.cpp	Fri Aug 29 16:08:50 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;

http://wald.intevation.org/projects/trustbridge/