Merged trunk into 0.3 branch: rev1067 to rev1077

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/branches/0.3@1179 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2011-03-01 23:26:31 +00:00
parent 87da5daed1
commit 287e458f4b
3 changed files with 19 additions and 0 deletions

View File

@@ -840,6 +840,7 @@ void DiagramView::editConductor(Conductor *edited_conductor) {
dialog_layout -> addWidget(dbb);
connect(dbb, SIGNAL(accepted()), &conductor_dialog, SLOT(accept()));
connect(dbb, SIGNAL(rejected()), &conductor_dialog, SLOT(reject()));
cpw -> setFocus(Qt::ActiveWindowFocusReason);
// execute le dialogue et met a jour le conducteur
if (conductor_dialog.exec() == QDialog::Accepted) {