comparison ui/administratorwindow.h @ 681:5e25159d7025

Merged
author Sascha Wilde <wilde@intevation.de>
date Mon, 30 Jun 2014 18:35:22 +0200
parents 75cd2fbf9ac6
children 0b7bb4f68f5a
comparison
equal deleted inserted replaced
680:a5a709c6ce93 681:5e25159d7025
46 46
47 /** @brief log the diff between the initial certificate list and the list 47 /** @brief log the diff between the initial certificate list and the list
48 * saved as current. 48 * saved as current.
49 * 49 *
50 * @param currentCerts Path to the current certificate list file. 50 * @param currentCerts Path to the current certificate list file.
51 * @param certFingerprint The fingerprint of the signing key used.
51 */ 52 */
52 void logChanges(const QString &currentCerts); 53 void logChanges(const QString &currentCerts, const QString &keyFingerprint);
53 54
54 /** @brief get the currently changed certificates. 55 /** @brief get the currently changed certificates.
55 * @return a list of certificates. 56 * @return a list of certificates.
56 */ 57 */
57 QList<Certificate> currentChanges(); 58 QList<Certificate> currentChanges();
69 void createActions(); 70 void createActions();
70 void createMenuBar(); 71 void createMenuBar();
71 void createContent(); 72 void createContent();
72 void loadCertificateTable(); 73 void loadCertificateTable();
73 void addToCertificateTable(const QList<Certificate> &certs); 74 void addToCertificateTable(const QList<Certificate> &certs);
74 QByteArray createLogEntries(const CertificateList &list); 75 QByteArray createLogEntries(const CertificateList &list, const QString &keyFingerprint);
75 76
76 QSettings mSettings; 77 QSettings mSettings;
77 78
78 QMenuBar *menuBar; 79 QMenuBar *menuBar;
79 80

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