Rapatriement dans le trunk de la revision 843 (branche 0.3).

Cela permet d'adapter le trunk au nouveau comportement de Qt 4.6 relatif au signalement des changements de geometrie dans QGraphicsItem::itemChange(...).


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@844 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
xavier
2010-01-21 22:41:40 +00:00
parent 6aa3caf360
commit 7d9bea480c
9 changed files with 31 additions and 4 deletions

View File

@@ -34,6 +34,9 @@ PartText::PartText(QETElementEditor *editor, QGraphicsItem *parent, ElementScene
setDefaultTextColor(Qt::black);
setFont(QETApp::diagramTextsFont());
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
#if QT_VERSION >= 0x040600
setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
#endif
setPlainText(QObject::tr("T", "default text when adding a text in the element editor"));
infos = new TextEditor(elementEditor(), this);
infos -> setElementTypeName(name());
@@ -147,7 +150,7 @@ void PartText::focusOutEvent(QFocusEvent *e) {
setTextCursor(qtc);
setTextInteractionFlags(Qt::NoTextInteraction);
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
setFlag(QGraphicsItem::ItemIsFocusable, false);
}
/**
@@ -155,7 +158,7 @@ void PartText::focusOutEvent(QFocusEvent *e) {
@param e Le QGraphicsSceneMouseEvent qui decrit le double-clic
*/
void PartText::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *e) {
setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemIsFocusable);
setFlag(QGraphicsItem::ItemIsFocusable, true);
setTextInteractionFlags(Qt::TextEditorInteraction);
previous_text = toPlainText();
QGraphicsTextItem::mouseDoubleClickEvent(e);