From af3e9c7c04ae53f70b58d58e93afff99254d8112 Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Sat, 9 Feb 2013 19:07:08 +0000
Subject: [PATCH] Element editor: keyboard shortcuts work again.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2031 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/editor/elementview.cpp   | 15 ---------------
 sources/editor/elementview.h     |  1 -
 sources/editor/parttext.cpp      |  3 +++
 sources/editor/parttextfield.cpp |  3 +++
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/sources/editor/elementview.cpp b/sources/editor/elementview.cpp
index 72ed80a38..fab487397 100644
--- a/sources/editor/elementview.cpp
+++ b/sources/editor/elementview.cpp
@@ -74,21 +74,6 @@ void ElementView::setScene(ElementScene *s) {
 	scene_ = s;
 }
 
-/**
-	Gere les evenements envoyes a la vue.
-	Methode reimplentee pour gerer le conflit de raccourcis avec Suppr
-	(supprimer une partie ou supprimer le caractere suivant)
-	@param e evenement a gerer
-*/
-bool ElementView::event(QEvent *e) {
-	if (e -> type() == QEvent::ShortcutOverride && scene_ -> focusItem()) {
-		e -> accept();
-		return(true);
-	}
-	return(QGraphicsView::event(e));
-}
-
-
 /**
 	Agrandit le schema (+33% = inverse des -25 % de zoomMoins())
 */
diff --git a/sources/editor/elementview.h b/sources/editor/elementview.h
index ddb7fb4c3..a42c9e997 100644
--- a/sources/editor/elementview.h
+++ b/sources/editor/elementview.h
@@ -42,7 +42,6 @@ class ElementView : public QGraphicsView {
 	QRectF viewedSceneRect() const;
 	
 	protected:
-	bool event(QEvent *);
 	void mousePressEvent(QMouseEvent *);
 	void wheelEvent(QWheelEvent *);
 	virtual void drawBackground(QPainter *, const QRectF &);
diff --git a/sources/editor/parttext.cpp b/sources/editor/parttext.cpp
index 28437dba0..bcd89267e 100644
--- a/sources/editor/parttext.cpp
+++ b/sources/editor/parttext.cpp
@@ -541,6 +541,9 @@ void PartText::endEdition() {
 	setTextCursor(qtc);
 	
 	setEditable(false);
+	if (decorator_) {
+		decorator_ -> setFocus();
+	}
 }
 
 #ifdef QET_DEBUG_EDITOR_TEXTS
diff --git a/sources/editor/parttextfield.cpp b/sources/editor/parttextfield.cpp
index 32471c203..19a899ae0 100644
--- a/sources/editor/parttextfield.cpp
+++ b/sources/editor/parttextfield.cpp
@@ -520,6 +520,9 @@ void PartTextField::endEdition() {
 	setTextCursor(qtc);
 	
 	setEditable(false);
+	if (decorator_) {
+		decorator_ -> setFocus();
+	}
 }
 
 #ifdef QET_DEBUG_EDITOR_TEXTS