kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-18 05:00:33 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/titleblock/integrationmovetemplateshandler.cpp
View File

@@ -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 {