HG_REPOSITORIES/LPP/SciQLOP_Repos/SciQLop Commit - r1327:07b2554d7734

Refresh catalogue menu when the catalogue list changed

trabillard -

r1327:07b2554d7734

parent child

Context file:

r1327:07b2554d7734

gui/include/Actions/ActionsGuiController.h +2 0

                 QVector<std::shared_ptr<SelectionZoneAction> > selectionZoneActions() const;
+                void removeAction(const std::shared_ptr<SelectionZoneAction> &action);
             private:
                 class ActionsGuiControllerPrivate;
                 spimpl::unique_impl_ptr<ActionsGuiControllerPrivate> impl;

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

                 CatalogueActionManager(CatalogueExplorer *catalogueExplorer);
                 void installSelectionZoneActions();
+                void refreshCreateInCatalogueAction();
             private:
                 class CatalogueActionManagerPrivate;

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

                 void trashSelected();
                 void selectionCleared();
                 void catalogueSaved(const std::shared_ptr<DBCatalogue> &catalogue);
+                void catalogueListChanged();
             public:
                 explicit CatalogueSideBarWidget(QWidget *parent = 0);

gui/src/Actions/ActionsGuiController.cpp +5 0

@@ -34,3 +34,8 QVector<std::shared_ptr<SelectionZoneAction> > ActionsGuiController::selectionZo
34	{	34	{
35	return impl->m_SelectionZoneActions;	35	return impl->m_SelectionZoneActions;
36	}	36	}
		37
		38	void ActionsGuiController::removeAction(const std::shared_ptr<SelectionZoneAction> &action)
		39	{
		40	impl->m_SelectionZoneActions.removeAll(action);
		41	}

gui/src/Catalogue/CatalogueActionManager.cpp +36 -18

             #include <memory>
             const auto CATALOGUE_MENU_NAME = QObject::tr("Catalogues");
-            const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event");
+            const auto CATALOGUE_CREATE_EVENT_MENU_NAME = QObject::tr("New Event...");
-            const auto DEFAULT_EVENT_NAME = QObject::tr("New Event");
+            const auto DEFAULT_EVENT_NAME = QObject::tr("Event");
-            const auto DEFAULT_CATALOGUE_NAME = QObject::tr("New Catalogue");
+            const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
             struct CatalogueActionManager::CatalogueActionManagerPrivate {
                 CatalogueExplorer *m_CatalogueExplorer = nullptr;
+                QVector<std::shared_ptr<SelectionZoneAction> > m_CreateInCatalogueActions;
                 CatalogueActionManagerPrivate(CatalogueExplorer *catalogueExplorer)
                         : m_CatalogueExplorer(catalogueExplorer)
                         m_CatalogueExplorer->eventsWidget().setEventChanges(event, true);
                     }
                 }
-            };
-            CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
+                SelectionZoneAction::EnableFunction createEventEnableFuntion() const
-                    : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}
-            void CatalogueActionManager::installSelectionZoneActions()
                 {
-                auto &actionController = sqpApp->actionsGuiController();
+                    return [](auto zones) {
-                auto createEventEnableFuntion = [](auto zones) {
                         // Checks that all variables in the zones doesn't refer to the same product
                         QSet<QString> usedDatasource;
                             auto variables = graph->variables();
                             for (auto var : variables) {
-                            auto datasourceId = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
+                                auto datasourceId
+                                    = var->metadata().value(DataSourceItem::ID_DATA_KEY).toString();
                                 if (!usedDatasource.contains(datasourceId)) {
                                     usedDatasource.insert(datasourceId);
                                 }
                         return true;
                     };
+                }
+            };
+            CatalogueActionManager::CatalogueActionManager(CatalogueExplorer *catalogueExplorer)
+                    : impl{spimpl::make_unique_impl<CatalogueActionManagerPrivate>(catalogueExplorer)}
+            {
+            }
+            void CatalogueActionManager::installSelectionZoneActions()
+            {
+                auto &actionController = sqpApp->actionsGuiController();
                 auto createEventAction = actionController.addSectionZoneAction(
                     {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("Without Catalogue"),
                     [this](auto zones) { impl->createEventFromZones(DEFAULT_EVENT_NAME, zones); });
-                createEventAction->setEnableFunction(createEventEnableFuntion);
+                createEventAction->setEnableFunction(impl->createEventEnableFuntion());
                 auto createEventInNewCatalogueAction = actionController.addSectionZoneAction(
                     {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME}, QObject::tr("In New Catalogue"),
                         impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, newCatalogue);
                     });
-                createEventInNewCatalogueAction->setEnableFunction(createEventEnableFuntion);
+                createEventInNewCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
+                refreshCreateInCatalogueAction();
+            }
+            void CatalogueActionManager::refreshCreateInCatalogueAction()
+            {
+                auto &actionController = sqpApp->actionsGuiController();
+                for (auto action : impl->m_CreateInCatalogueActions) {
+                    actionController.removeAction(action);
+                }
+                impl->m_CreateInCatalogueActions.clear();
                 auto allCatalogues
                     = impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT);
                 for (auto catalogue : allCatalogues) {
                     auto catalogueName = catalogue->getName();
                     auto createEventInCatalogueAction = actionController.addSectionZoneAction(
                         {CATALOGUE_MENU_NAME, CATALOGUE_CREATE_EVENT_MENU_NAME},
-                        QObject::tr("In ").append(catalogueName), [this, catalogue](auto zones) {
+                        QObject::tr("In \"").append(catalogueName).append("\""), [this, catalogue](auto zones) {
                             impl->createEventFromZones(DEFAULT_EVENT_NAME, zones, catalogue);
                         });
-                    createEventInCatalogueAction->setEnableFunction(createEventEnableFuntion);
+                    createEventInCatalogueAction->setEnableFunction(impl->createEventEnableFuntion());
+                    impl->m_CreateInCatalogueActions << createEventInCatalogueAction;
                 }
             }

