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

+ open transaction when pasting clipboard into document

Browse Source
This commit is contained in:
wmayer 2015-02-13 23:01:41 +01:00
parent d89d1808b7
commit 74e169dc11
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Gui/MainWindow.cpp
View File

@ -1526,6 +1526,7 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData)
App::Document* doc = App::GetApplication().getActiveDocument();
if (!doc) doc = App::GetApplication().newDocument();
doc->openTransaction("Paste");
Base::ByteArrayIStreambuf buf(res);
std::istream in(0);
in.rdbuf(&buf);
@ -1537,12 +1538,14 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData)
if (gui)
gui->addRootObjectsToGroup(newObj, grp.front());
}
doc->commitTransaction();
}
else if (mimeData->hasFormat(QLatin1String("application/x-documentobject-file"))) {
QByteArray res = mimeData->data(QLatin1String("application/x-documentobject-file"));
App::Document* doc = App::GetApplication().getActiveDocument();
if (!doc) doc = App::GetApplication().newDocument();
doc->openTransaction("Paste");
Base::FileInfo fi((const char*)res);
Base::ifstream str(fi, std::ios::in | std::ios::binary);
MergeDocuments mimeView(doc);
@ -1554,6 +1557,7 @@ void MainWindow::insertFromMimeData (const QMimeData * mimeData)
if (gui)
gui->addRootObjectsToGroup(newObj, grp.front());
}
doc->commitTransaction();
}
else if (mimeData->hasUrls()) {
// load the files into the active document if there is one, otherwise let create one