# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1397729217 -7200
# Node ID d7cda835abd6cbf7a60bdb065b94bacc996608f8
# Parent  81cf25402cb0797eb6bb00697e5e5c5746b2178e
Some wording and Layout in TrustBridge Administration.

diff -r 81cf25402cb0 -r d7cda835abd6 ui/administratorwindow.cpp
--- a/ui/administratorwindow.cpp	Thu Apr 17 08:55:16 2014 +0000
+++ b/ui/administratorwindow.cpp	Thu Apr 17 12:06:57 2014 +0200
@@ -73,7 +73,7 @@
 
     // The certificate list
     QGroupBox *certBox = new QGroupBox(
-        tr("All managed root certificates of the certificate list:"));
+        tr("All managed root certificates of the certificate list: "));
     certificateView = new QTableView;
     certificateModel = new CertificateTabelModel();
     QSortFilterProxyModel *filterModel = new QSortFilterProxyModel(this);
@@ -81,6 +81,7 @@
     CertificateTableDelegate *delegate = new CertificateTableDelegate(certificateView);
     certificateView->setModel(filterModel);
     certificateView->setItemDelegate(delegate);
+    certificateView->horizontalHeader()->setStretchLastSection(true);
     certificateView->resizeColumnsToContents();
     certificateView->setColumnWidth(0, 60);
     certificateView->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -139,7 +140,7 @@
     QString path = QStandardPaths::locate(
         QStandardPaths::DataLocation, QString("certlist_last.txt"));
     QString certFile = QFileDialog::getOpenFileName(
-        this, tr("Select certificate file"), path, "*.txt");
+        this, tr("Select certificate list file"), path, "*.txt");
     qDebug() << "selected: " + certFile;
     certList.readList(certFile.toLocal8Bit().constData());
     if (!certList.isValid()) {
diff -r 81cf25402cb0 -r d7cda835abd6 ui/createcertlistdialog.cpp
--- a/ui/createcertlistdialog.cpp	Thu Apr 17 08:55:16 2014 +0000
+++ b/ui/createcertlistdialog.cpp	Thu Apr 17 12:06:57 2014 +0200
@@ -37,7 +37,7 @@
 
     QLabel *header = new QLabel("<h3>" + tr("Save certificate list") + "</h3>");
     QLabel *description = new QLabel(
-        tr("Save all managed root certificates in a new, signed certificate list"));
+        tr("Save all managed root certificates in a new, signed certificate list."));
     headerSubLayout->insertSpacing(0, 40);
     headerSubLayout->addWidget(description);
     QFrame *headerSeparator = new QFrame();
@@ -64,10 +64,12 @@
     connect(saveSelect, SIGNAL(clicked()), this, SLOT(openSaveLocation()));
     saveSelect->setFixedWidth(30);
 
-    QString footerText = tr("In addition, each certificate list will be saved"
+    QString footerText = tr("In addition, each certificate list will be saved "
         "automatically in the archive directory:\n");
     // TODO print out the path, not the displayName.
-    footerText.append(QStandardPaths::displayName(QStandardPaths::DataLocation));
+    footerText.append(QStandardPaths::writableLocation(
+        QStandardPaths::DataLocation));
+    //footerText.append(QStandardPaths::displayName(QStandardPaths::DataLocation));
     QLabel *footer = new QLabel(footerText);
     saveLayout->addWidget(saveLabel);
     saveLayout->addWidget(mSaveFile);
diff -r 81cf25402cb0 -r d7cda835abd6 ui/createinstallerdialog.cpp
--- a/ui/createinstallerdialog.cpp	Thu Apr 17 08:55:16 2014 +0000
+++ b/ui/createinstallerdialog.cpp	Thu Apr 17 12:06:57 2014 +0200
@@ -37,7 +37,7 @@
 
     QLabel *header = new QLabel("<h3>" + tr("Create binary installer") + "</h3>");
     QLabel *description = new QLabel(
-        tr("Create and signed a TrustBridge binary installer from source."));
+        tr("Create and sign a TrustBridge binary installer from source."));
     headerSubLayout->insertSpacing(0, 40);
     headerSubLayout->addWidget(description);
     QFrame *headerSeparator = new QFrame();