gui/src/Catalogue/CatalogueExplorer.cpp +4 0

                 connect(ui->catalogues, &CatalogueSideBarWidget::catalogueSaved, ui->events,
                         &CatalogueEventsWidget::refresh);
+                connect(ui->catalogues, &CatalogueSideBarWidget::catalogueListChanged,
+                        [this]() { impl->m_ActionManager.refreshCreateInCatalogueAction(); });
                 // Updates the inspectot when something is selected in the events
                 connect(ui->events, &CatalogueEventsWidget::eventsSelected, [this](auto events) {
                     if (events.count() == 1) {
                 connect(ui->inspector, &CatalogueInspectorWidget::catalogueUpdated, [this](auto catalogue) {
                     sqpApp->catalogueController().updateCatalogue(catalogue);
                     ui->catalogues->setCatalogueChanges(catalogue, true);
+                    impl->m_ActionManager.refreshCreateInCatalogueAction();
                 });
                 connect(ui->inspector, &CatalogueInspectorWidget::eventUpdated, [this](auto event) {

gui/src/Catalogue/CatalogueSideBarWidget.cpp +12 -2

             constexpr auto CATALOGUE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 3;
             constexpr auto DATABASE_ITEM_TYPE = CatalogueAbstractTreeItem::DEFAULT_TYPE + 4;
+            const auto DEFAULT_CATALOGUE_NAME = QObject::tr("Catalogue");
             struct CatalogueSideBarWidget::CatalogueSideBarWidgetPrivate {
                 ui->treeView->setModel(impl->m_TreeModel);
                 impl->configureTreeWidget(ui->treeView);
+                emit catalogueListChanged();
                 ui->treeView->header()->setStretchLastSection(false);
                 ui->treeView->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
                 connect(ui->btnAdd, &QToolButton::clicked, [this]() {
                     auto catalogue = std::make_shared<DBCatalogue>();
-                    catalogue->setName(QString("Cat"));
+                    catalogue->setName(DEFAULT_CATALOGUE_NAME);
                     sqpApp->catalogueController().addCatalogue(catalogue);
                     auto item = this->addCatalogue(catalogue, REPOSITORY_DEFAULT);
                     this->setCatalogueChanges(catalogue, true);
                                     impl->m_TreeModel->indexOf(catalogueToItem.second->parent()));
                             }
                             emitSelection();
+                            emit catalogueListChanged();
                         }
                     }
                 });
                         this->emitSelection();
                     }
                     impl->setHasChanges(true, index, this);
+                    emit this->catalogueListChanged();
                 });
                 ui->treeView->setContextMenuPolicy(Qt::CustomContextMenu);
                                                  const QString &repository)
             {
                 auto repositoryItem = impl->getDatabaseItem(repository);
-                return impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
+                auto catalogueItem
+                    = impl->addCatalogueItem(catalogue, impl->m_TreeModel->indexOf(repositoryItem));
+                emit catalogueListChanged();
+                return catalogueItem;
             }
             void CatalogueSideBarWidget::setCatalogueChanges(const std::shared_ptr<DBCatalogue> &catalogue,

General Comments 0

Write
Preview

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

No TODOs yet

	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