Diagram text item : minor change

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

sources/qetgraphicsitem/diagramtextitem.cpp

@@ -22,63 +22,49 @@
 #include "diagram.h"
 
 /**
-	Constructeur
+ * @brief DiagramTextItem::DiagramTextItem
-	@param parent Le QGraphicsItem parent du champ de texte
+ * @param parent : parent item
-	@param parent_diagram Le schema auquel appartient le champ de texte
+ */
-*/
 DiagramTextItem::DiagramTextItem(QGraphicsItem *parent) :
 	QGraphicsTextItem(parent),
 	m_mouse_hover(false),
 	previous_text_(),
 	rotation_angle_(0.0),
 	m_first_move (true)
-{
+{ build(); }
-	setAcceptHoverEvents(true);
-	build();
-}
 
 /**
-	Constructeur
+ * @brief DiagramTextItem::DiagramTextItem
-	@param text Le texte affiche par le champ de texte
+ * @param text : text to display
-	@param parent Le QGraphicsItem parent du champ de texte
+ * @param parent : parent item
-	@param parent_diagram Le schema auquel appartient le champ de texte
+ */
-*/
 DiagramTextItem::DiagramTextItem(const QString &text, QGraphicsItem *parent) :
 	QGraphicsTextItem(text, parent),
 	m_mouse_hover(false),
 	previous_text_(text),
 	rotation_angle_(0.0)
-{
+{ build(); }
-	build();
-	setAcceptHoverEvents(true);
-}
-
-/// Destructeur
-DiagramTextItem::~DiagramTextItem() {
-}
 
 /**
  * @brief DiagramTextItem::build
  * Build this item with default value
  */
-void DiagramTextItem::build() {
+void DiagramTextItem::build()
+{
 		//set Zvalue at 10 to be upper than the DiagramImageItem
 	setZValue(10);
+	setAcceptHoverEvents(true);
 	setDefaultTextColor(Qt::black);
 	setFont(QETApp::diagramTextsFont());
-	setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable);
+	setFlags(QGraphicsItem::ItemIsSelectable|QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemSendsGeometryChanges);
 	setNoEditable(false);
 	setToolTip(tr("Maintenir ctrl pour un déplacement libre"));
-#if QT_VERSION >= 0x040600
-	setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
-#endif
-	connect(this, SIGNAL(lostFocus()), this, SLOT(setNonFocusable()));
 }
 
 /**
-	@return le Diagram auquel ce texte appartient, ou 0 si ce texte n'est
+ * @brief DiagramTextItem::diagram
-	rattache a aucun schema
+ * @return The diagram of this item or 0 if this text isn't in a diagram
-*/
+ */
 Diagram *DiagramTextItem::diagram() const {
 	return(qobject_cast<Diagram *>(scene()));
 }
@@ -277,7 +263,7 @@ void DiagramTextItem::focusOutEvent(QFocusEvent *e) {
 	
 	// autorise de nouveau le deplacement du texte
 	setFlag(QGraphicsItem::ItemIsMovable, true);
-	QTimer::singleShot(0, this, SIGNAL(lostFocus()));
+	setFlag(QGraphicsTextItem::ItemIsFocusable, false);
 }
 
 /**
@@ -364,35 +350,19 @@ void DiagramTextItem::applyRotation(const qreal &angle) {
 	setRotation(QET::correctAngle(rotation()+angle));
 }
 
-/// Rend le champ de texte non focusable
-void DiagramTextItem::setNonFocusable() {
-	setFlag(QGraphicsTextItem::ItemIsFocusable, false);
-}
-
-
-/**
- * @brief DiagramTextItem::setHtmlText
- * @param txt
- */
-void DiagramTextItem::setHtmlText(const QString &txt) {
-	setHtml( txt );
-}
-
 /**
  * @brief Edit the text with HtmlEditor
  */
-void DiagramTextItem::edit() {
+void DiagramTextItem::edit()
-	//Open the HtmlEditor
+{
 	QWidget *parent = nullptr;
 	if (scene() && scene()->views().size())
 		parent = scene()->views().first();
-	qdesigner_internal::RichTextEditorDialog *editor = new qdesigner_internal::RichTextEditorDialog(parent);
+
-	// connect the in/out
+	qdesigner_internal::RichTextEditorDialog editor(parent);
-	connect(editor, SIGNAL(applyEditText(const QString &)), this, SLOT(setHtmlText(const QString &)));
+	connect(&editor, &qdesigner_internal::RichTextEditorDialog::applyEditText, [this](QString text) {this->setHtml(text);});
-	// load the Html txt
+	editor.setText(toHtml());
-	editor->setText( toHtml() );
+	editor.exec();
-	// show
-	editor->show();
 }
 
 

sources/qetgraphicsitem/diagramtextitem.h

@@ -29,29 +29,21 @@ class QDomDocument;
 	diagram.
 	@see QGraphicsItem::GraphicsItemFlags
 */
-class DiagramTextItem : public QGraphicsTextItem {
+class DiagramTextItem : public QGraphicsTextItem
+{
 	Q_OBJECT
-	// constructors, destructor
+
 	public:
 		DiagramTextItem(QGraphicsItem * = 0);
 		DiagramTextItem(const QString &, QGraphicsItem * = 0);
-	virtual ~DiagramTextItem();
 
 	private:
 		void build();
 	
-	// attributes
 	public:
 		enum { Type = UserType + 1004 };
-	
-	// methods
-	public:
-	/**
-		Enable the use of qgraphicsitem_cast to safely cast a QGraphicsItem into a
-		DiagramTextItem
-		@return the QGraphicsItem type
-	*/
 		virtual int type() const { return Type; }
+
 		Diagram *diagram() const;
 		virtual void fromXml(const QDomElement &) = 0;
 		virtual QDomElement toXml(QDomDocument &) const;
@@ -59,10 +51,12 @@ class DiagramTextItem : public QGraphicsTextItem {
 		void setRotationAngle(const qreal &);
 		void rotateBy(const qreal &);
 		void edit();
-	QPointF mapMovementToScene(const QPointF &) const;
+
-	QPointF mapMovementFromScene(const QPointF &) const;
+		QPointF mapMovementToScene    (const QPointF &) const;
-	QPointF mapMovementToParent(const QPointF &) const;
+		QPointF mapMovementFromScene  (const QPointF &) const;
-	QPointF mapMovementFromParent(const QPointF &) const;
+		QPointF mapMovementToParent   (const QPointF &) const;
+		QPointF mapMovementFromParent (const QPointF &) const;
+
 		void setFontSize(int &s);
 		void setNoEditable(bool e = true) {no_editable = e;}
 
@@ -82,21 +76,13 @@ class DiagramTextItem : public QGraphicsTextItem {
 
 		virtual void applyRotation(const qreal &);
 
-	bool m_mouse_hover;
 	signals:
-	/// signal emitted when the text field loses focus
-	void lostFocus();
 			/// signal emitted after text was changed
 		void diagramTextChanged(DiagramTextItem *, const QString &, const QString &);
 	
-	public slots:
-	void setNonFocusable();
-	void setHtmlText(const QString &);
-	
 	protected:
-	/// Previous text value
+		bool m_mouse_hover;
 		QString previous_text_;
-	/// angle of rotation of the text field
 		qreal rotation_angle_;
 		bool no_editable;
 		bool m_first_move;