Improved paste of pdm objects

p4#: 20980
This commit is contained in:
Magne Sjaastad
2013-03-20 07:42:26 +01:00
parent 45ce4097e1
commit 22aee27333
6 changed files with 53 additions and 59 deletions

View File

@@ -171,7 +171,7 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
{
QMenu menu;
menu.addAction(QString("Copy"), this, SLOT(slotCopyPdmObjectToClipboard()));
menu.addAction(QString("Paste"), this, SLOT(slotPasteEclipseCases()));
menu.addAction(QString("Paste"), this, SLOT(slotPastePdmObjects()));
menu.addAction(QString("Close"), this, SLOT(slotCloseCase()));
menu.addAction(QString("New View"), this, SLOT(slotAddView()));
menu.exec(event->globalPos());
@@ -180,13 +180,13 @@ void RimUiTreeView::contextMenuEvent(QContextMenuEvent* event)
{
QMenu menu;
menu.addAction(QString("New Case Group"), this, SLOT(slotAddCaseGroup()));
menu.addAction(QString("Paste"), this, SLOT(slotPasteEclipseCases()));
menu.addAction(QString("Paste"), this, SLOT(slotPastePdmObjects()));
menu.exec(event->globalPos());
}
else if (dynamic_cast<RimCaseCollection*>(uiItem->dataObject().p()))
{
QMenu menu;
menu.addAction(QString("Paste"), this, SLOT(slotPasteEclipseCases()));
menu.addAction(QString("Paste"), this, SLOT(slotPastePdmObjects()));
menu.exec(event->globalPos());
}
}
@@ -863,7 +863,7 @@ void RimUiTreeView::slotCopyPdmObjectToClipboard()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimUiTreeView::slotPasteEclipseCases()
void RimUiTreeView::slotPastePdmObjects()
{
if (!currentIndex().isValid()) return;
@@ -874,7 +874,7 @@ void RimUiTreeView::slotPasteEclipseCases()
createPdmObjectsFromClipboard(&objectGroup);
if (objectGroup.objects().size() == 0) return;
myModel->addCases(currentIndex(), objectGroup);
myModel->addObjects(currentIndex(), objectGroup);
}
//--------------------------------------------------------------------------------------------------
@@ -924,7 +924,7 @@ void RimUiTreeView::keyPressEvent(QKeyEvent* keyEvent)
{
if (keyEvent->matches(QKeySequence::Paste))
{
slotPasteEclipseCases();
slotPastePdmObjects();
keyEvent->setAccepted(true);
return;