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-14 20:33:05 +02:00
Code Packages Releases 1 Activity

ElementEditor: texteditor.cpp improve code style

Browse Source
This commit is contained in:
damianCaceres 2020-08-05 08:19:47 +01:00 committed by Laurent Trinques
parent 23c43e72b5
commit bb84bb2098
1 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,12 +30,10 @@
*/ */
TextEditor::TextEditor(QETElementEditor *editor, PartText *text, QWidget *parent) : TextEditor::TextEditor(QETElementEditor *editor, PartText *text, QWidget *parent) :
ElementItemEditor(editor, parent), ElementItemEditor(editor, parent),
ui(new Ui::TextEditor) ui(new Ui::TextEditor) {
{
ui->setupUi(this); ui->setupUi(this);
setUpEditConnection(); setUpEditConnection();
if (text) if (text) {
{
setPart(text); setPart(text);
updateForm(); updateForm();
} }
@ -117,9 +115,7 @@ bool TextEditor::setPart(CustomElementPart *part)
return true; return true;
} }
m_text = part_text; m_text = part_text;
setUpChangeConnection(m_text); setUpChangeConnection(m_text);
updateForm(); updateForm();
return true; return true;
} }
@ -127,8 +123,7 @@ bool TextEditor::setPart(CustomElementPart *part)
} }
bool TextEditor::setParts(QList <CustomElementPart *> parts) { bool TextEditor::setParts(QList <CustomElementPart *> parts) {
if (parts.isEmpty()) if (parts.isEmpty()) {
{
m_parts.clear(); m_parts.clear();
if (m_text) { if (m_text) {
disconnectChangeConnection(); disconnectChangeConnection();
@ -137,20 +132,16 @@ bool TextEditor::setParts(QList <CustomElementPart *> parts) {
return true; return true;
} }
if (PartText *part= static_cast<PartText *>(parts.first())) if (PartText *part= static_cast<PartText *>(parts.first())) {
{
if (m_text) { if (m_text) {
disconnectChangeConnection(); disconnectChangeConnection();
} }
m_text = part; m_text = part;
m_parts.clear(); m_parts.clear();
m_parts.append(part); m_parts.append(part);
for (int i=1; i < parts.length(); i++) for (int i=1; i < parts.length(); i++)
m_parts.append(static_cast<PartText*>(parts[i])); m_parts.append(static_cast<PartText*>(parts[i]));
setUpChangeConnection(m_text); setUpChangeConnection(m_text);
updateForm(); updateForm();
return true; return true;
} }
@ -182,27 +173,23 @@ void TextEditor::setUpEditConnection()
{ {
disconnectEditConnection(); disconnectEditConnection();
m_edit_connection << connect(ui->m_line_edit, &QLineEdit::textEdited, [this]() m_edit_connection << connect(ui->m_line_edit, &QLineEdit::textEdited, [this]() {
{
QString text_ = ui->m_line_edit->text(); QString text_ = ui->m_line_edit->text();
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
if (text_ != partText->toPlainText()) if (text_ != partText->toPlainText()) {
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "text", partText->toPlainText(), text_); QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "text", partText->toPlainText(), text_);
undo->setText(tr("Modifier le contenu d'un champ texte")); undo->setText(tr("Modifier le contenu d'un champ texte"));
undoStack().push(undo); undoStack().push(undo);
} }
} }
}); });
m_edit_connection << connect(ui->m_x_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() m_edit_connection << connect(ui->m_x_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() {
{
QPointF pos(ui->m_x_sb->value(), 0); QPointF pos(ui->m_x_sb->value(), 0);
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
pos.setY(partText->pos().y()); pos.setY(partText->pos().y());
if (pos != partText->pos()) if (pos != partText->pos()) {
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "pos", partText->pos(), pos); QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "pos", partText->pos(), pos);
undo->setText(tr("Déplacer un champ texte")); undo->setText(tr("Déplacer un champ texte"));
undo->setAnimated(true, false); undo->setAnimated(true, false);
@ -210,14 +197,12 @@ void TextEditor::setUpEditConnection()
} }
} }
}); });
m_edit_connection << connect(ui->m_y_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() m_edit_connection << connect(ui->m_y_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() {
{
QPointF pos(0, ui->m_y_sb->value()); QPointF pos(0, ui->m_y_sb->value());
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
pos.setX(partText->pos().x()); pos.setX(partText->pos().x());
if (pos != partText->pos()) if (pos != partText->pos()) {
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "pos", partText->pos(), pos); QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "pos", partText->pos(), pos);
undo->setText(tr("Déplacer un champ texte")); undo->setText(tr("Déplacer un champ texte"));
undo->setAnimated(true, false); undo->setAnimated(true, false);
@ -225,12 +210,10 @@ void TextEditor::setUpEditConnection()
} }
} }
}); });
m_edit_connection << connect(ui->m_rotation_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() m_edit_connection << connect(ui->m_rotation_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() {
{
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
if (ui->m_rotation_sb->value() != partText->rotation()) if (ui->m_rotation_sb->value() != partText->rotation()) {
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "rotation", partText->rotation(), ui->m_rotation_sb->value()); 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);
@ -238,12 +221,10 @@ void TextEditor::setUpEditConnection()
} }
} }
}); });
m_edit_connection << connect(ui->m_size_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() m_edit_connection << connect(ui->m_size_sb, QOverload<int>::of(&QSpinBox::valueChanged), [this]() {
{
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
if (partText->font().pointSize() != ui->m_size_sb->value()) if (partText->font().pointSize() != ui->m_size_sb->value()) {
{
QFont font_ = partText->font(); 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_);
@ -257,8 +238,7 @@ void TextEditor::setUpEditConnection()
/** /**
* @brief TextEditor::on_m_font_pb_clicked * @brief TextEditor::on_m_font_pb_clicked
*/ */
void TextEditor::on_m_font_pb_clicked() void TextEditor::on_m_font_pb_clicked() {
{
bool ok; bool ok;
QFont font_ = QFontDialog::getFont(&ok, m_text->font(), this); QFont font_ = QFontDialog::getFont(&ok, m_text->font(), this);
@ -272,8 +252,7 @@ void TextEditor::on_m_font_pb_clicked()
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
if (ok && font_ != partText->font()) if (ok && font_ != partText->font()) {
{
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"));
undoStack().push(undo); undoStack().push(undo);
@ -285,12 +264,10 @@ 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) void TextEditor::on_m_color_pb_changed(const QColor &newColor) {
{
for (int i=0; i < m_parts.length(); i++) { for (int i=0; i < m_parts.length(); i++) {
PartText* partText = m_parts[i]; PartText* partText = m_parts[i];
if (newColor != partText->defaultTextColor()) if (newColor != partText->defaultTextColor()) {
{
QPropertyUndoCommand *undo = new QPropertyUndoCommand(partText, "color", partText->defaultTextColor(), newColor); 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);