GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1289:f48f3e7d295f

Handle selection of trash and repository items

trabillard -

r1289:f48f3e7d295f

parent child

Context file:

r1289:f48f3e7d295f

gui/include/Catalogue/CatalogueEventsWidget.h +1 0

             public slots:
                 void populateWithCatalogues(const QVector<std::shared_ptr<DBCatalogue> > &catalogues);
                 void populateWithAllEvents();
+                void clear();
                 void refresh();
             private:

gui/src/Catalogue/CatalogueEventsWidget.cpp +9 -1

                         setEventChanges(event, impl->m_Model->eventsHasChanges(event));
                     }
                 });
+                populateWithAllEvents();
             }
             CatalogueEventsWidget::~CatalogueEventsWidget()
             bool CatalogueEventsWidget::isAllEventsDisplayed() const
             {
-                return impl->m_DisplayedCatalogues.isEmpty();
+                return impl->m_DisplayedCatalogues.isEmpty() && !impl->m_Model->events().isEmpty();
             }
             bool CatalogueEventsWidget::isEventDisplayed(const std::shared_ptr<DBEvent> &event) const
                 impl->setEvents(events, ui->treeView);
             }
+            void CatalogueEventsWidget::clear()
+            {
+                impl->m_DisplayedCatalogues.clear();
+                impl->setEvents({}, ui->treeView);
+            }
             void CatalogueEventsWidget::refresh()
             {
                 if (impl->m_DisplayedCatalogues.isEmpty()) {

gui/src/Catalogue/CatalogueExplorer.cpp +17 -4

                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                 });
-                connect(ui->catalogues, &CatalogueSideBarWidget::trashSelected,
+                connect(ui->catalogues, &CatalogueSideBarWidget::trashSelected, [this]() {
-                        [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
+                    ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
+                    ui->events->clear();
+                });
                 connect(ui->catalogues, &CatalogueSideBarWidget::allEventsSelected, [this]() {
                     ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
                     ui->events->populateWithAllEvents();
                 });
-                connect(ui->catalogues, &CatalogueSideBarWidget::selectionCleared,
+                connect(ui->catalogues, &CatalogueSideBarWidget::databaseSelected, [this](auto databaseList) {
-                        [this]() { ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty); });
+                    QVector<std::shared_ptr<DBCatalogue> > catalogueList;
+                    for (auto database : databaseList) {
+                        catalogueList.append(ui->catalogues->getCatalogues(database));
+                    }
+                    ui->events->populateWithCatalogues(catalogueList);
+                    ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
+                });
+                connect(ui->catalogues, &CatalogueSideBarWidget::selectionCleared, [this]() {
+                    ui->inspector->showPage(CatalogueInspectorWidget::Page::Empty);
+                    ui->events->clear();
+                });
                 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
                     if (events.count() == 1) {

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