realAscot/qelectrotech-source-mirror
realAscot/qelectrotech-source-mirror
1
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-09-13 20:23:04 +02:00
Code Packages Releases 1 Activity

multipart edit

Browse Source
This commit is contained in:
Martin Marmsoler 2020-05-28 20:48:56 +02:00 committed by Laurent Trinques
parent 4abf1c4f2e
commit cfda59e978
3 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sources/editor/qetelementeditor.cpp
View File

@ -631,8 +631,10 @@ void QETElementEditor::slot_updateInformations()
cep_list << cep; cep_list << cep;
if (cep->xmlName() != selection_xml_name) if (cep->xmlName() != selection_xml_name)
same_xml_name = false; same_xml_name = false;
} else } else {
style_editable = false; style_editable = false;
same_xml_name = false;
}
} }
if (style_editable) if (style_editable)
style_editable = StyleEditor::isStyleEditable(cep_list); style_editable = StyleEditor::isStyleEditable(cep_list);
@ -645,10 +647,10 @@ void QETElementEditor::slot_updateInformations()
// if(editor->currentPart() == cep_list.first()) // if(editor->currentPart() == cep_list.first())
// return; // return;
if (selection_xml_name == "terminal") { if (selection_xml_name == "terminal" || selection_xml_name == "text") {
clearToolsDock(); clearToolsDock();
//We add the editor widget //We add the editor widget
TerminalEditor *editor = static_cast<TerminalEditor*>(m_editors[selection_xml_name]); ElementItemEditor *editor = static_cast<ElementItemEditor*>(m_editors[selection_xml_name]);
if (editor) if (editor)
{ {
if (editor->setParts(cep_list)) if (editor->setParts(cep_list))

34
sources/editor/ui/texteditor.cpp
View File

@ -110,7 +110,7 @@ bool TextEditor::setPart(CustomElementPart *part)
return true; return true;
} }
if (PartText *part_text = dynamic_cast<PartText *>(part)) if (PartText *part_text = static_cast<PartText *>(part))
{ {
if (part_text == m_text) { if (part_text == m_text) {
return true; return true;
@ -215,11 +215,27 @@ void TextEditor::setUpEditConnection()
undoStack().push(undo); undoStack().push(undo);
} }
} }
});
m_edit_connection << connect(ui->m_rotation_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]()
{
for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i];
if (ui->m_rotation_sb->value() != partText->rotation())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "rotation", partText->rotation(), ui->m_rotation_sb->value());
undo->setText(tr("Pivoter un champ texte")); undo->setText(tr("Pivoter un champ texte"));
undo->setAnimated(true, false); undo->setAnimated(true, false);
undoStack().push(undo); undoStack().push(undo);
} }
} }
});
m_edit_connection << connect(ui->m_size_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]()
{
for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i];
if (partText->font().pointSize() != ui->m_size_sb->value())
{
QFont font_ = partText->font();
font_.setPointSize(ui->m_size_sb->value()); font_.setPointSize(ui->m_size_sb->value());
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "font", partText->font(), font_); QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "font", partText->font(), font_);
undo->setText(tr("Modifier la police d'un texte")); undo->setText(tr("Modifier la police d'un texte"));
@ -242,6 +258,14 @@ void TextEditor::on_m_font_pb_clicked()
ui->m_size_sb->setValue(font_.pointSize()); ui->m_size_sb->setValue(font_.pointSize());
ui->m_size_sb->blockSignals(false); ui->m_size_sb->blockSignals(false);
ui->m_font_pb->setText(font_.family());
}
for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i];
if (ok && font_ != partText->font())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "font", partText->font(), font_);
undo->setText(tr("Modifier la police d'un texte")); undo->setText(tr("Modifier la police d'un texte"));
undoStack().push(undo); undoStack().push(undo);
} }
@ -251,6 +275,14 @@ void TextEditor::on_m_font_pb_clicked()
/** /**
* @brief TextEditor::on_m_color_pb_changed * @brief TextEditor::on_m_color_pb_changed
* @param newColor * @param newColor
*/
void TextEditor::on_m_color_pb_changed(const QColor &newColor)
{
for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i];
if (newColor != partText->defaultTextColor())
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "color", partText->defaultTextColor(), newColor);
undo->setText(tr("Modifier la couleur d'un texte")); undo->setText(tr("Modifier la couleur d'un texte"));
undoStack().push(undo); undoStack().push(undo);
} }

2
sources/editor/ui/texteditor.h
View File

@ -55,7 +55,7 @@ class TextEditor : public ElementItemEditor
Ui::TextEditor *ui; Ui::TextEditor *ui;
QPointer <PartText> m_text; QPointer <PartText> m_text;
QList<QPointer<PartText>> m_parts; QList<PartText*> m_parts;
QList <QMetaObject::Connection> m_edit_connection; QList <QMetaObject::Connection> m_edit_connection;
QList <QMetaObject::Connection> m_change_connection; QList <QMetaObject::Connection> m_change_connection;
}; };