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

Dynamic element text editor :

Browse Source 
When add a new text, the item text in the tree view is selected and expanded.
When edit the pos of a text in the tree view, the new position is set directly, no need to lose focus or press enter key anymore for update the pos of the text.


git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@5089 bfdf4180-ca20-0410-9c96-a3a8aa849046
This commit is contained in:
blacksun
2017-11-05 14:33:03 +00:00
parent 50fc46e162
commit 7fa942e3c1
5 changed files with 78 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
sources/ui/dynamicelementtextitemeditor.cpp
View File

@@ -23,6 +23,7 @@
#include "diagram.h"
#include "undocommand/deleteqgraphicsitemcommand.h"
#include "undocommand/addelementtextcommand.h"
#include "QPropertyUndoCommand/qpropertyundocommand.h"
#include <QTreeView>
#include <QUndoCommand>
@@ -78,7 +79,16 @@ void DynamicElementTextItemEditor::apply()
for (DynamicElementTextItem *deti : m_element->dynamicTextItems())
{
QUndoCommand *undo = m_model->undoForEditedText(deti);
if(undo->childCount())
if (undo->childCount() == 1)
{
QPropertyUndoCommand *quc = new QPropertyUndoCommand(static_cast<const QPropertyUndoCommand *>(undo->child(0)));
if (quc->text().isEmpty())
quc->setText(undo->text());
undo_list << quc;
delete undo;
}
else if(undo->childCount() > 1)
undo_list << undo;
else
delete undo;
@@ -90,7 +100,9 @@ void DynamicElementTextItemEditor::apply()
if(!undo_list.isEmpty() && m_element->diagram())
{
if (undo_list.size() == 1)
{
m_element->diagram()->undoStack().push(undo_list.first());
}
else
{
QUndoStack &us = m_element->diagram()->undoStack();
@@ -117,6 +129,7 @@ void DynamicElementTextItemEditor::setCurrentText(DynamicElementTextItem *text)
return;
m_tree_view->expand(index);
m_tree_view->expand(index.child(0,0));
m_tree_view->setCurrentIndex(index);
}
@@ -157,6 +170,8 @@ void DynamicElementTextItemEditor::on_m_add_text_clicked()
{
m_element->diagram()->undoStack().push(new AddElementTextCommand(m_element, deti));
m_model->addText(deti);
setCurrentText(deti);
}
else
{