# HG changeset patch
# User Sascha Wilde <wilde@intevation.de>
# Date 1404228151 -7200
# Node ID f12b102b33caf325da271e303398d803f3cf0eb1
# Parent  b55d49150e3698a87b7801e3a29cf3a0ec326c7a# Parent  a45682b5ff7eb3a5231bc56d3b53d325130c2cbc
Merged

diff -r b55d49150e36 -r f12b102b33ca ui/certificatelistwidget.cpp
--- a/ui/certificatelistwidget.cpp	Tue Jul 01 17:21:21 2014 +0200
+++ b/ui/certificatelistwidget.cpp	Tue Jul 01 17:22:31 2014 +0200
@@ -85,6 +85,7 @@
         this, SLOT(certStateChanged(bool, const Certificate&)));
     item->setSizeHint(widget->minimumSizeHint());
     mCertificateList->setItemWidget(item, widget);
+    emit certListChanged(-1);
 }
 
 void CertificateListWidget::addCertificates(const QList<Certificate> &list)
@@ -103,6 +104,7 @@
             delete(item);
         }
     }
+    emit certListChanged(-1);
 }
 
 void CertificateListWidget::clear()
diff -r b55d49150e36 -r f12b102b33ca ui/l10n/trustbridge_de_DE.ts
--- a/ui/l10n/trustbridge_de_DE.ts	Tue Jul 01 17:21:21 2014 +0200
+++ b/ui/l10n/trustbridge_de_DE.ts	Tue Jul 01 17:22:31 2014 +0200
@@ -169,19 +169,19 @@
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="405"/>
+        <location filename="../mainwindow.cpp" line="822"/>
         <source>Quit</source>
         <translation>Beenden</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="423"/>
-        <location filename="../mainwindow.cpp" line="728"/>
+        <location filename="../mainwindow.cpp" line="735"/>
         <source>TrustBridge</source>
         <translation>TrustBridge</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="465"/>
         <source>Updates</source>
-        <translation>Aktualisierungen</translation>
+        <translation type="vanished">Aktualisierungen</translation>
     </message>
     <message>
         <location filename="../mainwindow.cpp" line="484"/>
@@ -196,36 +196,33 @@
         <translation>Letzte Aktualisierung von TrustBridge: %1</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="536"/>
-        <location filename="../mainwindow.cpp" line="808"/>
-        <location filename="../mainwindow.cpp" line="886"/>
         <source>Updates (%1/%2)</source>
-        <translation>Aktualisierungen (%1/%2)</translation>
+        <translation type="vanished">Aktualisierungen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="552"/>
+        <location filename="../mainwindow.cpp" line="553"/>
+        <location filename="../mainwindow.cpp" line="826"/>
         <source>Quit without saving</source>
         <translation>Beenden ohne Speichern</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="603"/>
-        <location filename="../mainwindow.cpp" line="818"/>
-        <location filename="../mainwindow.cpp" line="899"/>
+        <location filename="../mainwindow.cpp" line="604"/>
+        <location filename="../mainwindow.cpp" line="838"/>
         <source>Remove revoked certificates (%1/%2)</source>
         <translation>Zurückgezogene Zertifikate löschen (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="664"/>
+        <location filename="../mainwindow.cpp" line="667"/>
         <source>Trusted certificates</source>
         <translation>Vertrauenswürdige Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="665"/>
+        <location filename="../mainwindow.cpp" line="668"/>
         <source>The following list of trusted root certificates is managed by the BSI. The BSI validates independently the authenticity, security and actuality of these certificates.</source>
         <translation>Die folgende Liste von Wurzelzertifikaten wird durch das BSI betreut. Das BSI überprüft dabei unabhängig die Echtheit, Sicherheit und Aktualität der Zertifikate.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="671"/>
+        <location filename="../mainwindow.cpp" line="675"/>
         <source>Please choose the certificates you want to trust or untrust. TrustBridge will install these certificates for your secure communication for email and internet.</source>
         <translation>Legen Sie fest, welchen Zertifikaten Sie vertrauen wollen. TrustBridge wird diese Zertifikate dann für Ihre sichere Kommunikation via E-Mail und Internet installieren.</translation>
     </message>
@@ -244,8 +241,12 @@
 und Hilfe</translation>
     </message>
     <message>
+        <source>Updates (%1)</source>
+        <translation type="obsolete">Aktualisierungen (%1/%2) {1)?}</translation>
+    </message>
+    <message>
         <location filename="../mainwindow.cpp" line="538"/>
-        <location filename="../mainwindow.cpp" line="889"/>
+        <location filename="../mainwindow.cpp" line="907"/>
         <source>Last update of certificates: %1</source>
         <translation>Letzte Aktualisierung der Zertifikate: %1</translation>
     </message>
@@ -255,52 +256,50 @@
         <translation>Sie sollten die folgenden Änderungen an Ihren Wurzelzertifikaten übernehmen:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="550"/>
+        <location filename="../mainwindow.cpp" line="551"/>
         <source>Check for updates</source>
         <translation>Nach Aktualisierungen suchen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="554"/>
         <source>Install updates</source>
