# HG changeset patch
# User Raimund Renkert <rrenkert@intevation.de>
# Date 1397558044 -7200
# Node ID e3f825a7257e66564b43bc1d0758064222ed7d7e
# Parent  9731d28b95af279fe1bc805d517e33d5d881b3da# Parent  9e38a4bcd44ee86ebabfeb0524635bc562bd77e9
merged.

diff -r 9e38a4bcd44e -r e3f825a7257e ui/administratorwindow.cpp
--- a/ui/administratorwindow.cpp	Tue Apr 15 12:06:03 2014 +0200
+++ b/ui/administratorwindow.cpp	Tue Apr 15 12:34:04 2014 +0200
@@ -73,6 +73,8 @@
     certificateView->setColumnWidth(3, 130);
     certificateView->setColumnWidth(4, 200);
     certificateView->setSelectionBehavior(QAbstractItemView::SelectRows);
+    connect(certificateView, SIGNAL(clicked(const QModelIndex&)), this,
+        SLOT(clickedCertificate(const QModelIndex&)));
     certificateView->verticalHeader()->setVisible(false);
     certLayout->addWidget(certificateView);
     certBox->setLayout(certLayout);
@@ -100,6 +102,8 @@
     addButton = new QPushButton(tr("Add"));
     connect(addButton, SIGNAL(clicked()), this, SLOT(addCertificates()));
     removeButton = new QPushButton(tr("Remove"));
+    removeButton->setEnabled(false);
+    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeCertificates()));
     bottomLayout->addWidget(saveButton);
     bottomLayout->addWidget(loadButton);
     bottomLayout->addWidget(addButton);
@@ -147,6 +151,14 @@
     addToCertificateTable(certs);
 }
 
+void AdministratorWindow::removeCertificates()
+{
+    QModelIndexList list = certificateView->selectionModel()->selectedRows();
+    for (int i = list.size() -1 ; i >= 0; i--) {
+        certificateModel->removeRow(list.at(i).row(), list.at(i));
+    }
+}
+
 void AdministratorWindow::loadCertificateTable() {
     foreach(const Certificate &cert, certList.getCertificates()) {
         certificateModel->addCertificate(cert, true);
@@ -182,3 +194,12 @@
     dialog->show();
 }
 
+void AdministratorWindow::clickedCertificate(const QModelIndex &index)
+{
+    if (index.data(Qt::UserRole).toBool()) {
+        removeButton->setEnabled(false);
+    }
+    else {
+        removeButton->setEnabled(true);
+    }
+}
diff -r 9e38a4bcd44e -r e3f825a7257e ui/administratorwindow.h
--- a/ui/administratorwindow.h	Tue Apr 15 12:06:03 2014 +0200
+++ b/ui/administratorwindow.h	Tue Apr 15 12:34:04 2014 +0200
@@ -33,6 +33,8 @@
     void loadCertificateFile();
     void saveCertificateFile();
     void addCertificates();
+    void removeCertificates();
+    void clickedCertificate(const QModelIndex&);
 
 private:
     void createActions();
diff -r 9e38a4bcd44e -r e3f825a7257e ui/certificatetablemodel.cpp
--- a/ui/certificatetablemodel.cpp	Tue Apr 15 12:06:03 2014 +0200
+++ b/ui/certificatetablemodel.cpp	Tue Apr 15 12:34:04 2014 +0200
@@ -20,6 +20,22 @@
     endInsertRows();
 }
 
+bool CertificateTabelModel::removeRows(int row, int count,
+    const QModelIndex &index)
+{
+    beginRemoveRows(QModelIndex(), row, row + count - 1);
+    if ((row + count - 1) > certificates.size()) {
+        return false;
+    }
+    for (int i = row + count - 1; i >= row; i--) {
+        if (!certificates.at(i).isEditable()) {
+            certificates.removeAt(i);
+        }
+    }
+    endRemoveRows();
+    return true;
+}
+
 QVariant CertificateTabelModel::data(const QModelIndex &index,
         int role) const
 {
diff -r 9e38a4bcd44e -r e3f825a7257e ui/certificatetablemodel.h
--- a/ui/certificatetablemodel.h	Tue Apr 15 12:06:03 2014 +0200
+++ b/ui/certificatetablemodel.h	Tue Apr 15 12:34:04 2014 +0200
@@ -18,6 +18,7 @@
     CertificateTabelModel(QObject *parent = 0);
 
     void addCertificate(const Certificate &certificate, bool editable);
+    bool removeRows(int row, int count, const QModelIndex&);
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;