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

Add a new property to automatically detect HTML markup and display rich text in a text field .

Browse Source 
git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@2066 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
scorpio810
2013-03-22 23:17:39 +00:00
parent 44986d2daa
commit d22df0b353
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources/diagramcommands.cpp
View File

@@ -557,7 +557,7 @@ ChangeDiagramTextCommand::~ChangeDiagramTextCommand() {
/// annule la modification de texte /// annule la modification de texte
void ChangeDiagramTextCommand::undo() { void ChangeDiagramTextCommand::undo() {
text_item -> setPlainText(text_before); text_item -> setHtml(text_before);
} }
/// refait la modification de texte /// refait la modification de texte
@@ -565,7 +565,7 @@ void ChangeDiagramTextCommand::redo() {
if (first_redo) { if (first_redo) {
first_redo = false; first_redo = false;
} else { } else {
text_item -> setPlainText(text_after); text_item -> setHtml(text_after);
} }
} }

6
sources/diagramtextitem.cpp
View File

@@ -202,7 +202,7 @@ void DiagramTextItem::focusInEvent(QFocusEvent *e) {
setFlag(QGraphicsItem::ItemIsMovable, false); setFlag(QGraphicsItem::ItemIsMovable, false);
// memorise le texte avant que l'utilisateur n'y touche // memorise le texte avant que l'utilisateur n'y touche
previous_text_ = toPlainText(); previous_text_ = toHtml();
// cela permettra de determiner si l'utilisateur a modifie le texte a la fin de l'edition // cela permettra de determiner si l'utilisateur a modifie le texte a la fin de l'edition
} }
@@ -215,8 +215,8 @@ void DiagramTextItem::focusOutEvent(QFocusEvent *e) {
// signale la modification du texte si besoin // signale la modification du texte si besoin
if (toPlainText() != previous_text_) { if (toPlainText() != previous_text_) {
emit(diagramTextChanged(this, previous_text_, toPlainText())); emit(diagramTextChanged(this, previous_text_, toHtml()));
previous_text_ = toPlainText(); previous_text_ = toHtml();
} }
// deselectionne le texte // deselectionne le texte

4
sources/independenttextitem.cpp
View File

@@ -51,7 +51,7 @@ IndependentTextItem::~IndependentTextItem() {
*/ */
void IndependentTextItem::fromXml(const QDomElement &e) { void IndependentTextItem::fromXml(const QDomElement &e) {
setPos(e.attribute("x").toDouble(), e.attribute("y").toDouble()); setPos(e.attribute("x").toDouble(), e.attribute("y").toDouble());
setPlainText(e.attribute("text")); setHtml(e.attribute("text"));
setRotationAngle(e.attribute("rotation").toDouble()); setRotationAngle(e.attribute("rotation").toDouble());
} }
@@ -63,7 +63,7 @@ QDomElement IndependentTextItem::toXml(QDomDocument &document) const {
QDomElement result = document.createElement("input"); QDomElement result = document.createElement("input");
result.setAttribute("x", QString("%1").arg(pos().x())); result.setAttribute("x", QString("%1").arg(pos().x()));
result.setAttribute("y", QString("%1").arg(pos().y())); result.setAttribute("y", QString("%1").arg(pos().y()));
result.setAttribute("text", toPlainText()); result.setAttribute("text", toHtml());
if (rotationAngle()) { if (rotationAngle()) {
result.setAttribute("rotation", QString("%1").arg(rotationAngle())); result.setAttribute("rotation", QString("%1").arg(rotationAngle()));
} }