-        <translation>Aktualisierungen einspielen</translation>
+        <translation type="vanished">Aktualisierungen einspielen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="586"/>
-        <location filename="../mainwindow.cpp" line="813"/>
-        <location filename="../mainwindow.cpp" line="893"/>
+        <location filename="../mainwindow.cpp" line="587"/>
+        <location filename="../mainwindow.cpp" line="833"/>
         <source>Install new trusted certificates (%1/%2)</source>
         <translation>Neue, vertrauenswürdige Zertifikate installieren (%1/%2)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="588"/>
-        <location filename="../mainwindow.cpp" line="605"/>
-        <location filename="../mainwindow.cpp" line="622"/>
-        <location filename="../mainwindow.cpp" line="1104"/>
-        <location filename="../mainwindow.cpp" line="1118"/>
-        <location filename="../mainwindow.cpp" line="1131"/>
+        <location filename="../mainwindow.cpp" line="589"/>
+        <location filename="../mainwindow.cpp" line="606"/>
+        <location filename="../mainwindow.cpp" line="623"/>
+        <location filename="../mainwindow.cpp" line="1111"/>
+        <location filename="../mainwindow.cpp" line="1125"/>
+        <location filename="../mainwindow.cpp" line="1138"/>
         <source>Show details</source>
         <translation>Details einblenden</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="693"/>
+        <location filename="../mainwindow.cpp" line="698"/>
         <source>Revoked certificates</source>
         <translation>Zurückgezogene Zertifikate</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="694"/>
+        <location filename="../mainwindow.cpp" line="699"/>
         <source>Certificates can be corrupted or stolen and misused in many ways. Therefore the BSI recommends to remove all revoked certificates from your system.</source>
         <translation>Zertifikate können auf vielfache Weise korrumpiert oder gestohlen und missbraucht werden. Das BSI empfiehlt Ihnen daher zurückgezogene Zertifikate auch umgehend von Ihrem System zu entfernen.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="700"/>
+        <location filename="../mainwindow.cpp" line="706"/>
         <source>The follwing unsecure certificates were revoked by the BSI. Already uninstalled certificates cannot be reinstalled. It is recommended that you select all certificates to uninstall if you still have revoked certificates installed.</source>
         <translation>Die folgenden unsicheren Zertifikate wurden vom BSI zurückgezogen. Bereits deinstallierte Zertifikate können nicht wieder installiert werden. Es wird empfohlen, dass Sie alle Zertifikate zur Deinstallation markieren, sofern Sie noch zurückgezogene Zertifikate installiert haben.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="620"/>
-        <location filename="../mainwindow.cpp" line="904"/>
-        <location filename="../mainwindow.cpp" line="1030"/>
-        <location filename="../mainwindow.cpp" line="1040"/>
+        <location filename="../mainwindow.cpp" line="621"/>
+        <location filename="../mainwindow.cpp" line="910"/>
+        <location filename="../mainwindow.cpp" line="1037"/>
+        <location filename="../mainwindow.cpp" line="1047"/>
         <source>Manually changed certificates (%1)</source>
         <translation>Manuell geänderte Zertifikate (%1)</translation>
     </message>
@@ -310,31 +309,47 @@
         <translation>Vertrauen in Ihre digitale Kommunikation</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="729"/>
+        <location filename="../mainwindow.cpp" line="465"/>
+        <source>Changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="536"/>
+        <location filename="../mainwindow.cpp" line="823"/>
+        <source>Certificates unchanged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="555"/>
+        <source>Apply changes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="736"/>
         <source>Version: </source>
         <translation>Version:</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="746"/>
+        <location filename="../mainwindow.cpp" line="753"/>
         <source>TrustBridge is a root certificate installer for Windows and Linux.</source>
         <translation>TrustBridge ist eine Wurzelzertifikatsinstaller für Windows und Linux.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="751"/>
+        <location filename="../mainwindow.cpp" line="758"/>
         <source>The root certificate lists are managed by the German &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Federal Office for Information Security (BSI)&lt;/a&gt;.
 
 </source>
         <translation>Die Liste der Wurzelzertifikate wird vom &lt;a href=&quot;https://www.bsi.bund.de&quot;&gt;Bundesamt für Sicherheit in der Informationstechnik (BSI)&lt;/a&gt; verwaltet.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="757"/>
+        <location filename="../mainwindow.cpp" line="764"/>
         <source>The software was developed by the companies &lt;a href=&quot;http://www.intevation.de&quot;&gt;Intevation GmbH&lt;/a&gt; and  &lt;a href=&quot;http://www.dn-systems.de&quot;&gt;DN-Systems GmbH&lt;/a&gt;, &lt;br&gt; contracted by the German Federal Office for Information Security (BSI).
 
 </source>
         <translation>Die Software wurde von den Unternehmen &lt;a href=&quot;http://www.intevation.de&quot;&gt;Intevation GmbH&lt;/a&gt; und  &lt;a href=&quot;http://www.dn-systems.de&quot;&gt;DN-Systems GmbH&lt;/a&gt; entwickelt, &lt;br&gt; beauftragt vom Bundesamt für Sicherheit in der Informationstechnik (BSI).</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="764"/>
