mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-07-30 07:44:13 +02:00
Element editor: optional alignment for static texts (#549)
Static texts (PartText) gain an optional alignment, exposed via the existing AlignmentTextDialog behind a new "Alignement" button in the static text editor: - The horizontal part aligns the lines of a multi-line text relative to each other (centered block labels no longer need one hand-placed text per line). - The full alignment defines the anchor: when the content or font changes later, the selected corner/center of the bounding rect keeps its place instead of always growing right/down from the top-left (same prepareAlignment/finishAlignment logic as DiagramTextItem). Format: the <text> node takes the same optional Halignment/Valignment attributes as dynamic_text, written only when they differ from the historical top-left behaviour - existing .elmt files are untouched and round-trip byte-identical. The saved x/y stay the baseline-left of the text block in all cases; ElementPictureFactory only needs the line alignment (the anchor is editor-side behaviour), so rendered elements match the editor exactly. German translations for the three new strings included (qet_de stays complete, 2686/2686). Verified headless: a project embedding a two-line text once with Halignment=AlignHCenter and once without exports to SVG with the short line centered under the long one (x 102.5 vs 126.5) in the aligned block, and identical x for both lines in the legacy block. Editor-side anchor behaviour follows the proven DiagramTextItem implementation but was not manually exercised in the GUI yet.
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "texteditor.h"
|
||||
|
||||
#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
|
||||
#include "../../ui/alignmenttextdialog.h"
|
||||
#include "../graphicspart/parttext.h"
|
||||
|
||||
#include <cassert>
|
||||
@@ -371,8 +372,34 @@ void TextEditor::setUpWidget(QWidget *parent)
|
||||
|
||||
gridLayout->addWidget(m_font_pb, 2, 2, 1, 2);
|
||||
|
||||
QPushButton *alignment_pb = new QPushButton(tr("Alignement"), parent);
|
||||
alignment_pb->setToolTip(tr("Point d'ancrage du texte et alignement"
|
||||
" des lignes entre elles"));
|
||||
connect(alignment_pb, &QPushButton::clicked, [this]() {
|
||||
if (m_text.isNull()) {
|
||||
return;
|
||||
}
|
||||
AlignmentTextDialog atd(m_text->alignment(), this);
|
||||
if (atd.exec() != QDialog::Accepted) {
|
||||
return;
|
||||
}
|
||||
for (int i = 0; i < m_parts.length(); i++) {
|
||||
PartText *part_text = m_parts[i];
|
||||
if (atd.alignment() != part_text->alignment()) {
|
||||
QPropertyUndoCommand *undo = new QPropertyUndoCommand(
|
||||
part_text, "alignment",
|
||||
QVariant(part_text->alignment()),
|
||||
QVariant(atd.alignment()));
|
||||
undo->setText(tr("Modifier l'alignement d'un champ texte"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
gridLayout->addWidget(alignment_pb, 3, 0, 1, 2);
|
||||
|
||||
QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
|
||||
|
||||
gridLayout->addItem(verticalSpacer, 3, 2, 1, 1);
|
||||
gridLayout->addItem(verticalSpacer, 4, 2, 1, 1);
|
||||
setLayout(gridLayout);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user