mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-06 18:13:14 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| d007035237 | |||
| c1559d2a99 |
@@ -47,7 +47,7 @@ namespace autonum
|
|||||||
}
|
}
|
||||||
|
|
||||||
sequentialNumbers::~sequentialNumbers()
|
sequentialNumbers::~sequentialNumbers()
|
||||||
{}
|
{}
|
||||||
|
|
||||||
sequentialNumbers &sequentialNumbers::operator=(
|
sequentialNumbers &sequentialNumbers::operator=(
|
||||||
const sequentialNumbers &other)
|
const sequentialNumbers &other)
|
||||||
@@ -656,7 +656,7 @@ namespace autonum
|
|||||||
dirLevel = 0;
|
dirLevel = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create Custom labels if qet_labels.xml if exit in customElementsDir
|
// Create Custom labels if qet_labels.xml exits in customElementsDir
|
||||||
if (current_location.fileName() != "10_electric"){
|
if (current_location.fileName() != "10_electric"){
|
||||||
QString custom_labels = "qet_labels.xml";
|
QString custom_labels = "qet_labels.xml";
|
||||||
QString customfilepath = QETApp::customElementsDir().append(custom_labels);
|
QString customfilepath = QETApp::customElementsDir().append(custom_labels);
|
||||||
@@ -741,7 +741,7 @@ namespace autonum
|
|||||||
}
|
}
|
||||||
rxml.readNext();
|
rxml.readNext();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return QString();
|
return QString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ void DynamicTextFieldEditor::setupWidget()
|
|||||||
m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb"));
|
m_color_kpb->setObjectName(QString::fromUtf8("m_color_kpb"));
|
||||||
|
|
||||||
connect(m_color_kpb, &KColorButton::changed,
|
connect(m_color_kpb, &KColorButton::changed,
|
||||||
this, &DynamicTextFieldEditor::on_m_color_kpb_changed);
|
this, &DynamicTextFieldEditor::m_color_kpb_changed);
|
||||||
|
|
||||||
ui->m_main_grid_layout->addWidget(m_color_kpb, 6, 1, 1, 2);
|
ui->m_main_grid_layout->addWidget(m_color_kpb, 6, 1, 1, 2);
|
||||||
#endif
|
#endif
|
||||||
@@ -414,7 +414,7 @@ void DynamicTextFieldEditor::on_m_font_pb_clicked()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DynamicTextFieldEditor::on_m_color_kpb_changed(const QColor &newColor) {
|
void DynamicTextFieldEditor::m_color_kpb_changed(QColor newColor) {
|
||||||
if (!newColor.isValid()) {
|
if (!newColor.isValid()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -67,7 +67,7 @@ class DynamicTextFieldEditor : public ElementItemEditor {
|
|||||||
void on_m_alignment_pb_clicked();
|
void on_m_alignment_pb_clicked();
|
||||||
void on_m_font_pb_clicked();
|
void on_m_font_pb_clicked();
|
||||||
|
|
||||||
void on_m_color_kpb_changed(const QColor &newColor);
|
void m_color_kpb_changed(QColor newColor);
|
||||||
|
|
||||||
void on_m_keep_visual_rotation_cb_clicked();
|
void on_m_keep_visual_rotation_cb_clicked();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user