GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1290:21b6c58e9bf1

Some fixes

trabillard -

r1290:21b6c58e9bf1

parent child

Context file:

r1290:21b6c58e9bf1

gui/src/Catalogue/CatalogueActionManager.cpp +4 -3

             #include <Catalogue/CatalogueSideBarWidget.h>
             #include <Catalogue/CreateEventDialog.h>
+            #include <CatalogueDao.h>
             #include <DBCatalogue.h>
             #include <DBEvent.h>
             #include <DBEventProduct.h>
                 auto createEventAction = actionController.addSectionZoneAction(
                     {QObject::tr("Catalogues")}, QObject::tr("New Event..."), [this](auto zones) {
                         CreateEventDialog dialog(
-                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues("Default"));
+                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT));
                         dialog.hideCatalogueChoice();
                         if (dialog.exec() == QDialog::Accepted) {
                             impl->createEventFromZones(dialog.eventName(), zones);
                 auto createEventInCatalogueAction = actionController.addSectionZoneAction(
                     {QObject::tr("Catalogues")}, QObject::tr("New Event in Catalogue..."), [this](auto zones) {
                         CreateEventDialog dialog(
-                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues("Default"));
+                            impl->m_CatalogueExplorer->sideBarWidget().getCatalogues(REPOSITORY_DEFAULT));
                         if (dialog.exec() == QDialog::Accepted) {
                             auto selectedCatalogue = dialog.selectedCatalogue();
                             if (!selectedCatalogue) {
                                 selectedCatalogue->setName(dialog.catalogueName());
                                 // sqpApp->catalogueController().addCatalogue(selectedCatalogue); TODO
                                 impl->m_CatalogueExplorer->sideBarWidget().addCatalogue(selectedCatalogue,
-                                                                                        "Default");
+                                                                                        REPOSITORY_DEFAULT);
                             }
                             impl->createEventFromZones(dialog.eventName(), zones, selectedCatalogue);

gui/src/Catalogue/CatalogueEventsWidget.cpp +14 -12

@@ -320,19 +320,21 void CatalogueEventsWidget::setEventChanges(const std::shared_ptr<DBEvent> &even
320	auto validationIndex	320	auto validationIndex
321	= eventIndex.sibling(eventIndex.row(), (int)CatalogueEventsModel::Column::Validation);	321	= eventIndex.sibling(eventIndex.row(), (int)CatalogueEventsModel::Column::Validation);
322		322
323	if (hasChanges) {	323	if (validationIndex.isValid()) {
324	if (ui->treeView->indexWidget(validationIndex) == nullptr) {	324	if (hasChanges) {
325	auto widget = CatalogueExplorerHelper::buildValidationWidget(	325	if (ui->treeView->indexWidget(validationIndex) == nullptr) {
326	ui->treeView,	326	auto widget = CatalogueExplorerHelper::buildValidationWidget(
327	[this, event]() {	327	ui->treeView,
328	sqpApp->catalogueController().saveEvent(event);	328	[this, event]() {
329	setEventChanges(event, false);	329	sqpApp->catalogueController().saveEvent(event);
330	},	330	setEventChanges(event, false);
331	[this, event]() { setEventChanges(event, false); });	331	},
332	ui->treeView->setIndexWidget(validationIndex, widget);	332	[this, event]() { setEventChanges(event, false); });
333	}	333	ui->treeView->setIndexWidget(validationIndex, widget);
		334	}
334		335
335	impl->m_Model->setEventHasChanges(event, hasChanges);	336	impl->m_Model->setEventHasChanges(event, hasChanges);
		337	}
336	}	338	}
337	else {	339	else {
338	qCWarning(LOG_CatalogueEventsWidget())	340	qCWarning(LOG_CatalogueEventsWidget())

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

             {
                 auto allEventsItem = new CatalogueTextTreeItem{QIcon{":/icones/allEvents.png"}, "All Events",
                                                                ALL_EVENT_ITEM_TYPE};
-                m_TreeModel->addTopLevelItem(allEventsItem);
+                auto allEventIndex = m_TreeModel->addTopLevelItem(allEventsItem);
+                treeView->setCurrentIndex(allEventIndex);
                 auto trashItem
                     = new CatalogueTextTreeItem{QIcon{":/icones/trash.png"}, "Trash", TRASH_ITEM_TYPE};

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