GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1296:8d5a04adee81

connect remove event button

trabillard -

r1296:8d5a04adee81

parent child

Context file:

r1296:8d5a04adee81

core/src/Catalogue/CatalogueController.cpp +1 0

                 impl->m_CatalogueDao.removeEvent(*event);
                 event->setRepository(impl->toSyncRepository(event->getRepository()));
                 impl->m_CatalogueDao.removeEvent(*event);
+                impl->savAllDB();
             }
             void CatalogueController::addEvent(std::shared_ptr<DBEvent> event)

gui/src/Catalogue/CatalogueEventsWidget.cpp +41 -8

             #include <QDialog>
             #include <QDialogButtonBox>
             #include <QListWidget>
+            #include <QMessageBox>
             Q_LOGGING_CATEGORY(LOG_CatalogueEventsWidget, "CatalogueEventsWidget")
                             << "updateGraphMode: not compatible with multiple events selected";
                     }
                 }
+                void getSelectedItems(
+                    QTreeView *treeView, QVector<std::shared_ptr<DBEvent> > &events,
+                    QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > &eventProducts)
+                {
+                    for (auto rowIndex : treeView->selectionModel()->selectedRows()) {
+                        auto itemType = m_Model->itemTypeOf(rowIndex);
+                        if (itemType == CatalogueEventsModel::ItemType::Event) {
+                            events << m_Model->getEvent(rowIndex);
+                        }
+                        else if (itemType == CatalogueEventsModel::ItemType::EventProduct) {
+                            eventProducts << qMakePair(m_Model->getParentEvent(rowIndex),
+                                                       m_Model->getEventProduct(rowIndex));
+                        }
+                    }
+                }
             };
             CatalogueEventsWidget::CatalogueEventsWidget(QWidget *parent)
                     }
                 });
-                auto emitSelection = [this]() {
+                connect(ui->btnRemove, &QToolButton::clicked, [this]() {
                     QVector<std::shared_ptr<DBEvent> > events;
                     QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
+                    impl->getSelectedItems(ui->treeView, events, eventProducts);
-                    for (auto rowIndex : ui->treeView->selectionModel()->selectedRows()) {
+                    if (!events.isEmpty() && eventProducts.isEmpty()) {
-                        auto itemType = impl->m_Model->itemTypeOf(rowIndex);
+                        if (QMessageBox::warning(this, tr("Remove Event(s)"),
-                        if (itemType == CatalogueEventsModel::ItemType::Event) {
+                                                 tr("The selected event(s) will be completly removed "
-                            events << impl->m_Model->getEvent(rowIndex);
+                                                    "from the repository!\nAre you sure you want to continue?"),
+                                                 QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            == QMessageBox::Yes) {
+                            for (auto event : events) {
+                                sqpApp->catalogueController().removeEvent(event);
+                                impl->removeEvent(event, ui->treeView);
                             }
-                        else if (itemType == CatalogueEventsModel::ItemType::EventProduct) {
-                            eventProducts << qMakePair(impl->m_Model->getParentEvent(rowIndex),
-                                                       impl->m_Model->getEventProduct(rowIndex));
                         }
                     }
+                });
+                auto emitSelection = [this]() {
+                    QVector<std::shared_ptr<DBEvent> > events;
+                    QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
+                    impl->getSelectedItems(ui->treeView, events, eventProducts);
                     if (!events.isEmpty() && eventProducts.isEmpty()) {
                         emit this->eventsSelected(events);
                 connect(ui->treeView, &QTreeView::clicked, emitSelection);
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, emitSelection);
+                ui->btnRemove->setEnabled(false); // Disabled by default when nothing is selected
                 connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, [this]() {
                     auto isNotMultiSelection = ui->treeView->selectionModel()->selectedRows().count() <= 1;
                     ui->btnChart->setEnabled(isNotMultiSelection);
                     else if (isNotMultiSelection && ui->btnChart->isChecked()) {
                         impl->updateForGraphMode(ui->treeView);
                     }
+                    QVector<std::shared_ptr<DBEvent> > events;
+                    QVector<QPair<std::shared_ptr<DBEvent>, std::shared_ptr<DBEventProduct> > > eventProducts;
+                    impl->getSelectedItems(ui->treeView, events, eventProducts);
+                    ui->btnRemove->setEnabled(!events.isEmpty() && eventProducts.isEmpty());
                 });
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);

General Comments 3

perrinel

|

Auto status change to "Under Review"

perrinel

|

Status change > Approved

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages