kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-21 16:50:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

part text and part text field : use QPropertyUndoCommand instead of ChangePartCommand

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@4070 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2015-07-24 11:34:45 +00:00
parent b32e1bf339
commit 99c867d6d6
2 changed files with 26 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
sources/editor/graphicspart/parttext.cpp
View File

@@ -17,10 +17,10 @@
*/ */
#include "parttext.h" #include "parttext.h"
#include "texteditor.h" #include "texteditor.h"
#include "editorcommands.h"
#include "elementprimitivedecorator.h" #include "elementprimitivedecorator.h"
#include "elementscene.h" #include "elementscene.h"
#include "qetapp.h" #include "qetapp.h"
#include "QPropertyUndoCommand/qpropertyundocommand.h"
/** /**
Constructeur Constructeur
@@ -35,16 +35,11 @@ PartText::PartText(QETElementEditor *editor, QGraphicsItem *parent, ElementScene
decorator_(0) decorator_(0)
{ {
Q_UNUSED(scene) Q_UNUSED(scene)
#if QT_VERSION >= 0x040500
document() -> setDocumentMargin(1.0); document() -> setDocumentMargin(1.0);
#endif
setDefaultTextColor(Qt::black); setDefaultTextColor(Qt::black);
setFont(QETApp::diagramTextsFont()); setFont(QETApp::diagramTextsFont());
real_font_size_ = font().pointSize(); real_font_size_ = font().pointSize();
setFlags(QGraphicsItem::ItemIsSelectable); setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
#if QT_VERSION >= 0x040600
setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
#endif
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
setDefaultTextColor(Qt::black); setDefaultTextColor(Qt::black);
setPlainText(QObject::tr("T", "default text when adding a text in the element editor")); setPlainText(QObject::tr("T", "default text when adding a text in the element editor"));
@@ -432,29 +427,26 @@ void PartText::startEdition() {
End text edition, potentially generating a ChangePartCommand if the text End text edition, potentially generating a ChangePartCommand if the text
has changed. has changed.
*/ */
void PartText::endEdition() { void PartText::endEdition()
if (!previous_text.isNull()) { {
// the text was being edited if (!previous_text.isNull())
{
// the text was being edited
QString new_text = toPlainText(); QString new_text = toPlainText();
if (previous_text != new_text) { if (previous_text != new_text)
// the text was changed {
ChangePartCommand *text_change = new ChangePartCommand( QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "text", previous_text, new_text);
TextEditor::tr("contenu") + " " + name(), undo->setText(tr("Modifier un champ texte"));
this, undoStack().push(undo);
"text",
previous_text,
new_text
);
previous_text = QString(); previous_text = QString();
undoStack().push(text_change);
} }
} }
// deselectionne le texte // deselectionne le texte
QTextCursor qtc = textCursor(); QTextCursor qtc = textCursor();
qtc.clearSelection(); qtc.clearSelection();
setTextCursor(qtc); setTextCursor(qtc);
setEditable(false); setEditable(false);
if (decorator_) { if (decorator_) {
decorator_ -> setFocus(); decorator_ -> setFocus();

30
sources/editor/graphicspart/parttextfield.cpp
View File

@@ -17,9 +17,9 @@
*/ */
#include "parttextfield.h" #include "parttextfield.h"
#include "textfieldeditor.h" #include "textfieldeditor.h"
#include "editorcommands.h"
#include "elementprimitivedecorator.h" #include "elementprimitivedecorator.h"
#include "qetapp.h" #include "qetapp.h"
#include "QPropertyUndoCommand/qpropertyundocommand.h"
/** /**
Constructeur Constructeur
@@ -39,10 +39,7 @@ PartTextField::PartTextField(QETElementEditor *editor, QGraphicsItem *parent, QG
setDefaultTextColor(Qt::black); setDefaultTextColor(Qt::black);
setFont(QETApp::diagramTextsFont()); setFont(QETApp::diagramTextsFont());
real_font_size_ = font().pointSize(); real_font_size_ = font().pointSize();
setFlags(QGraphicsItem::ItemIsSelectable); setFlags(QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemSendsGeometryChanges);
#if QT_VERSION >= 0x040600
setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
#endif
setAcceptHoverEvents(true); setAcceptHoverEvents(true);
setPlainText(QObject::tr("_", "default text when adding a textfield in the element editor")); setPlainText(QObject::tr("_", "default text when adding a textfield in the element editor"));
@@ -416,21 +413,18 @@ void PartTextField::startEdition() {
End text edition, potentially generating a ChangePartCommand if the text End text edition, potentially generating a ChangePartCommand if the text
has changed. has changed.
*/ */
void PartTextField::endEdition() { void PartTextField::endEdition()
if (!previous_text.isNull()) { {
// the text was being edited if (!previous_text.isNull())
{
// the text was being edited
QString new_text = toPlainText(); QString new_text = toPlainText();
if (previous_text != new_text) { if (previous_text != new_text)
// the text was changed {
ChangePartCommand *text_change = new ChangePartCommand( QPropertyUndoCommand *undo = new QPropertyUndoCommand(this, "text", previous_text, new_text);
TextFieldEditor::tr("contenu") + " " + name(), undo->setText(tr("Modifier un champ texte"));
this, undoStack().push(undo);
"text",
previous_text,
new_text
);
previous_text = QString(); previous_text = QString();
undoStack().push(text_change);
} }
} }