Fixed a bug preventing the user from dropping an already-integrated titleblock template onto a diagram.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1628 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-04 16:13:08 +00:00
parent 3d9f1a876c
commit d995d9e6a9
3 changed files with 7 additions and 5 deletions

View File

@@ -675,7 +675,7 @@ QString QETProject::integrateElement(const QString &elmt_path, MoveElementsHandl
/**
Integrate a title block template into this project.
@param src_tbt The locaiton of the title block template to be integrated into this project
@param src_tbt The location of the title block template to be integrated into this project
@param handler
@return the name of the template after integration, or an empty QString if a problem occured.
*/
@@ -690,10 +690,12 @@ QString QETProject::integrateTitleBlockTemplate(const TitleBlockTemplateLocation
continue;
} else if (action == QET::Erase) {
break;
} else if (action == QET::Ignore || action == QET::Abort || action == QET::Managed) {
} else if (action == QET::Abort || action == QET::Ignore) {
return(QString());
} else if (action == QET::Rename) {
target_name = handler -> nameForRenamingOperation();
} else if (action == QET::Managed) {
return(target_name);
}
}