+        <location filename="../mainwindow.cpp" line="771"/>
         <source>TrustBridge is Free Software licensed under GNU GPL v2+.
 
 Copyright (C) 2014 by Bundesamt für Sicherheit in der Informationstechnik</source>
@@ -343,19 +358,24 @@
 Copyright (C) 2014, Bundesamt für Sicherheit in der Informationstechnik (BSI)</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="866"/>
+        <location filename="../mainwindow.cpp" line="827"/>
+        <source>Changes (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="886"/>
         <source>install</source>
         <translation>Installieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="866"/>
+        <location filename="../mainwindow.cpp" line="886"/>
         <source>ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="1098"/>
-        <location filename="../mainwindow.cpp" line="1112"/>
-        <location filename="../mainwindow.cpp" line="1126"/>
+        <location filename="../mainwindow.cpp" line="1105"/>
+        <location filename="../mainwindow.cpp" line="1119"/>
+        <location filename="../mainwindow.cpp" line="1133"/>
         <source>Hide details</source>
         <translation>Details ausblenden</translation>
     </message>
@@ -367,12 +387,12 @@
 Hier klicken, um Download und Installation zu starten.</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="909"/>
+        <location filename="../mainwindow.cpp" line="916"/>
         <source>Error executing update</source>
         <translation>Fehler bei der Aktualisierung</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="966"/>
+        <location filename="../mainwindow.cpp" line="973"/>
         <source>Installing certificates...</source>
         <translation>Zertifikate werden installiert...</translation>
     </message>
diff -r b55d49150e36 -r f12b102b33ca ui/mainwindow.cpp
--- a/ui/mainwindow.cpp	Tue Jul 01 17:21:21 2014 +0200
+++ b/ui/mainwindow.cpp	Tue Jul 01 17:22:31 2014 +0200
@@ -462,7 +462,7 @@
     updatesButton->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
     updatesButton->setIcon(QIcon(":/img/view-refresh.png"));
     updatesButton->setIconSize(QSize(40, 40));
-    updatesButton->setText(tr("Updates"));
+    updatesButton->setText(tr("Changes"));
     updatesButton->setFixedWidth(120);
     updatesButton->setFixedHeight(80);
     updatesButton->setCheckable(true);
@@ -533,13 +533,14 @@
     QHBoxLayout *updatesHeaderSearchLayout = new QHBoxLayout;
 
     mUpdatesHeader =
-        new QLabel("<h2>" + tr("Updates (%1/%2)").arg(0).arg(0)+ "</h2>");
+        new QLabel("<h2>" + tr("Certificates unchanged")+ "</h2>");
     mLastCertUpdate =
         new QLabel(tr("Last update of certificates: %1").arg(""));
     mLastSWupdate =
         new QLabel(tr("Last update of TrustBridge: %1").arg(""));
     QLabel *updatesTip =
         new QLabel(tr("You should apply the following changes to your root certificates:"));
+    updatesTip->setWordWrap(true);
 
     updatesHeaderTextLayout->addWidget(mUpdatesHeader);
     updatesHeaderTextLayout->addWidget(mLastCertUpdate);
@@ -551,7 +552,7 @@
     searchUpdates->setIcon(QIcon(":/img/edit-find.png"));
     mQuitButton = new QPushButton(tr("Quit without saving"));
     mQuitButton->setIcon(QIcon(":/img/application-exit.png"));
-    QPushButton *installButton = new QPushButton(tr("Install updates"));
+    QPushButton *installButton = new QPushButton(tr("Apply changes"));
 #ifdef Q_OS_WIN
     if (is_admin()) {
         QIcon uacShield = QApplication::style()->standardIcon(QStyle::SP_VistaShield);
@@ -811,19 +812,21 @@
 
 void MainWindow::listChanged(int selected)
 {
-    if (mUpdatesRemove->selectedCertCount() +
-        mUpdatesNew->selectedCertCount() +
-        mUpdatesManual->selectedCertCount() == 0) {
+    int totalCount = mUpdatesRemove->selectedCertCount() +
+        mUpdatesNew->selectedCertCount() + mUpdatesManual->certificates().size();
+
+    if (!totalCount) {
         /* No changes */
         mQuitButton->setText(tr("Quit"));
+        mUpdatesHeader->setText("<h2>" + tr("Certificates unchanged") +
+                "</h2>");
     } else {
         mQuitButton->setText(tr("Quit without saving"));
+        mUpdatesHeader->setText("<h2>" + tr("Changes (%1)")
+                .arg(totalCount) +
+                "</h2>");
     }
 
-    mUpdatesHeader->setText("<h2>" + tr("Updates (%1/%2)")
-            .arg(mUpdatesRemove->selectedCertCount() + mUpdatesNew->selectedCertCount())
-            .arg(mUpdatesRemove->certificates().size() + mUpdatesNew->certificates().size()) +
-            "</h2>");
     mUpdatesNewCertificates->setText("<h3>" +
             tr("Install new trusted certificates (%1/%2)")
             .arg(mUpdatesNew->selectedCertCount())