changeset 396:26651cc0cc47

Remove all certificates if a new list is loaded from file.
author Raimund Renkert <rrenkert@intevation.de>
date Tue, 15 Apr 2014 16:45:37 +0200
parents a63601810211
children 8752aae8aad8
files ui/administratorwindow.cpp ui/certificatetablemodel.cpp ui/certificatetablemodel.h
diffstat 3 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ui/administratorwindow.cpp	Tue Apr 15 16:44:55 2014 +0200
+++ b/ui/administratorwindow.cpp	Tue Apr 15 16:45:37 2014 +0200
@@ -135,6 +135,7 @@
         qDebug() << "Not a valid list.";
     }
     else {
+        certificateModel->removeAll();
         loadCertificateTable();
     }
 }
--- a/ui/certificatetablemodel.cpp	Tue Apr 15 16:44:55 2014 +0200
+++ b/ui/certificatetablemodel.cpp	Tue Apr 15 16:45:37 2014 +0200
@@ -31,14 +31,17 @@
         return false;
     }
     for (int i = row + count - 1; i >= row; i--) {
-        if (!certificates.at(i).isEditable()) {
-            certificates.removeAt(i);
-        }
+        certificates.removeAt(i);
     }
     endRemoveRows();
     return true;
 }
 
+bool CertificateTabelModel::removeAll()
+{
+    return removeRows(0, certificates.size(), QModelIndex());
+}
+
 QVariant CertificateTabelModel::data(const QModelIndex &index,
         int role) const
 {
--- a/ui/certificatetablemodel.h	Tue Apr 15 16:44:55 2014 +0200
+++ b/ui/certificatetablemodel.h	Tue Apr 15 16:45:37 2014 +0200
@@ -19,6 +19,7 @@
 
     void addCertificate(const Certificate &certificate, bool editable);
     bool removeRows(int row, int count, const QModelIndex&);
+    bool removeAll();
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
 

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