diff --git a/diagramview.cpp b/diagramview.cpp index 72f917e13..27c81e4ef 100644 --- a/diagramview.cpp +++ b/diagramview.cpp @@ -53,7 +53,7 @@ DiagramView::DiagramView(QWidget *parent) : QGraphicsView(parent), is_adding_tex paste_here = new QAction(QIcon(":/ico/paste.png"), tr("Coller ici"), this); connect(paste_here, SIGNAL(triggered()), this, SLOT(pasteHere())); - connect(scene, SIGNAL(selectionEmptinessChanged()), this, SLOT(slot_selectionChanged())); + connect(scene, SIGNAL(selectionEmptinessChanged()), this, SIGNAL(selectionChanged())); connect(&(scene -> border_and_inset), SIGNAL(borderChanged(QRectF, QRectF)), this, SLOT(adjustSceneRect())); connect(&(scene -> undoStack()), SIGNAL(cleanChanged(bool)), this, SLOT(updateWindowTitle())); } @@ -400,13 +400,6 @@ bool DiagramView::open(QString n_fichier, int *erreur) { } } -/** - Slot appele lorsque la selection change. -*/ -void DiagramView::slot_selectionChanged() { - emit(selectionChanged()); -} - /** Gere la fermeture du schema. @param event Le QCloseEvent decrivant l'evenement diff --git a/diagramview.h b/diagramview.h index a40380552..50ab77dd6 100644 --- a/diagramview.h +++ b/diagramview.h @@ -113,7 +113,6 @@ class DiagramView : public QGraphicsView { void editDefaultConductorProperties(); private slots: - void slot_selectionChanged(); void adjustGridToZoom(); }; #endif diff --git a/editor/elementscene.cpp b/editor/elementscene.cpp index c3bc00622..3f4ffb3e1 100644 --- a/editor/elementscene.cpp +++ b/editor/elementscene.cpp @@ -48,7 +48,6 @@ ElementScene::ElementScene(QETElementEditor *editor, QObject *parent) : { current_polygon = NULL; undo_stack.setClean(); - connect(this, SIGNAL(changed(const QList &)), this, SLOT(slot_checkSelectionChanged())); } /// Destructeur @@ -497,16 +496,6 @@ QGIManager &ElementScene::qgiManager() { return(qgi_manager); } -/** - Detecte les changements de selection -*/ -void ElementScene::slot_checkSelectionChanged() { - static QList cache_selecteditems = QList(); - QList selecteditems = selectedItems(); - if (cache_selecteditems != selecteditems) emit(selectionChanged()); - cache_selecteditems = selecteditems; -} - /** Selectionne tout */ diff --git a/editor/elementscene.h b/editor/elementscene.h index b4873eab3..367c8f10b 100644 --- a/editor/elementscene.h +++ b/editor/elementscene.h @@ -121,7 +121,6 @@ class ElementScene : public QGraphicsScene { void slot_addArc(); void slot_addTerminal(); void slot_addTextField(); - void slot_checkSelectionChanged(); void slot_selectAll(); void slot_deselectAll(); void slot_invertSelection(); @@ -135,8 +134,6 @@ class ElementScene : public QGraphicsScene { void slot_sendBackward(); signals: - /// Signal emis lorsque la selection change - void selectionChanged(); /** Signal emis lorsque la scene exige que l'editeur d'element repasse en mode normal diff --git a/editor/qetelementeditor.cpp b/editor/qetelementeditor.cpp index 57e8b1ac3..79979527b 100644 --- a/editor/qetelementeditor.cpp +++ b/editor/qetelementeditor.cpp @@ -381,14 +381,17 @@ void QETElementEditor::slot_updateInformations() { // enleve les widgets deja presents QLayoutItem *qli; while ((qli = layout -> takeAt(0)) != 0) { - if (qli -> widget()) { - layout -> removeWidget(qli -> widget()); - qli -> widget() -> setParent(0); + if (QWidget *w = qli -> widget()) { + layout -> removeWidget(w); + w -> setParent(0); + w -> hide(); } } if (selected_parts.size() == 1) { // recupere le premier CustomElementPart et en ajoute le widget d'edition - layout -> addWidget(selected_parts.first() -> elementInformations()); + QWidget *edit_widget = selected_parts.first() -> elementInformations(); + layout -> addWidget(edit_widget); + edit_widget -> show(); } else { default_informations -> setText( selected_parts.size() ? @@ -396,6 +399,7 @@ void QETElementEditor::slot_updateInformations() { tr("Aucune partie s\351lectionn\351e.") ); layout -> addWidget(default_informations); + default_informations -> show(); } }