Mod DynamicTextFieldEditor

the ui file is written in the Dynamic Text Field Editor class Add switch for KF5 (QT6)
2025-12-17 20:50:34 +01:00 · 2020-12-17 21:42:18 +01:00
parent cb37c1c2fe
commit f6d777e2f7
3 changed files with 361 additions and 313 deletions
--- a/sources/editor/ui/dynamictextfieldeditor.cpp
+++ b/sources/editor/ui/dynamictextfieldeditor.cpp
@@ -25,28 +25,28 @@
 #include "../../ui/alignmenttextdialog.h"
 #include "../../ui/compositetexteditdialog.h"
 #include "../qetelementeditor.h"
-#include "ui_dynamictextfieldeditor.h"

 #include <QColorDialog>
+#include <QFrame>
 #include <QGraphicsItem>
+#include <QGridLayout>
+#include <QLabel>
 #include <QPointer>
+#include <QSpacerItem>
 #include <assert.h>

 DynamicTextFieldEditor::DynamicTextFieldEditor(
-	QETElementEditor *editor, PartDynamicTextField *text_field, QWidget *parent) :
-	ElementItemEditor(editor, parent),
-	ui(new Ui::DynamicTextFieldEditor) {
-	ui -> setupUi(this);
-	ui -> m_composite_text_pb -> setDisabled(true);
-	ui -> m_elmt_info_cb -> setDisabled(true);
-	if(text_field) {
-		setPart(text_field);
-	}
+	QETElementEditor*	  editor,
+	PartDynamicTextField* text_field,
+	QWidget*			  parent) :
+	ElementItemEditor(editor, parent)
+{
+	setUpWidget(parent);
+	if (text_field) { setPart(text_field); }
 }

 DynamicTextFieldEditor::~DynamicTextFieldEditor()
 {
-	delete ui;
 	if(!m_connection_list.isEmpty()) {
 		for(const QMetaObject::Connection& con : m_connection_list) {
 			disconnect(con);
@@ -129,39 +129,278 @@ QList<CustomElementPart*> DynamicTextFieldEditor::currentParts() const
 void DynamicTextFieldEditor::updateForm()
 {
 	if(m_text_field) {
-		ui -> m_x_sb -> setValue(m_text_field.data() -> x());
-		ui -> m_y_sb -> setValue(m_text_field.data() ->y ());
-		ui -> m_rotation_sb -> setValue(QET::correctAngle(m_text_field.data() -> rotation()));
-		ui -> m_frame_cb -> setChecked(m_text_field.data() -> frame());
-		ui -> m_user_text_le -> setText(m_text_field.data() -> text());
-		ui -> m_size_sb -> setValue(m_text_field.data() -> font().pointSize());
+		m_x_sb->setValue(m_text_field.data()->x());
+		m_y_sb->setValue(m_text_field.data()->y());
+		m_rotation_sb->setValue(
+			QET::correctAngle(m_text_field.data()->rotation()));
+		m_frame_cb->setChecked(m_text_field.data()->frame());
+		m_user_text_le->setText(m_text_field.data()->text());
+		m_size_sb->setValue(m_text_field.data()->font().pointSize());
 #ifdef BUILD_WITHOUT_KF5
 #else
-		ui -> m_color_kpb -> setColor(m_text_field.data() -> color());
+		m_color_kpb->setColor(m_text_field.data()->color());
 #endif
-		ui -> m_width_sb -> setValue(m_text_field.data() -> textWidth());
-		ui -> m_font_pb -> setText(m_text_field -> font().family());
+		m_width_sb->setValue(m_text_field.data()->textWidth());
+		m_font_pb->setText(m_text_field->font().family());

 		switch (m_text_field.data() -> textFrom()) {
 			case DynamicElementTextItem::UserText: {
-				ui -> m_text_from_cb -> setCurrentIndex(0);
+				m_text_from_cb->setCurrentIndex(0);
 				break;
 			}
 			case DynamicElementTextItem::ElementInfo: {
-				ui -> m_text_from_cb -> setCurrentIndex(1);
-				ui -> m_elmt_info_cb -> setCurrentIndex(
-					ui -> m_elmt_info_cb -> findData(m_text_field.data() -> infoName()));
+				m_text_from_cb->setCurrentIndex(1);
+				m_elmt_info_cb->setCurrentIndex(
+					m_elmt_info_cb->findData(m_text_field.data()->infoName()));
 				break;
 			}
 			case DynamicElementTextItem::CompositeText: {
-				ui -> m_text_from_cb -> setCurrentIndex(2);
+				m_text_from_cb->setCurrentIndex(2);
 			}
 		}

-		on_m_text_from_cb_activated(ui -> m_text_from_cb -> currentIndex()); //For enable the good widget
+		on_m_text_from_cb_activated(
+			m_text_from_cb->currentIndex()); // For enable the good widget
 	}
 }

+void DynamicTextFieldEditor::setUpWidget(QWidget* parent)
+{
+	resize(344, 285);
+	setWindowTitle(tr("Form"));
+
+	QGridLayout* gridLayout = new QGridLayout(parent);
+	gridLayout->setObjectName(QString::fromUtf8("gridLayout"));
+
+	m_text_from_cb = new QComboBox(parent);
+	m_text_from_cb->addItem(QString());
+	m_text_from_cb->addItem(QString());
+	m_text_from_cb->addItem(QString());
+	m_text_from_cb->setObjectName(QString::fromUtf8("m_text_from_cb"));
+	m_text_from_cb->setItemText(0, tr("Texte utilisateur"));
+	m_text_from_cb->setItemText(
+		1,
+		tr("Information de l'\303\251l\303\251ment"));
+	m_text_from_cb->setItemText(2, tr("Texte compos\303\251"));
+
+	connect(
+		m_text_from_cb,
+		&QComboBox::currentIndexChanged,
+		this,
+		&DynamicTextFieldEditor::on_m_text_from_cb_activated);
+
+	gridLayout->addWidget(m_text_from_cb, 2, 1, 1, 2);
+
+	QLabel* label_3 = new QLabel(tr("Couleur"), parent);
+	label_3->setObjectName(QString::fromUtf8("label_3"));
+
+	gridLayout->addWidget(label_3, 7, 0, 1, 1);
+
+	QSpacerItem* verticalSpacer =
+		new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+	gridLayout->addItem(verticalSpacer, 8, 1, 1, 1);
+
+	m_elmt_info_cb = new QComboBox(parent);
+	m_elmt_info_cb->setObjectName(QString::fromUtf8("m_elmt_info_cb"));
+	m_elmt_info_cb->setDisabled(true);
+
+	connect(
+		m_elmt_info_cb,
+		&QComboBox::currentTextChanged,
+		this,
+		&DynamicTextFieldEditor::on_m_elmt_info_cb_activated);
+
+	gridLayout->addWidget(m_elmt_info_cb, 4, 1, 1, 2);
+
+	m_user_text_le = new QLineEdit(parent);
+	m_user_text_le->setObjectName(QString::fromUtf8("m_user_text_le"));
+
+	connect(
+		m_user_text_le,
+		&QLineEdit::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_user_text_le_editingFinished);
+
+	gridLayout->addWidget(m_user_text_le, 3, 1, 1, 2);
+
+	m_composite_text_pb = new QPushButton(tr("Texte compos\303\251"), parent);
+	m_composite_text_pb->setObjectName(
+		QString::fromUtf8("m_composite_text_pb"));
+	m_composite_text_pb->setDisabled(true);
+
+	connect(
+		m_composite_text_pb,
+		&QPushButton::clicked,
+		this,
+		&DynamicTextFieldEditor::on_m_composite_text_pb_clicked);
+
+	gridLayout->addWidget(m_composite_text_pb, 5, 1, 1, 2);
+
+	QLabel* label = new QLabel(tr("Police"), parent);
+	label->setObjectName(QString::fromUtf8("label"));
+
+	gridLayout->addWidget(label, 6, 0, 1, 1);
+
+	QLabel* label_4 = new QLabel(tr("Source du texte"), parent);
+	label_4->setObjectName(QString::fromUtf8("label_4"));
+
+	gridLayout->addWidget(label_4, 2, 0, 1, 1);
+
+	QSpacerItem* verticalSpacer_2 =
+		new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
+
+	gridLayout->addItem(verticalSpacer_2, 1, 0, 1, 1);
+
+	QFrame* frame = new QFrame(parent);
+	frame->setObjectName(QString::fromUtf8("frame"));
+	frame->setFrameShape(QFrame::NoFrame);
+	frame->setFrameShadow(QFrame::Raised);
+
+	QGridLayout* gridLayout_2 = new QGridLayout(frame);
+	gridLayout_2->setObjectName(QString::fromUtf8("gridLayout_2"));
+
+	m_x_sb = new QDoubleSpinBox(frame);
+	m_x_sb->setObjectName(QString::fromUtf8("m_x_sb"));
+	m_x_sb->setMinimum(-5000.000000000000000);
+	m_x_sb->setMaximum(5000.000000000000000);
+
+	connect(
+		m_x_sb,
+		&QDoubleSpinBox::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_x_sb_editingFinished);
+
+	gridLayout_2->addWidget(m_x_sb, 0, 1, 1, 1);
+
+	m_frame_cb = new QCheckBox(tr("cadre"), frame);
+	m_frame_cb->setObjectName(QString::fromUtf8("m_frame_cb"));
+
+	connect(
+		m_frame_cb,
+		&QCheckBox::clicked,
+		this,
+		&DynamicTextFieldEditor::on_m_frame_cb_clicked);
+
+	gridLayout_2->addWidget(m_frame_cb, 0, 6, 1, 1);
+
+	m_rotation_sb = new QSpinBox(frame);
+	m_rotation_sb->setObjectName(QString::fromUtf8("m_rotation_sb"));
+	m_rotation_sb->setMaximum(359);
+
+	connect(
+		m_rotation_sb,
+		&QSpinBox::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_rotation_sb_editingFinished);
+
+	gridLayout_2->addWidget(m_rotation_sb, 0, 5, 1, 1);
+
+	QLabel* label_7 = new QLabel(tr("Rotation"), frame);
+	label_7->setObjectName(QString::fromUtf8("label_7"));
+	label_7->setAlignment(
+		Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+	gridLayout_2->addWidget(label_7, 0, 4, 1, 1);
+
+	QLabel* label_5 = new QLabel(tr("X"), frame);
+	label_5->setObjectName(QString::fromUtf8("label_5"));
+	label_5->setAlignment(
+		Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+	gridLayout_2->addWidget(label_5, 0, 0, 1, 1);
+
+	m_width_sb = new QSpinBox(frame);
+	m_width_sb->setObjectName(QString::fromUtf8("m_width_sb"));
+	m_width_sb->setMinimum(-1);
+	m_width_sb->setMaximum(500);
+
+	connect(
+		m_width_sb,
+		&QSpinBox::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_width_sb_editingFinished);
+
+	gridLayout_2->addWidget(m_width_sb, 1, 5, 1, 1);
+
+	QLabel* label_2 = new QLabel(tr("Largeur"), frame);
+	label_2->setObjectName(QString::fromUtf8("label_2"));
+	label_2->setAlignment(
+		Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+	gridLayout_2->addWidget(label_2, 1, 4, 1, 1);
+
+	QLabel* label_6 = new QLabel(tr("Y"), frame);
+	label_6->setObjectName(QString::fromUtf8("label_6"));
+	label_6->setAlignment(
+		Qt::AlignRight | Qt::AlignTrailing | Qt::AlignVCenter);
+
+	gridLayout_2->addWidget(label_6, 1, 0, 1, 1);
+
+	m_y_sb = new QDoubleSpinBox(frame);
+	m_y_sb->setObjectName(QString::fromUtf8("m_y_sb"));
+	m_y_sb->setMinimum(-5000.000000000000000);
+	m_y_sb->setMaximum(5000.000000000000000);
+
+	connect(
+		m_y_sb,
+		&QDoubleSpinBox::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_y_sb_editingFinished);
+
+	gridLayout_2->addWidget(m_y_sb, 1, 1, 1, 1);
+
+	QPushButton* m_alignment_pb = new QPushButton(tr("Alignement"), frame);
+	m_alignment_pb->setObjectName(QString::fromUtf8("m_alignment_pb"));
+
+	connect(
+		m_alignment_pb,
+		&QPushButton::clicked,
+		this,
+		&DynamicTextFieldEditor::on_m_alignment_pb_clicked);
+
+	gridLayout_2->addWidget(m_alignment_pb, 1, 6, 1, 1);
+
+	gridLayout->addWidget(frame, 0, 0, 1, 3);
+
+	m_size_sb = new QSpinBox(parent);
+	m_size_sb->setObjectName(QString::fromUtf8("m_size_sb"));
+
+	connect(
+		m_size_sb,
+		&QSpinBox::editingFinished,
+		this,
+		&DynamicTextFieldEditor::on_m_size_sb_editingFinished);
+
+	gridLayout->addWidget(m_size_sb, 6, 1, 1, 1);
+
+	m_font_pb = new QPushButton(QString(), parent);
+	m_font_pb->setObjectName(QString::fromUtf8("m_font_pb"));
+
+	connect(
+		m_font_pb,
+		&QPushButton::clicked,
+		this,
+		&DynamicTextFieldEditor::on_m_font_pb_clicked);
+
+	gridLayout->addWidget(m_font_pb, 6, 2, 1, 1);
+
+#ifdef BUILD_WITHOUT_KF5
+#else
+	m_color_kpb = new KColorButton(parent);
+	m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb"));
+
+	connect(
+		m_color_kpb,
+		&KColorButton::changed,
+		this,
+		&DynamicTextFieldEditor::on_m_color_kpb_changed);
+
+	gridLayout->addWidget(m_color_kpb, 7, 1, 1, 2);
+#endif
+	setLayout(gridLayout);
+}
+
 void DynamicTextFieldEditor::setUpConnections()
 {
 	assert(m_connection_list.isEmpty());
@@ -204,7 +443,7 @@ void DynamicTextFieldEditor::disconnectConnections()
 */
 void DynamicTextFieldEditor::fillInfoComboBox()
 {
-	ui -> m_elmt_info_cb -> clear();
+	m_elmt_info_cb->clear();

 	QStringList strl;
 	QString type = elementEditor() -> elementScene() -> elementType();
@@ -223,12 +462,12 @@ void DynamicTextFieldEditor::fillInfoComboBox()


 	for (const QString& key : info_map.keys())
-		ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
+		m_elmt_info_cb->addItem(key, info_map.value(key));
 }

 void DynamicTextFieldEditor::on_m_x_sb_editingFinished()
 {
-	double value = ui -> m_x_sb -> value();
+	double value = m_x_sb->value();
 	for (int i = 0; i < m_parts.length(); i++) {
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "x", m_parts[i] -> x(), value);
 		undo -> setText(tr("Déplacer un champ texte"));
@@ -239,7 +478,7 @@ void DynamicTextFieldEditor::on_m_x_sb_editingFinished()

 void DynamicTextFieldEditor::on_m_y_sb_editingFinished()
 {
-	double value = ui -> m_y_sb -> value();
+	double value = m_y_sb->value();
 	for (int i = 0; i < m_parts.length(); i++) {
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "y", m_parts[i] -> y(), value);
 		undo -> setText(tr("Déplacer un champ texte"));
@@ -250,7 +489,7 @@ void DynamicTextFieldEditor::on_m_y_sb_editingFinished()

 void DynamicTextFieldEditor::on_m_rotation_sb_editingFinished()
 {
-	int value = ui -> m_rotation_sb -> value();
+	int value = m_rotation_sb->value();
 	for (int i = 0; i < m_parts.length(); i++) {
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "rotation", m_parts[i] -> rotation(), value);
 		undo -> setText(tr("Pivoter un champ texte"));
@@ -261,7 +500,7 @@ void DynamicTextFieldEditor::on_m_rotation_sb_editingFinished()

 void DynamicTextFieldEditor::on_m_user_text_le_editingFinished()
 {
-	QString text = ui -> m_user_text_le -> text();
+	QString text = m_user_text_le->text();
 	for (int i = 0; i < m_parts.length(); i++) {
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "text", m_parts[i] -> text(), text);
 		undo -> setText(tr("Modifier le texte d'un champ texte"));
@@ -272,7 +511,7 @@ void DynamicTextFieldEditor::on_m_user_text_le_editingFinished()
 void DynamicTextFieldEditor::on_m_size_sb_editingFinished()
 {
 	QFont font_ = m_text_field -> font();
-	font_.setPointSize(ui -> m_size_sb -> value());
+	font_.setPointSize(m_size_sb->value());
 	for (int i = 0; i < m_parts.length(); i++) {
 		QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "font", m_parts[i] -> font(), font_);
 		undo -> setText(tr("Modifier la police d'un champ texte"));
@@ -282,7 +521,7 @@ void DynamicTextFieldEditor::on_m_size_sb_editingFinished()

 void DynamicTextFieldEditor::on_m_frame_cb_clicked()
 {
-	bool frame = ui -> m_frame_cb -> isChecked();
+	bool frame = m_frame_cb->isChecked();

 	for (int i = 0; i < m_parts.length(); i++) {
 		if(frame != m_parts[i] -> frame()) {
@@ -295,7 +534,7 @@ void DynamicTextFieldEditor::on_m_frame_cb_clicked()

 void DynamicTextFieldEditor::on_m_width_sb_editingFinished()
 {
-	qreal width = (qreal)ui -> m_width_sb -> value();
+	qreal width = (qreal) m_width_sb->value();

 	for (int i = 0; i < m_parts.length(); i++) {
 		if(width != m_parts[i] -> textWidth()) {
@@ -309,7 +548,7 @@ void DynamicTextFieldEditor::on_m_width_sb_editingFinished()
 void DynamicTextFieldEditor::on_m_elmt_info_cb_activated(const QString &arg1) {
 	Q_UNUSED(arg1)

-	QString info = ui -> m_elmt_info_cb -> currentData().toString();
+	QString info = m_elmt_info_cb->currentData().toString();
 	for (int i = 0; i < m_parts.length(); i++) {
 		if(info != m_parts[i] -> infoName()) {
 			QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "infoName", m_parts[i] -> infoName(), info);
@@ -322,18 +561,16 @@ void DynamicTextFieldEditor::on_m_elmt_info_cb_activated(const QString &arg1) {
 }

 void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
-	ui -> m_user_text_le -> setDisabled(true);
-	ui -> m_elmt_info_cb -> setDisabled(true);
-	ui -> m_composite_text_pb -> setDisabled(true);
+	m_user_text_le->setDisabled(true);
+	m_elmt_info_cb->setDisabled(true);
+	m_composite_text_pb->setDisabled(true);

-	if(index == 0) {
-		ui->m_user_text_le->setEnabled(true);
-	}
+	if (index == 0) { m_user_text_le->setEnabled(true); }
 	else if (index == 1) {
-		ui->m_elmt_info_cb->setEnabled(true);
+		m_elmt_info_cb->setEnabled(true);
 	}
 	else {
-		ui->m_composite_text_pb->setEnabled(true);
+		m_composite_text_pb->setEnabled(true);
 	}

 	DynamicElementTextItem::TextFrom tf;
@@ -392,8 +629,8 @@ void DynamicTextFieldEditor::on_m_font_pb_clicked()
 	bool ok;
 	QFont font_ = QFontDialog::getFont(&ok, m_text_field -> font(), this);
 	if (ok && font_ != this -> font()) {
-		ui -> m_font_pb -> setText(font_.family());
-		ui -> m_size_sb -> setValue(font_.pointSize());
+		m_font_pb->setText(font_.family());
+		m_size_sb->setValue(font_.pointSize());

 		for (int i = 0; i < m_parts.length(); i++) {
 			QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "font", m_parts[i] -> font(), font_);
@@ -403,16 +640,24 @@ void DynamicTextFieldEditor::on_m_font_pb_clicked()
 	}
 }

-void DynamicTextFieldEditor::on_m_color_kpb_changed(const QColor &newColor) {
-	if (!newColor.isValid()) {
-		return;
-	}
+#ifdef BUILD_WITHOUT_KF5
+#else
+void DynamicTextFieldEditor::on_m_color_kpb_changed(const QColor& newColor)
+{
+	if (! newColor.isValid()) { return; }

-	for (int i = 0; i < m_parts.length(); i++) {
-		if(newColor != m_parts[i] -> color()) {
-			QPropertyUndoCommand *undo = new QPropertyUndoCommand(m_parts[i], "color", m_parts[i] -> color(), newColor);
-			undo -> setText(tr("Modifier la couleur d'un champ texte"));
+	for (int i = 0; i < m_parts.length(); i++)
+	{
+		if (newColor != m_parts[i]->color())
+		{
+			QPropertyUndoCommand* undo = new QPropertyUndoCommand(
+				m_parts[i],
+				"color",
+				m_parts[i]->color(),
+				newColor);
+			undo->setText(tr("Modifier la couleur d'un champ texte"));
 			undoStack().push(undo);
 		}
 	}
 }
+#endif