mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2025-12-17 12:40:35 +01:00
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:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user