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

Elements panels now display and highlight elements newly-integrated into projects.

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1697 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2012-04-28 16:45:16 +00:00
parent 1b52030484
commit fac1c5c2c4
10 changed files with 221 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/qetproject.cpp
View File

@@ -629,6 +629,7 @@ QString QETProject::integrateElement(const QString &elmt_path, MoveElementsHandl
}
// recopie l'element
ElementsLocation result;
if (ElementDefinition *existing_elmt = target_cat -> element(integ_item -> pathName())) {
// l'element existe deja - on demande au handler ce que l'on doit faire
@@ -636,31 +637,31 @@ QString QETProject::integrateElement(const QString &elmt_path, MoveElementsHandl
if (action == QET::Ignore) {
// il faut conserver et utiliser l'element deja integre
return(existing_elmt -> location().toString());
result = existing_elmt -> location();
} else if (action == QET::Erase) {
// il faut ecraser l'element deja integre
BasicMoveElementsHandler *erase_handler = new BasicMoveElementsHandler();
ElementsLocation result_loc = copyElementWithHandler(integ_elmt, target_cat, erase_handler, error_message);
ElementsLocation result = copyElementWithHandler(integ_elmt, target_cat, erase_handler, error_message);
delete erase_handler;
return(result_loc.toString());
} else if (action == QET::Rename) {
// il faut faire cohabiter les deux elements en renommant le nouveau
QString integ_element_name = handler -> nameForRenamingOperation();
BasicMoveElementsHandler *rename_handler = new BasicMoveElementsHandler();
rename_handler -> setActionIfItemAlreadyExists(QET::Rename);
rename_handler -> setNameForRenamingOperation(integ_element_name);
ElementsLocation result_loc = copyElementWithHandler(integ_elmt, target_cat, rename_handler, error_message);
result = copyElementWithHandler(integ_elmt, target_cat, rename_handler, error_message);
delete rename_handler;
return(result_loc.toString());
} else {
// il faut annuler la pose de l'element
return(QString());
result = ElementsLocation();
}
} else {
// integre l'element normalement
ElementsLocation result_loc = copyElementWithHandler(integ_elmt, target_cat, handler, error_message);
return(result_loc.toString());
result = copyElementWithHandler(integ_elmt, target_cat, handler, error_message);
}
if (!result.isNull()) emit(elementIntegrated(this, result));
return(result.toString());
}
/**