suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+ make 'Merge project' undo/redoable

Browse Source
This commit is contained in:
wmayer 2016-04-10 18:01:27 +02:00
parent ea1f8395b9
commit 7b925d11aa
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@ set(FREECAD_VERSION "0.16")
set(PACKAGE_NAME "FreeCAD") set(PACKAGE_NAME "FreeCAD")
set(PACKAGE_VERSION_MAJOR "0") set(PACKAGE_VERSION_MAJOR "0")
set(PACKAGE_VERSION_MINOR "16") set(PACKAGE_VERSION_MINOR "16")
set(PACKAGE_VERSION_PATCH "6699") set(PACKAGE_VERSION_PATCH "6700")
set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}") set(PACKAGE_VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

3
src/Gui/CommandDoc.cpp
View File

@ -333,10 +333,13 @@ void StdCmdMergeProjects::activated(int iMsg)
return; return;
} }
doc->openTransaction("Merge project");
Base::FileInfo fi((const char*)project.toUtf8()); Base::FileInfo fi((const char*)project.toUtf8());
Base::ifstream str(fi, std::ios::in | std::ios::binary); Base::ifstream str(fi, std::ios::in | std::ios::binary);
MergeDocuments md(doc); MergeDocuments md(doc);
md.importObjects(str); md.importObjects(str);
str.close();
doc->commitTransaction();
} }
} }