feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ModelEditor: Reload documents

Browse Source 
Task-number: QTCREATORBUG-20612
Change-Id: Ie4a89f17e9f062ab273b58f19b8c5d6193cedacc
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Jochen Becher
2018-08-10 10:49:05 +02:00
parent 2c2faf8749
commit f4a7d02c09
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/modeleditor/modeldocument.cpp
View File

@@ -127,8 +127,17 @@ bool ModelDocument::reload(QString *errorString, Core::IDocument::ReloadFlag fla
emit changed();
return true;
}
*errorString = tr("Cannot reload model file.");
try {
d->documentController->loadProject(filePath().toString());
} catch (const qmt::FileNotFoundException &ex) {
*errorString = ex.errorMessage();
return false;
} catch (const qmt::Exception &ex) {
*errorString = tr("Could not open \"%1\" for reading: %2.").arg(filePath().toString()).arg(ex.errorMessage());
return false;
}
emit contentSet();
return true;
}
ExtDocumentController *ModelDocument::documentController() const

6
src/plugins/modeleditor/modeleditor.cpp
View File

@@ -369,16 +369,16 @@ void ModelEditor::init(QWidget *parent)
void ModelEditor::initDocument()
{
if (d->diagramsViewManager)
return;
initToolbars();
ExtDocumentController *documentController = d->document->documentController();
d->diagramView->setPxNodeController(documentController->pxNodeController());
QMT_CHECK(!d->diagramsViewManager);
d->diagramsViewManager = new DiagramsViewManager(this);
//connect(diagramsViewManager, &DiagramsViewManager::someDiagramOpened,
// documentController->diagramsManager(), &qmt::DiagramsManager::someDiagramOpened);
connect(d->diagramsViewManager, &DiagramsViewManager::openNewDiagram,
this, &ModelEditor::showDiagram);
connect(d->diagramsViewManager, &DiagramsViewManager::closeOpenDiagram,