element editor: improve context menu and fix the end of polygon

diagram: fix memory leak


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2544 bfdf4180-ca20-0410-9c96-a3a8aa849046

sources/diagram.cpp

@@ -84,6 +84,8 @@ Diagram::~Diagram() {
 	delete undo_stack_;
 	// suppression du QGIManager - tous les elements qu'il connait sont supprimes
 	delete qgi_manager_;
+	// remove of conductor setter
+	delete conductor_setter_;
 	
 	// suppression des objets gerant les deplacements
 	delete elements_mover_;

sources/editor/elementscene.cpp

@@ -598,6 +598,11 @@ void ElementScene::paste() {
 	
 }
 
+void ElementScene::contextMenu(QContextMenuEvent *event) {
+	if (behavior == ElementScene::Normal)
+		element_editor -> contextMenu(event);
+}
+
 /**
 	Selectionne une liste de parties
 	@param content liste des parties a selectionner

sources/editor/elementscene.h

@@ -138,6 +138,7 @@ class ElementScene : public QGraphicsScene {
 	void cut();
 	void copy();
 	void paste();
+	void contextMenu (QContextMenuEvent *event);
 	
 	protected:
 	virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *);

sources/editor/elementview.cpp

@@ -65,6 +65,10 @@ QRectF ElementView::viewedSceneRect() const {
 	return(QRectF(scene_left_top, scene_right_bottom));
 }
 
+void ElementView::contextMenuEvent(QContextMenuEvent *event) {
+	scene_ -> contextMenu(event);
+}
+
 /**
 	Definit l'ElementScene visualisee par cette ElementView
 	@param s l'ElementScene visualisee par cette ElementView

sources/editor/elementview.h

@@ -40,6 +40,7 @@ class ElementView : public QGraphicsView {
 	ElementScene *scene() const;
 	void setScene(ElementScene *);
 	QRectF viewedSceneRect() const;
+	void contextMenuEvent(QContextMenuEvent *event);
 	
 	protected:
 	void mousePressEvent(QMouseEvent *);

sources/editor/qetelementeditor.cpp

@@ -415,8 +415,7 @@ void QETElementEditor::setupMenus() {
  * @brief QETElementEditor::contextMenuEvent
  * @param event
  */
-void QETElementEditor::contextMenuEvent(QContextMenuEvent *event)
- {
+void QETElementEditor::contextMenu(QContextMenuEvent *event) {
 		QMenu menu(this);
 		menu.addAction(undo);
 		menu.addAction(redo);
@@ -436,7 +435,7 @@ void QETElementEditor::contextMenuEvent(QContextMenuEvent *event)
 		menu.addAction(edit_raise);
 		menu.addAction(edit_lower);
 		menu.addAction(edit_backward);
-	menu.exec(event->globalPos());
+		menu.exec(event -> globalPos());
  }
 
 

sources/editor/qetelementeditor.h

@@ -113,11 +113,11 @@ class QETElementEditor : public QETMainWindow {
 	static QPointF pasteOffset();
 	static QET::OrientedMovement pasteMovement();
 	static QString getOpenElementFileName(QWidget * = 0, const QString & = QString());
+	void contextMenu(QContextMenuEvent *event);
 
 	protected:
 	void closeEvent(QCloseEvent *);
 	virtual void firstActivation(QEvent *);
-	void contextMenuEvent(QContextMenuEvent *event);
 
 	private:
 	void setupActions();