mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-08-07 13:54:12 +02:00
Merge branch 'master' into qt6_cmake_joshua
This commit is contained in:
joshua
@@ -163,7 +163,7 @@ void DynamicTextFieldEditor::updateForm()
|
||||
}
|
||||
}
|
||||
|
||||
on_m_text_from_cb_activated(ui -> m_text_from_cb -> currentIndex()); //For enable the good widget
|
||||
updateTextFromWidgetsEnabled(ui -> m_text_from_cb -> currentIndex()); //For enable the good widget
|
||||
}
|
||||
}
|
||||
|
||||
@@ -197,6 +197,10 @@ void DynamicTextFieldEditor::setUpConnections()
|
||||
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::textWidthChanged, this, [=](){this -> updateForm();});
|
||||
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::compositeTextChanged,this, [=](){this -> updateForm();});
|
||||
m_connection_list << connect(m_text_field.data(), &PartDynamicTextField::keepVisualRotationChanged, this, [=](){this -> updateForm();});
|
||||
|
||||
// Refresh info combo when element data changes (e.g. type switched to PLC-Slave)
|
||||
m_connection_list << connect(elementEditor()->elementScene(), &ElementScene::elementInfoChanged,
|
||||
this, &DynamicTextFieldEditor::fillInfoComboBox);
|
||||
}
|
||||
|
||||
void DynamicTextFieldEditor::disconnectConnections()
|
||||
@@ -218,13 +222,34 @@ void DynamicTextFieldEditor::fillInfoComboBox()
|
||||
ui -> m_elmt_info_cb -> clear();
|
||||
|
||||
QStringList strl;
|
||||
auto type = elementEditor()->elementScene()->elementData().m_type;
|
||||
auto ed = elementEditor()->elementScene()->elementData();
|
||||
auto type = ed.m_type;
|
||||
|
||||
if((type & ElementData::AllReport) || (type == ElementData::ConductorDefinition)) {
|
||||
strl = QETInformation::folioReportInfoKeys();
|
||||
}
|
||||
else {
|
||||
strl = QETInformation::elementInfoKeys();
|
||||
|
||||
bool is_plc_slave = (type == ElementData::Slave
|
||||
&& ed.m_slave_type == ElementData::PLCSlave);
|
||||
|
||||
if (is_plc_slave) {
|
||||
QStringList plc_keys = {
|
||||
QETInformation::ELMT_PLC_TYPE,
|
||||
QETInformation::ELMT_PLC_ADDRESS,
|
||||
QETInformation::ELMT_PLC_FUNCTION,
|
||||
QETInformation::ELMT_PLC_COMMENT,
|
||||
QETInformation::ELMT_PLC_CROSSREF
|
||||
};
|
||||
strl = plc_keys + strl;
|
||||
} else {
|
||||
strl.removeAll(QETInformation::ELMT_PLC_TYPE);
|
||||
strl.removeAll(QETInformation::ELMT_PLC_ADDRESS);
|
||||
strl.removeAll(QETInformation::ELMT_PLC_FUNCTION);
|
||||
strl.removeAll(QETInformation::ELMT_PLC_COMMENT);
|
||||
strl.removeAll(QETInformation::ELMT_PLC_CROSSREF);
|
||||
}
|
||||
}
|
||||
|
||||
for (int i=0; i<strl.size();++i) {
|
||||
@@ -327,7 +352,16 @@ void DynamicTextFieldEditor::on_m_elmt_info_cb_activated(const QString &arg1) {
|
||||
}
|
||||
}
|
||||
|
||||
void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
|
||||
/**
|
||||
@brief DynamicTextFieldEditor::updateTextFromWidgetsEnabled
|
||||
Enable the widget matching @p index (the "text from" combo box's current
|
||||
index) and disable the other two. Purely cosmetic: called both from the
|
||||
real user-activated slot below and from updateForm() when the form is
|
||||
(re)filled for a part/selection, so it must never touch m_parts's data —
|
||||
see on_m_text_from_cb_activated() for the part-mutating counterpart.
|
||||
*/
|
||||
void DynamicTextFieldEditor::updateTextFromWidgetsEnabled(int index)
|
||||
{
|
||||
ui -> m_user_text_le -> setDisabled(true);
|
||||
ui -> m_elmt_info_cb -> setDisabled(true);
|
||||
ui -> m_composite_text_pb -> setDisabled(true);
|
||||
@@ -341,6 +375,10 @@ void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
|
||||
else {
|
||||
ui->m_composite_text_pb->setEnabled(true);
|
||||
}
|
||||
}
|
||||
|
||||
void DynamicTextFieldEditor::on_m_text_from_cb_activated(int index) {
|
||||
updateTextFromWidgetsEnabled(index);
|
||||
|
||||
DynamicElementTextItem::TextFrom tf;
|
||||
if(index == 0) {
|
||||
|
||||
@@ -52,6 +52,7 @@ class DynamicTextFieldEditor : public ElementItemEditor {
|
||||
void fillInfoComboBox();
|
||||
void setUpConnections();
|
||||
void disconnectConnections();
|
||||
void updateTextFromWidgetsEnabled(int index);
|
||||
|
||||
private slots:
|
||||
void on_m_x_sb_editingFinished();
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -24,6 +24,13 @@
|
||||
#include <QAbstractButton>
|
||||
#include <QDialog>
|
||||
|
||||
class QTableWidget;
|
||||
class QSpinBox;
|
||||
class QCheckBox;
|
||||
class QGroupBox;
|
||||
class QPushButton;
|
||||
class QLineEdit;
|
||||
|
||||
namespace Ui {
|
||||
class ElementPropertiesEditorWidget;
|
||||
}
|
||||
@@ -49,16 +56,45 @@ class ElementPropertiesEditorWidget : public QDialog
|
||||
void setUpInterface();
|
||||
void updateTree();
|
||||
void populateTree();
|
||||
void populateSlaveGroupsTable();
|
||||
void readSlaveGroupsFromTable();
|
||||
void createPlcConfigWidgets();
|
||||
void populatePlcTable();
|
||||
void readPlcTable();
|
||||
|
||||
//SLOTS
|
||||
private slots:
|
||||
void on_m_buttonBox_accepted();
|
||||
void on_m_base_type_cb_currentIndexChanged(int index);
|
||||
void on_m_slave_groups_checkbox_toggled(bool checked);
|
||||
void on_max_slaves_checkbox_toggled(bool checked);
|
||||
void plcAddRow();
|
||||
void plcRemoveRow();
|
||||
void plcPasteFromClipboard();
|
||||
void plcTerminalCountChanged(int row, int count);
|
||||
void plcSelectHeaderFont();
|
||||
void plcSelectCellFont();
|
||||
|
||||
//ATTRIBUTES
|
||||
private:
|
||||
Ui::ElementPropertiesEditorWidget *ui;
|
||||
ElementData m_data;
|
||||
|
||||
// PLC configuration widgets (created programmatically)
|
||||
QGroupBox *m_plc_gb = nullptr;
|
||||
QTableWidget *m_plc_table = nullptr;
|
||||
QTableWidget *m_plc_terminal_table = nullptr;
|
||||
QCheckBox *m_plc_break_checkboxes[4] = {nullptr, nullptr, nullptr, nullptr};
|
||||
QSpinBox *m_plc_break_spinboxes[4] = {nullptr, nullptr, nullptr, nullptr};
|
||||
QSpinBox *m_plc_row_height_spinbox = nullptr;
|
||||
QPushButton *m_plc_header_font_btn = nullptr;
|
||||
QPushButton *m_plc_cell_font_btn = nullptr;
|
||||
QCheckBox *m_plc_show_headers_cb = nullptr;
|
||||
QFont m_plc_header_font;
|
||||
QFont m_plc_cell_font;
|
||||
QList<QCheckBox *> m_plc_col_visibility_checkboxes;
|
||||
QList<QSpinBox *> m_plc_col_width_spinboxes;
|
||||
QList<QLineEdit *> m_plc_col_name_edits;
|
||||
};
|
||||
|
||||
#endif // ELEMENTPROPERTIESEDITORWIDGET_H
|
||||
|
||||
@@ -93,17 +93,17 @@
|
||||
<property name="title">
|
||||
<string>Élément maître</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Type concret</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="m_master_type_cb"/>
|
||||
</item>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Type concret</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="m_master_type_cb"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QCheckBox" name="max_slaves_checkbox">
|
||||
<property name="text">
|
||||
@@ -121,6 +121,55 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QCheckBox" name="m_slave_groups_checkbox">
|
||||
<property name="text">
|
||||
<string>Définir les éléments esclave</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0" colspan="2">
|
||||
<widget class="QTableWidget" name="m_slave_groups_table">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>150</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="selectionMode">
|
||||
<enum>QAbstractItemView::SingleSelection</enum>
|
||||
</property>
|
||||
<property name="selectionBehavior">
|
||||
<enum>QAbstractItemView::SelectRows</enum>
|
||||
</property>
|
||||
<property name="columnCount">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Type</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Contact</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Nb. contacts</string>
|
||||
</property>
|
||||
</column>
|
||||
<column>
|
||||
<property name="text">
|
||||
<string>Nb. bornes</string>
|
||||
</property>
|
||||
</column>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
||||
@@ -480,15 +480,11 @@ void QETElementEditor::fillPartsList()
|
||||
}
|
||||
}
|
||||
QListWidgetItem *qlwi = new QListWidgetItem(part_desc);
|
||||
QVariant v;
|
||||
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) // ### Qt 6: remove
|
||||
v.setValue<QGraphicsItem *>(qgi);
|
||||
#else
|
||||
#if TODO_LIST
|
||||
#pragma message("@TODO remove code for QT 6 or later")
|
||||
#endif
|
||||
qDebug()<<"Help code for QT 6 or later";
|
||||
#endif
|
||||
// Qt declares the QGraphicsItem* metatype itself, so this
|
||||
// works on Qt 5 and Qt 6 alike. Without the stored pointer
|
||||
// the parts list loses its item association and selecting
|
||||
// a part no longer selects it on the canvas.
|
||||
QVariant v = QVariant::fromValue(qgi);
|
||||
qlwi -> setData(42, v);
|
||||
m_parts_list -> addItem(qlwi);
|
||||
qlwi -> setSelected(qgi -> isSelected());
|
||||
@@ -736,11 +732,13 @@ bool QETElementEditor::checkElement()
|
||||
QList<QETWarning> warnings;
|
||||
QList<QETWarning> errors;
|
||||
|
||||
// Warning #1: Element haven't got terminal
|
||||
// Warning #1: Element does not have (enough) terminals
|
||||
// (except for report and conductor definition, because they must have one terminal and this checking is done below)
|
||||
// (another exception: "thumbnails" aka "front-views" may/should not have terminals)
|
||||
if (!m_elmt_scene -> containsTerminals() &&
|
||||
!(m_elmt_scene->elementData().m_type & ElementData::AllReport) &&
|
||||
m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition) {
|
||||
m_elmt_scene->elementData().m_type != ElementData::ConductorDefinition &&
|
||||
m_elmt_scene->elementData().m_type != ElementData::Thumbnail) {
|
||||
warnings << qMakePair(
|
||||
tr("Absence de borne", "warning title"),
|
||||
tr(
|
||||
@@ -749,50 +747,50 @@ bool QETElementEditor::checkElement()
|
||||
"warning description"
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Check folio report element
|
||||
if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
|
||||
{
|
||||
int terminal =0;
|
||||
// Check folio report element
|
||||
if (m_elmt_scene->elementData().m_type & ElementData::AllReport)
|
||||
{
|
||||
int terminal =0;
|
||||
|
||||
for(auto qgi : m_elmt_scene -> items()) {
|
||||
if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
|
||||
terminal ++;
|
||||
}
|
||||
}
|
||||
|
||||
//Error folio report must have only one terminal
|
||||
if (terminal != 1) {
|
||||
errors << qMakePair (tr("Absence de borne"),
|
||||
tr("<br><b>Erreur</b> :"
|
||||
"<br>Les reports de folio doivent posséder une seul borne."
|
||||
"<br><b>Solution</b> :"
|
||||
"<br>Verifier que l'élément ne possède qu'une seul borne"));
|
||||
for(auto qgi : m_elmt_scene -> items()) {
|
||||
if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
|
||||
terminal ++;
|
||||
}
|
||||
}
|
||||
|
||||
// Check conductor definition element
|
||||
if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition)
|
||||
{
|
||||
int terminal =0;
|
||||
//Error folio report must have only one terminal
|
||||
if (terminal != 1) {
|
||||
errors << qMakePair (tr("Absence de borne"),
|
||||
tr("<br><b>Erreur</b> :"
|
||||
"<br>Les reports de folio doivent posséder une seul borne."
|
||||
"<br><b>Solution</b> :"
|
||||
"<br>Verifier que l'élément ne possède qu'une seul borne"));
|
||||
}
|
||||
}
|
||||
|
||||
for(auto qgi : m_elmt_scene -> items()) {
|
||||
if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
|
||||
terminal ++;
|
||||
}
|
||||
}
|
||||
// Check conductor definition element
|
||||
if (m_elmt_scene->elementData().m_type == ElementData::ConductorDefinition)
|
||||
{
|
||||
int terminal =0;
|
||||
|
||||
// Error: Conductor definition must have exactly one terminal
|
||||
if (terminal != 1) {
|
||||
errors << qMakePair (tr("Nombre de bornes incorrect"),
|
||||
tr("<br><b>Erreur</b> :"
|
||||
"<br>Les définitions de conducteur ne peuvent posséder qu'une seule borne."
|
||||
"<br><b>Solution</b> :"
|
||||
"<br>Vérifier que l'élément ne possède qu'une seule borne"));
|
||||
for(auto qgi : m_elmt_scene -> items()) {
|
||||
if (qgraphicsitem_cast<PartTerminal *>(qgi)) {
|
||||
terminal ++;
|
||||
}
|
||||
}
|
||||
|
||||
// Error: Conductor definition must have exactly one terminal
|
||||
if (terminal != 1) {
|
||||
errors << qMakePair (tr("Nombre de bornes incorrect"),
|
||||
tr("<br><b>Erreur</b> :"
|
||||
"<br>Les définitions de conducteur ne peuvent posséder qu'une seule borne."
|
||||
"<br><b>Solution</b> :"
|
||||
"<br>Vérifier que l'élément ne possède qu'une seule borne"));
|
||||
}
|
||||
}
|
||||
|
||||
if (!errors.count() && !warnings.count()) {
|
||||
return(true);
|
||||
}
|
||||
@@ -1091,7 +1089,7 @@ void QETElementEditor::updateAction()
|
||||
<< ui->m_revert_selection_action
|
||||
<< ui->m_paste_from_file_action
|
||||
<< ui->m_paste_from_element_action;
|
||||
for (auto action : qAsConst(ro_list)) {
|
||||
for (auto action : std::as_const(ro_list)) {
|
||||
action->setDisabled(m_read_only);
|
||||
}
|
||||
|
||||
@@ -1106,7 +1104,7 @@ void QETElementEditor::updateAction()
|
||||
<< ui->m_flip_action
|
||||
<< ui->m_mirror_action;
|
||||
auto items_selected = !m_read_only && m_elmt_scene->selectedItems().count();
|
||||
for (auto action : qAsConst(select_list)) {
|
||||
for (auto action : std::as_const(select_list)) {
|
||||
action->setEnabled(items_selected);
|
||||
}
|
||||
|
||||
@@ -1190,6 +1188,12 @@ void QETElementEditor::initGui()
|
||||
updateInformations();
|
||||
fillPartsList();
|
||||
|
||||
// When the element type changes, update the terminal editor master label visibility
|
||||
connect(m_elmt_scene, &ElementScene::elementTypeChanged, this, [this]() {
|
||||
auto *te = static_cast<TerminalEditor *>(m_editors["terminal"]);
|
||||
if (te) te->refreshMasterLabelVisibility();
|
||||
});
|
||||
|
||||
statusBar()->showMessage(tr("Éditeur d'éléments", "status bar message"));
|
||||
}
|
||||
|
||||
|
||||
@@ -21,6 +21,12 @@
|
||||
#include "../../qet.h"
|
||||
#include "../graphicspart/partterminal.h"
|
||||
#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
|
||||
#include "../../ui/alignmenttextdialog.h"
|
||||
|
||||
#include <QColorDialog>
|
||||
#include <QFontDialog>
|
||||
#include "../elementscene.h"
|
||||
#include "qetelementeditor.h"
|
||||
|
||||
/**
|
||||
* @brief TerminalEditor::TerminalEditor
|
||||
@@ -33,6 +39,22 @@ TerminalEditor::TerminalEditor(QETElementEditor *editor, QWidget *parent) :
|
||||
ui(new Ui::TerminalEditor)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
|
||||
#ifdef BUILD_WITHOUT_KF5
|
||||
m_color_pb = new QPushButton(this);
|
||||
m_color_pb->setMinimumSize(40, 24);
|
||||
connect(m_color_pb, &QPushButton::clicked, this, &TerminalEditor::labelColorClicked);
|
||||
#else
|
||||
m_color_pb = new KColorButton(this);
|
||||
m_color_pb->setMinimumSize(40, 24);
|
||||
connect(m_color_pb, &KColorButton::changed, this, &TerminalEditor::labelColorClicked);
|
||||
#endif
|
||||
|
||||
QLayout *layout = ui->m_color_widget->parentWidget()->layout();
|
||||
layout->replaceWidget(ui->m_color_widget, m_color_pb);
|
||||
delete ui->m_color_widget;
|
||||
ui->m_color_widget = nullptr;
|
||||
|
||||
init();
|
||||
}
|
||||
|
||||
@@ -63,6 +85,44 @@ void TerminalEditor::updateForm()
|
||||
ui->m_name_le->setText(m_part->terminalName());
|
||||
ui->m_type_cb->setCurrentIndex(ui->m_type_cb->findData(m_part->terminalType()));
|
||||
|
||||
ui->m_show_name_cb->setChecked(m_part->showName());
|
||||
ui->m_label_x_dsb->setValue(m_part->labelPos().x());
|
||||
ui->m_label_y_dsb->setValue(m_part->labelPos().y());
|
||||
ui->m_font_pb->setText(m_part->labelFont().family());
|
||||
ui->m_label_size_sb->setValue(m_part->labelFont().pointSize());
|
||||
ui->m_label_rotation_sb->setValue(static_cast<int>(m_part->labelRotation()));
|
||||
ui->m_label_frame_cb->setChecked(m_part->labelFrame());
|
||||
|
||||
#ifdef BUILD_WITHOUT_KF5
|
||||
QPixmap px(16, 16);
|
||||
px.fill(m_part->labelColor());
|
||||
m_color_pb->setIcon(QIcon(px));
|
||||
#else
|
||||
m_color_pb->setColor(m_part->labelColor());
|
||||
#endif
|
||||
|
||||
ui->m_text_props_gb->setEnabled(m_part->showName());
|
||||
|
||||
// Update master label fields
|
||||
bool is_slave = updateMasterLabelVisibility();
|
||||
if (is_slave) {
|
||||
PartTerminal *pt = m_part;
|
||||
if (pt) {
|
||||
ui->m_use_master_label_cb->setChecked(pt->useMasterLabel());
|
||||
ui->m_master_label_cb->setEnabled(pt->useMasterLabel());
|
||||
ui->m_name_le->setEnabled(!pt->useMasterLabel());
|
||||
int idx = ui->m_master_label_cb->findData(pt->masterLabelIndex());
|
||||
if (idx >= 0) {
|
||||
ui->m_master_label_cb->setCurrentIndex(idx);
|
||||
}
|
||||
// Show T-label in name field when master label is active
|
||||
if (pt->useMasterLabel()) {
|
||||
int label_idx = pt->masterLabelIndex();
|
||||
ui->m_name_le->setText(tr("T%1").arg(label_idx + 1));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
activeConnections(true);
|
||||
}
|
||||
|
||||
@@ -125,6 +185,16 @@ void TerminalEditor::init()
|
||||
ui->m_type_cb->addItem(tr("NO (contact SW)"), TerminalData::No);
|
||||
ui->m_type_cb->addItem(tr("NC (contact SW)"), TerminalData::Nc);
|
||||
ui->m_type_cb->addItem(tr("Commun (contact SW)"), TerminalData::Common);
|
||||
|
||||
ui->m_text_props_gb->setEnabled(false);
|
||||
|
||||
// Populate master label dropdown (T1-T20)
|
||||
for (int i = 1; i <= 20; ++i) {
|
||||
ui->m_master_label_cb->addItem(tr("T%1").arg(i), i - 1);
|
||||
}
|
||||
|
||||
// Check if parent element is a Slave to show/hide master label group
|
||||
updateMasterLabelVisibility();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -218,6 +288,146 @@ void TerminalEditor::typeEdited()
|
||||
* and method of this class.
|
||||
* @param active
|
||||
*/
|
||||
|
||||
void TerminalEditor::showNameEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
bool show = ui->m_show_name_cb->isChecked();
|
||||
if (m_part->showName() != show) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "show_name", m_part->showName(), show);
|
||||
undo->setText(tr("Afficher/cacher le nom du terminal"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
ui->m_text_props_gb->setEnabled(show);
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelPosEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
QPointF new_pos(ui->m_label_x_dsb->value(), ui->m_label_y_dsb->value());
|
||||
if (m_part->labelPos() != new_pos) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_pos", m_part->labelPos(), new_pos);
|
||||
undo->setText(tr("Modifier la position du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelFontClicked()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
bool ok;
|
||||
QFont font = QFontDialog::getFont(&ok, m_part->labelFont(), this);
|
||||
if (ok && font != m_part->labelFont()) {
|
||||
ui->m_font_pb->setText(font.family());
|
||||
ui->m_label_size_sb->blockSignals(true);
|
||||
ui->m_label_size_sb->setValue(font.pointSize());
|
||||
ui->m_label_size_sb->blockSignals(false);
|
||||
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_font", m_part->labelFont(), font);
|
||||
undo->setText(tr("Modifier la police du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelSizeEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
QFont new_font = m_part->labelFont();
|
||||
new_font.setPointSize(ui->m_label_size_sb->value());
|
||||
if (m_part->labelFont() != new_font) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_font", m_part->labelFont(), new_font);
|
||||
undo->setText(tr("Modifier la taille de police du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelRotationEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
qreal rot = static_cast<qreal>(ui->m_label_rotation_sb->value());
|
||||
if (!qFuzzyCompare(m_part->labelRotation(), rot)) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_rotation", m_part->labelRotation(), rot);
|
||||
undo->setText(tr("Modifier la rotation du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelAlignClicked()
|
||||
{
|
||||
Qt::Alignment align = m_part->labelHAlignment() | m_part->labelVAlignment();
|
||||
AlignmentTextDialog dialog(align, this);
|
||||
if (dialog.exec() == QDialog::Accepted) {
|
||||
Qt::Alignment new_align = dialog.alignment();
|
||||
Qt::Alignment new_h = new_align & Qt::AlignHorizontal_Mask;
|
||||
Qt::Alignment new_v = new_align & Qt::AlignVertical_Mask;
|
||||
|
||||
if (new_h != m_part->labelHAlignment()) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_halignment",
|
||||
QVariant::fromValue(m_part->labelHAlignment()), QVariant::fromValue(new_h));
|
||||
undo->setText(tr("Modifier l'alignement du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
if (new_v != m_part->labelVAlignment()) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_valignment",
|
||||
QVariant::fromValue(m_part->labelVAlignment()), QVariant::fromValue(new_v));
|
||||
undo->setText(tr("Modifier l'alignement du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void TerminalEditor::labelFrameEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
bool frame = ui->m_label_frame_cb->isChecked();
|
||||
if (m_part->labelFrame() != frame) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_frame", m_part->labelFrame(), frame);
|
||||
undo->setText(tr("Afficher/cacher le cadre du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::labelColorClicked()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
#ifdef BUILD_WITHOUT_KF5
|
||||
QColor new_color = QColorDialog::getColor(m_part->labelColor(), this);
|
||||
if (new_color.isValid() && m_part->labelColor() != new_color) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_color", m_part->labelColor(), new_color);
|
||||
undo->setText(tr("Modifier la couleur du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
#else
|
||||
QColor new_color = m_color_pb->color();
|
||||
if (new_color.isValid() && m_part->labelColor() != new_color) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "label_color", m_part->labelColor(), new_color);
|
||||
undo->setText(tr("Modifier la couleur du label"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
#endif
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::activeConnections(bool active)
|
||||
{
|
||||
if (active) {
|
||||
@@ -231,8 +441,28 @@ void TerminalEditor::activeConnections(bool active)
|
||||
this, &TerminalEditor::nameEdited);
|
||||
m_editor_connections << connect(ui->m_type_cb, QOverload<int>::of(&QComboBox::activated),
|
||||
this, &TerminalEditor::typeEdited);
|
||||
m_editor_connections << connect(ui->m_show_name_cb, &QCheckBox::toggled,
|
||||
this, &TerminalEditor::showNameEdited);
|
||||
m_editor_connections << connect(ui->m_label_x_dsb, QOverload<qreal>::of(&QDoubleSpinBox::valueChanged),
|
||||
[this]() { TerminalEditor::labelPosEdited(); ui->m_label_x_dsb->setFocus(); });
|
||||
m_editor_connections << connect(ui->m_label_y_dsb, QOverload<qreal>::of(&QDoubleSpinBox::valueChanged),
|
||||
[this]() { TerminalEditor::labelPosEdited(); ui->m_label_y_dsb->setFocus(); });
|
||||
m_editor_connections << connect(ui->m_font_pb, &QPushButton::clicked,
|
||||
this, &TerminalEditor::labelFontClicked);
|
||||
m_editor_connections << connect(ui->m_label_size_sb, QOverload<int>::of(&QSpinBox::valueChanged),
|
||||
[this]() { TerminalEditor::labelSizeEdited(); ui->m_label_size_sb->setFocus(); });
|
||||
m_editor_connections << connect(ui->m_label_rotation_sb, QOverload<double>::of(&QDoubleSpinBox::valueChanged),
|
||||
[this]() { TerminalEditor::labelRotationEdited(); ui->m_label_rotation_sb->setFocus(); });
|
||||
m_editor_connections << connect(ui->m_align_pb, &QPushButton::clicked,
|
||||
this, &TerminalEditor::labelAlignClicked);
|
||||
m_editor_connections << connect(ui->m_label_frame_cb, &QCheckBox::toggled,
|
||||
this, &TerminalEditor::labelFrameEdited);
|
||||
m_editor_connections << connect(ui->m_use_master_label_cb, &QCheckBox::toggled,
|
||||
this, &TerminalEditor::useMasterLabelEdited);
|
||||
m_editor_connections << connect(ui->m_master_label_cb, QOverload<int>::of(&QComboBox::activated),
|
||||
this, &TerminalEditor::masterLabelIndexEdited);
|
||||
} else {
|
||||
for (auto const & con : qAsConst(m_editor_connections)) {
|
||||
for (auto const & con : std::as_const(m_editor_connections)) {
|
||||
QObject::disconnect(con);
|
||||
}
|
||||
m_editor_connections.clear();
|
||||
@@ -248,6 +478,16 @@ void TerminalEditor::activeChangeConnections(bool active)
|
||||
m_change_connections << connect(m_part, &PartTerminal::orientationChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::nameChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::terminalTypeChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::showNameChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelPosChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelFontChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelRotationChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelHAlignmentChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelVAlignmentChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelFrameChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::labelColorChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::useMasterLabelChanged, this, &TerminalEditor::updateForm);
|
||||
m_change_connections << connect(m_part, &PartTerminal::masterLabelIndexChanged, this, &TerminalEditor::updateForm);
|
||||
} else {
|
||||
for (auto &con : m_change_connections) {
|
||||
QObject::disconnect(con);
|
||||
@@ -255,3 +495,95 @@ void TerminalEditor::activeChangeConnections(bool active)
|
||||
m_change_connections.clear();
|
||||
}
|
||||
}
|
||||
|
||||
void TerminalEditor::useMasterLabelEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
bool use = ui->m_use_master_label_cb->isChecked();
|
||||
ui->m_master_label_cb->setEnabled(use);
|
||||
|
||||
QSignalBlocker name_blocker(ui->m_name_le);
|
||||
|
||||
if (m_part->useMasterLabel() != use) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "use_master_label",
|
||||
m_part->useMasterLabel(), use);
|
||||
undo->setText(tr("Modifier l'étiquette du maître"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
|
||||
if (use) {
|
||||
int idx = ui->m_master_label_cb->currentData().toInt();
|
||||
QString t_label = tr("T%1").arg(idx + 1);
|
||||
ui->m_name_le->setText(t_label);
|
||||
ui->m_name_le->setEnabled(false);
|
||||
if (m_part->terminalName() != t_label) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "terminal_name",
|
||||
m_part->terminalName(), t_label);
|
||||
undo->setText(tr("Modifier le nom de la borne"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
} else {
|
||||
ui->m_name_le->setEnabled(true);
|
||||
if (!m_part->terminalName().isEmpty()) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "terminal_name",
|
||||
m_part->terminalName(), QString());
|
||||
undo->setText(tr("Modifier le nom de la borne"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
ui->m_name_le->clear();
|
||||
}
|
||||
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
void TerminalEditor::masterLabelIndexEdited()
|
||||
{
|
||||
if (m_locked) return;
|
||||
m_locked = true;
|
||||
|
||||
int idx = ui->m_master_label_cb->currentData().toInt();
|
||||
|
||||
if (m_part->masterLabelIndex() != idx) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "master_label_index",
|
||||
m_part->masterLabelIndex(), idx);
|
||||
undo->setText(tr("Modifier l'index de l'étiquette du maître"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
|
||||
if (ui->m_use_master_label_cb->isChecked()) {
|
||||
QString t_label = tr("T%1").arg(idx + 1);
|
||||
ui->m_name_le->setText(t_label);
|
||||
if (m_part->terminalName() != t_label) {
|
||||
auto undo = new QPropertyUndoCommand(m_part, "terminal_name",
|
||||
m_part->terminalName(), t_label);
|
||||
undo->setText(tr("Modifier le nom de la borne"));
|
||||
undoStack().push(undo);
|
||||
}
|
||||
}
|
||||
|
||||
m_locked = false;
|
||||
}
|
||||
|
||||
bool TerminalEditor::updateMasterLabelVisibility()
|
||||
{
|
||||
QETElementEditor *editor = elementEditor();
|
||||
if (!editor || !editor->elementScene()) {
|
||||
ui->m_master_label_gb->setVisible(false);
|
||||
return false;
|
||||
}
|
||||
|
||||
ElementData data = editor->elementScene()->elementData();
|
||||
bool is_slave = (data.m_type == ElementData::Slave);
|
||||
ui->m_master_label_gb->setVisible(is_slave);
|
||||
return is_slave;
|
||||
}
|
||||
|
||||
void TerminalEditor::refreshMasterLabelVisibility()
|
||||
{
|
||||
updateMasterLabelVisibility();
|
||||
if (m_part) {
|
||||
updateForm();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -21,6 +21,12 @@
|
||||
#include <QWidget>
|
||||
#include "../elementitemeditor.h"
|
||||
|
||||
#ifdef BUILD_WITHOUT_KF5
|
||||
#include <QPushButton>
|
||||
#else
|
||||
#include <KColorButton>
|
||||
#endif
|
||||
|
||||
namespace Ui {
|
||||
class TerminalEditor;
|
||||
}
|
||||
@@ -43,6 +49,8 @@ class TerminalEditor : public ElementItemEditor
|
||||
bool setPart(CustomElementPart *new_part) override;
|
||||
CustomElementPart *currentPart() const override;
|
||||
QList<CustomElementPart *> currentParts() const override {return QList<CustomElementPart *>();}
|
||||
public slots:
|
||||
void refreshMasterLabelVisibility();
|
||||
|
||||
private:
|
||||
void init();
|
||||
@@ -50,8 +58,19 @@ class TerminalEditor : public ElementItemEditor
|
||||
void orientationEdited();
|
||||
void nameEdited();
|
||||
void typeEdited();
|
||||
void activeConnections(bool active);
|
||||
void activeChangeConnections(bool active);
|
||||
void showNameEdited();
|
||||
void labelPosEdited();
|
||||
void labelFontClicked();
|
||||
void labelSizeEdited();
|
||||
void labelRotationEdited();
|
||||
void labelAlignClicked();
|
||||
void labelFrameEdited();
|
||||
void labelColorClicked();
|
||||
void activeConnections(bool active);
|
||||
void activeChangeConnections(bool active);
|
||||
void useMasterLabelEdited();
|
||||
void masterLabelIndexEdited();
|
||||
bool updateMasterLabelVisibility();
|
||||
|
||||
private:
|
||||
Ui::TerminalEditor *ui;
|
||||
@@ -59,6 +78,11 @@ class TerminalEditor : public ElementItemEditor
|
||||
m_change_connections;
|
||||
PartTerminal *m_part = nullptr;
|
||||
bool m_locked = false;
|
||||
#ifdef BUILD_WITHOUT_KF5
|
||||
QPushButton *m_color_pb;
|
||||
#else
|
||||
KColorButton *m_color_pb;
|
||||
#endif
|
||||
};
|
||||
|
||||
#endif // TERMINALEDITOR_H
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>511</width>
|
||||
<height>236</height>
|
||||
<height>500</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -78,18 +78,167 @@
|
||||
<item row="3" column="1">
|
||||
<widget class="QComboBox" name="m_type_cb"/>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
<item row="5" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="m_label_gb">
|
||||
<property name="title">
|
||||
<string>Nom de la borne</string>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>20</width>
|
||||
<height>40</height>
|
||||
</size>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<item>
|
||||
<widget class="QCheckBox" name="m_show_name_cb">
|
||||
<property name="text">
|
||||
<string>Afficher le nom</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="m_text_props_gb">
|
||||
<property name="title">
|
||||
<string>Propriétés du texte</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QPushButton" name="m_font_pb">
|
||||
<property name="text">
|
||||
<string>Police</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QSpinBox" name="m_label_size_sb">
|
||||
<property name="minimum">
|
||||
<number>4</number>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<number>50</number>
|
||||
</property>
|
||||
<property name="value">
|
||||
<number>9</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_7">
|
||||
<property name="text">
|
||||
<string>X :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_label_x_dsb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<property name="text">
|
||||
<string>Y :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_label_y_dsb">
|
||||
<property name="minimum">
|
||||
<double>-5000.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>5000.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_10">
|
||||
<property name="text">
|
||||
<string>Rotation :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QDoubleSpinBox" name="m_label_rotation_sb">
|
||||
<property name="wrapping">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="suffix">
|
||||
<string>°</string>
|
||||
</property>
|
||||
<property name="decimals">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="minimum">
|
||||
<double>0.000000000000000</double>
|
||||
</property>
|
||||
<property name="maximum">
|
||||
<double>359.000000000000000</double>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0" colspan="2">
|
||||
<widget class="QPushButton" name="m_align_pb">
|
||||
<property name="text">
|
||||
<string>Alignement</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="0">
|
||||
<widget class="QLabel" name="label_13">
|
||||
<property name="text">
|
||||
<string>Couleur :</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="5" column="1">
|
||||
<widget class="QWidget" name="m_color_widget" native="true">
|
||||
<property name="minimumSize">
|
||||
<size>
|
||||
<width>40</width>
|
||||
<height>24</height>
|
||||
</size>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QCheckBox" name="m_label_frame_cb">
|
||||
<property name="text">
|
||||
<string>Encadrer le texte</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QGroupBox" name="m_master_label_gb">
|
||||
<property name="title">
|
||||
<string>Étiquette du maître</string>
|
||||
</property>
|
||||
</spacer>
|
||||
<property name="visible">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout_3">
|
||||
<item row="0" column="0">
|
||||
<widget class="QCheckBox" name="m_use_master_label_cb">
|
||||
<property name="text">
|
||||
<string>Reprendre du maître</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="m_master_label_cb">
|
||||
<property name="enabled">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
|
||||
@@ -18,6 +18,7 @@
|
||||
#include "texteditor.h"
|
||||
|
||||
#include "../../QPropertyUndoCommand/qpropertyundocommand.h"
|
||||
#include "../../ui/alignmenttextdialog.h"
|
||||
#include "../graphicspart/parttext.h"
|
||||
|
||||
#include <cassert>
|
||||
@@ -84,7 +85,7 @@ void TextEditor::setUpChangeConnection(QPointer<PartText> part)
|
||||
|
||||
void TextEditor::disconnectChangeConnection()
|
||||
{
|
||||
for (const auto &connection : qAsConst(m_change_connection)) {
|
||||
for (const auto &connection : std::as_const(m_change_connection)) {
|
||||
disconnect(connection);
|
||||
}
|
||||
m_change_connection.clear();
|
||||
@@ -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