From d995d9e6a964bf7fef0a2f33fc879da0204a4a07 Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Wed, 4 Apr 2012 16:13:08 +0000
Subject: [PATCH] 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
---
 sources/diagramview.cpp                                | 2 +-
 sources/qetproject.cpp                                 | 6 ++++--
 sources/titleblock/integrationmovetemplateshandler.cpp | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sources/diagramview.cpp b/sources/diagramview.cpp
index e925c19b0..aa71a035f 100644
--- a/sources/diagramview.cpp
+++ b/sources/diagramview.cpp
@@ -752,7 +752,7 @@ bool DiagramView::mustIntegrateElement(const ElementsLocation &location) const {
 	can be directly applied
 */
 bool DiagramView::mustIntegrateTitleBlockTemplate(const TitleBlockTemplateLocation &tbt_loc) const {
-	// unlike elements, the integration of title block templates is mandatory, so we simply check whether the parent project of the 
+	// unlike elements, the integration of title block templates is mandatory, so we simply check whether the parent project of the template is also the parent project of the diagram
 	QETProject *tbt_parent_project = tbt_loc.parentProject();
 	if (!tbt_parent_project) return(true);
 	
diff --git a/sources/qetproject.cpp b/sources/qetproject.cpp
index de5926d01..95e80ff75 100644
--- a/sources/qetproject.cpp
+++ b/sources/qetproject.cpp
@@ -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);
 		}
 	}
 	
diff --git a/sources/titleblock/integrationmovetemplateshandler.cpp b/sources/titleblock/integrationmovetemplateshandler.cpp
index 16a2cfa7e..0fb2434b5 100644
--- a/sources/titleblock/integrationmovetemplateshandler.cpp
+++ b/sources/titleblock/integrationmovetemplateshandler.cpp
@@ -68,7 +68,7 @@ QET::Action IntegrationMoveTitleBlockTemplatesHandler::templateAlreadyExists(con
 	if (src_tbt_document.toString(0) == dst_tbt_document.toString(0)) {
 		// the templates are the same, consider the integration is done
 		qDebug() << Q_FUNC_INFO << "Not integrating" << src.parentCollection() << "/" << src.name()<< "because it is already present in the project";
-		return(QET::Ignore);
+		return(QET::Managed);
 	} else {
 		return(askUser(src, dst));
 	}
@@ -127,7 +127,7 @@ QET::Action IntegrationMoveTitleBlockTemplatesHandler::askUser(const TitleBlockT
 	int result = integ_dialog_ -> exec();
 	if (result == QDialog::Accepted) {
 		if (use_existing_template_ -> isChecked()) {
-			return(QET::Ignore);
+			return(QET::Managed);
 		} else if (erase_template_ -> isChecked()) {
 			return(QET::Erase);
 		} else {