mirror of
https://github.com/qelectrotech/qelectrotech-source-mirror.git
synced 2026-06-14 17:03:13 +02:00
Compare commits
11 Commits
a140c5ad39
...
ba14c6112e
| Author | SHA1 | Date | |
|---|---|---|---|
| ba14c6112e | |||
| cb8256bd48 | |||
| 3dd512b587 | |||
| 31c0267cd5 | |||
| 88b2955b00 | |||
| 46378ca2a7 | |||
| c7481011e8 | |||
| 15d9708c46 | |||
| 3b32daf15d | |||
| 0a658d5d61 | |||
| 7b50f10749 |
Binary file not shown.
+36
-36
@@ -9056,182 +9056,182 @@ Möchten Sie sie ersetzen?</translation>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="272"/>
|
||||
<source>Bloc auxiliaire 1</source>
|
||||
<translation>Zusatzinfo 1</translation>
|
||||
<translation>Zusatzinfo Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="273"/>
|
||||
<source>Description textuelle auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelbeschreibung Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="274"/>
|
||||
<source>Numéro d'article auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelnummer Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="275"/>
|
||||
<source>Fabricant auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Hersteller Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="276"/>
|
||||
<source>Numéro de commande auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Bestellnummer Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="277"/>
|
||||
<source>Numéro interne auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Interne Nummer Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="278"/>
|
||||
<source>Fournisseur auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Lieferant Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="279"/>
|
||||
<source>Quantité auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Menge Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="280"/>
|
||||
<source>Unité auxiliaire 1</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Einheit Zusatzartikel 1</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="281"/>
|
||||
<source>Bloc auxiliaire 2</source>
|
||||
<translation>Zusatzinfo 2</translation>
|
||||
<translation>Zusatzinfo Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="282"/>
|
||||
<source>Description textuelle auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelbeschreibung Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="283"/>
|
||||
<source>Numéro d'article auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelnummer Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="284"/>
|
||||
<source>Fabricant auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Hersteller Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="285"/>
|
||||
<source>Numéro de commande auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Bestellnummer Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="286"/>
|
||||
<source>Numéro interne auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Interne Nummer Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="287"/>
|
||||
<source>Fournisseur auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Lieferant Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="288"/>
|
||||
<source>Quantité auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Menge Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="289"/>
|
||||
<source>Unité auxiliaire 2</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Einheit Zusatzartikel 2</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="290"/>
|
||||
<source>Bloc auxiliaire 3</source>
|
||||
<translation type="unfinished">Zusatzinfo 3</translation>
|
||||
<translation>Zusatzinfo Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="291"/>
|
||||
<source>Description textuelle auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelbeschreibung Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="292"/>
|
||||
<source>Numéro d'article auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelnummer Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="293"/>
|
||||
<source>Fabricant auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Hersteller Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="294"/>
|
||||
<source>Numéro de commande auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Bestellnummer Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="295"/>
|
||||
<source>Numéro interne auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Interne Nummer Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="296"/>
|
||||
<source>Fournisseur auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Lieferant Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="297"/>
|
||||
<source>Quantité auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Menge Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="298"/>
|
||||
<source>Unité auxiliaire 3</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Einheit Zusatzartikel 3</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="299"/>
|
||||
<source>Bloc auxiliaire 4</source>
|
||||
<translation type="unfinished">Zusatzinfo 4</translation>
|
||||
<translation>Zusatzinfo Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="300"/>
|
||||
<source>Description textuelle auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelbeschreibung Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="301"/>
|
||||
<source>Numéro d'article auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Artikelnummer Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="302"/>
|
||||
<source>Fabricant auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Hersteller Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="303"/>
|
||||
<source>Numéro de commande auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Bestellnummer Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="304"/>
|
||||
<source>Numéro interne auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Interne Nummer Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="305"/>
|
||||
<source>Fournisseur auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Lieferant Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="306"/>
|
||||
<source>Quantité auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Menge Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="307"/>
|
||||
<source>Unité auxiliaire 4</source>
|
||||
<translation type="unfinished"></translation>
|
||||
<translation>Einheit Zusatzartikel 4</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../sources/qetinformation.cpp" line="257"/>
|
||||
|
||||
@@ -226,15 +226,9 @@ void DynamicTextFieldEditor::fillInfoComboBox()
|
||||
else {
|
||||
strl = QETInformation::elementInfoKeys();
|
||||
}
|
||||
//We use a QMap because the keys of the map are sorted, then no matter the current local,
|
||||
//the value of the combo box are always alphabetically sorted
|
||||
QMap <QString, QString> info_map;
|
||||
for(const QString& str : strl)
|
||||
info_map.insert(QETInformation::translatedInfoKey(str), str);
|
||||
|
||||
|
||||
for (const QString& key : info_map.keys())
|
||||
ui -> m_elmt_info_cb -> addItem(key, info_map.value(key));
|
||||
for (int i=0; i<strl.size();++i) {
|
||||
ui -> m_elmt_info_cb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
|
||||
}
|
||||
}
|
||||
|
||||
void DynamicTextFieldEditor::on_m_x_sb_editingFinished()
|
||||
|
||||
@@ -205,6 +205,8 @@ void ElementPropertiesEditorWidget::populateTree()
|
||||
QETInformation::translatedInfoKey(key));
|
||||
qtwi->setData(0, Qt::UserRole, key);
|
||||
qtwi->setText(1, m_data.m_informations.value(key).toString());
|
||||
// Adjust column width
|
||||
ui->m_tree->resizeColumnToContents(0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -312,6 +312,7 @@ QStringList QETInformation::elementEditorElementInfoKeys()
|
||||
{
|
||||
QStringList list = { ELMT_LABEL,
|
||||
ELMT_PLANT,
|
||||
ELMT_LOCATION,
|
||||
ELMT_COMMENT,
|
||||
ELMT_FUNCTION,
|
||||
ELMT_DESCRIPTION,
|
||||
@@ -322,8 +323,6 @@ QStringList QETInformation::elementEditorElementInfoKeys()
|
||||
ELMT_SUPPLIER,
|
||||
ELMT_QUANTITY,
|
||||
ELMT_UNITY,
|
||||
ELMT_LOCATION,
|
||||
ELMT_PLANT,
|
||||
ELMT_AUX1,
|
||||
ELMT_DESCRIPTION_AUX1,
|
||||
ELMT_DESIGNATION_AUX1,
|
||||
|
||||
+15
-15
@@ -49,39 +49,39 @@ namespace QETInformation
|
||||
static QString ELMT_LOCATION = "location";
|
||||
static QString ELMT_AUX1 = "auxiliary1";
|
||||
static QString ELMT_DESCRIPTION_AUX1 = "description_auxiliary1";
|
||||
static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1 ";
|
||||
static QString ELMT_DESIGNATION_AUX1 = "designation_auxiliary1";
|
||||
static QString ELMT_MANUFACTURER_AUX1 = "manufacturer_auxiliary1";
|
||||
static QString ELMT_MANUFACTURER_REF_AUX1 = "manufacturer_reference_auxiliary1";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1 ";
|
||||
static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1 ";
|
||||
static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1 ";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX1 = "machine_manufacturer_reference_auxiliary1";
|
||||
static QString ELMT_SUPPLIER_AUX1 = "supplier_auxiliary1";
|
||||
static QString ELMT_QUANTITY_AUX1 = "quantity_auxiliary1";
|
||||
static QString ELMT_UNITY_AUX1 = "unity_auxiliary1";
|
||||
static QString ELMT_AUX2 = "auxiliary2";
|
||||
static QString ELMT_DESCRIPTION_AUX2 = "description_auxiliary2";
|
||||
static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2 ";
|
||||
static QString ELMT_DESIGNATION_AUX2 = "designation_auxiliary2";
|
||||
static QString ELMT_MANUFACTURER_AUX2 = "manufacturer_auxiliary2";
|
||||
static QString ELMT_MANUFACTURER_REF_AUX2 = "manufacturer_reference_auxiliary2";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX2 = "machine_manufacturer_reference_auxiliary2";
|
||||
static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2 ";
|
||||
static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2 ";
|
||||
static QString ELMT_SUPPLIER_AUX2 = "supplier_auxiliary2";
|
||||
static QString ELMT_QUANTITY_AUX2 = "quantity_auxiliary2";
|
||||
static QString ELMT_UNITY_AUX2 = "unity_auxiliary2";
|
||||
static QString ELMT_AUX3 = "auxiliary3";
|
||||
static QString ELMT_DESCRIPTION_AUX3 = "description_auxiliary3";
|
||||
static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3 ";
|
||||
static QString ELMT_DESIGNATION_AUX3 = "designation_auxiliary3";
|
||||
static QString ELMT_MANUFACTURER_AUX3 = "manufacturer_auxiliary3";
|
||||
static QString ELMT_MANUFACTURER_REF_AUX3 = "manufacturer_reference_auxiliary3";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3 ";
|
||||
static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3 ";
|
||||
static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3 ";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX3 = "machine_manufacturer_reference_auxiliary3";
|
||||
static QString ELMT_SUPPLIER_AUX3 = "supplier_auxiliary3";
|
||||
static QString ELMT_QUANTITY_AUX3 = "quantity_auxiliary3";
|
||||
static QString ELMT_UNITY_AUX3 = "unity_auxiliary3";
|
||||
static QString ELMT_AUX4 = "auxiliary4";
|
||||
static QString ELMT_DESCRIPTION_AUX4 = "description_auxiliary4";
|
||||
static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4 ";
|
||||
static QString ELMT_DESIGNATION_AUX4 = "designation_auxiliary4";
|
||||
static QString ELMT_MANUFACTURER_AUX4 = "manufacturer_auxiliary4";
|
||||
static QString ELMT_MANUFACTURER_REF_AUX4 = "manufacturer_reference_auxiliary4";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4 ";
|
||||
static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4 ";
|
||||
static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4 ";
|
||||
static QString ELMT_MACHINE_MANUFACTURER_REF_AUX4 = "machine_manufacturer_reference_auxiliary4";
|
||||
static QString ELMT_SUPPLIER_AUX4 = "supplier_auxiliary4";
|
||||
static QString ELMT_QUANTITY_AUX4 = "quantity_auxiliary4";
|
||||
static QString ELMT_UNITY_AUX4 = "unity_auxiliary4";
|
||||
|
||||
|
||||
|
||||
@@ -510,7 +510,7 @@ void QETProject::setDefaultTitleBlockProperties(const TitleBlockProperties &titl
|
||||
collection = QETApp::commonTitleBlockTemplatesCollection();
|
||||
break;
|
||||
case QET::Company :
|
||||
// collection = QETApp::companyTitleBlockTemplatesCollection();
|
||||
collection = QETApp::companyTitleBlockTemplatesCollection();
|
||||
break;
|
||||
case QET::Custom :
|
||||
collection = QETApp::customTitleBlockTemplatesCollection();
|
||||
|
||||
@@ -68,15 +68,8 @@ void CompositeTextEditDialog::setUpComboBox()
|
||||
qstrl.removeAll("formula");
|
||||
}
|
||||
|
||||
//We use a QMap because the keys of the map are sorted, then no matter the current local,
|
||||
//the value of the combo box are always alphabetically sorted
|
||||
QMap <QString, QString> info_map;
|
||||
for(const QString& str : qstrl) {
|
||||
info_map.insert(QETInformation::translatedInfoKey(str),
|
||||
is_report ? QETInformation::folioReportInfoToVar(str) : QETInformation::elementInfoToVar(str));
|
||||
}
|
||||
for(const QString& key : info_map.keys()) {
|
||||
ui->m_info_cb->addItem(key, info_map.value(key));
|
||||
for (int i=0; i<qstrl.size();++i) {
|
||||
ui -> m_info_cb -> addItem(qstrl[i], QETInformation::translatedInfoKey(qstrl[i]));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -57,6 +57,7 @@ NewDiagramPage::NewDiagramPage(QETProject *project,
|
||||
// default titleblock properties
|
||||
QList <TitleBlockTemplatesCollection *> c;
|
||||
c << QETApp::commonTitleBlockTemplatesCollection()
|
||||
<< QETApp::companyTitleBlockTemplatesCollection()
|
||||
<< QETApp::customTitleBlockTemplatesCollection();
|
||||
if (m_project) c << m_project->embeddedTitleBlockTemplatesCollection();
|
||||
ipw = new TitleBlockPropertiesWidget(
|
||||
|
||||
@@ -66,9 +66,9 @@ public slots:
|
||||
QETProject *m_project; ///< Project to edit properties
|
||||
BorderPropertiesWidget *bpw; ///< Widget to edit default diagram dimensions
|
||||
TitleBlockPropertiesWidget *ipw; ///< Widget to edit default title block properties
|
||||
ConductorPropertiesWidget *m_cpw; ///< Widget to edit default conductor properties
|
||||
ConductorPropertiesWidget *m_cpw; ///< Widget to edit default conductor properties
|
||||
ReportPropertieWidget *rpw; ///< Widget to edit default report label
|
||||
XRefPropertiesWidget *xrefpw; ///< Widget to edit default xref properties
|
||||
XRefPropertiesWidget *xrefpw; ///< Widget to edit default xref properties
|
||||
TitleBlockProperties savedTbp; ///< Used to save current TBP and retrieve later
|
||||
|
||||
};
|
||||
|
||||
@@ -57,7 +57,7 @@ DiagramPropertiesDialog::DiagramPropertiesDialog(Diagram *diagram, QWidget *pare
|
||||
TitleBlockPropertiesWidget *titleblock_infos;
|
||||
|
||||
if (QETProject *parent_project = diagram -> project())
|
||||
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
|
||||
titleblock_infos = new TitleBlockPropertiesWidget(parent_project -> embeddedTitleBlockTemplatesCollection(), titleblock, false, diagram->project(), this);
|
||||
else
|
||||
titleblock_infos = new TitleBlockPropertiesWidget(titleblock, false, diagram->project(), this);
|
||||
|
||||
|
||||
@@ -1622,18 +1622,13 @@ QWidget *DynamicTextItemDelegate::createEditor(
|
||||
DynamicElementTextItem *deti = detm->textFromIndex(index);
|
||||
if(!deti)
|
||||
break;
|
||||
|
||||
//We use a QMap because the keys of the map are sorted, then no matter the current local,
|
||||
//the value of the combo box are always alphabetically sorted
|
||||
QMap <QString, QString> info_map;
|
||||
for(const QString& str : availableInfo(deti)) {
|
||||
info_map.insert(QETInformation::translatedInfoKey(str), str);
|
||||
}
|
||||
|
||||
QComboBox *qcb = new QComboBox(parent);
|
||||
qcb->setObjectName("info_text");
|
||||
for (const QString& key : info_map.keys()) {
|
||||
qcb->addItem(key, info_map.value(key));
|
||||
|
||||
QStringList strl = availableInfo(deti);
|
||||
for (int i=0; i<strl.size();++i) {
|
||||
qcb -> addItem(strl[i], QETInformation::translatedInfoKey(strl[i]));
|
||||
}
|
||||
return qcb;
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ TitleBlockPropertiesWidget::TitleBlockPropertiesWidget(
|
||||
|
||||
/**
|
||||
@brief TitleBlockPropertiesWidget::TitleBlockPropertiesWidget
|
||||
default constructor with tempalte list
|
||||
default constructor with template list
|
||||
@param tbt_collection template list
|
||||
@param titleblock properties to edit
|
||||
@param current_date if true, display the radio button "current date"
|
||||
@@ -113,17 +113,17 @@ TitleBlockPropertiesWidget::~TitleBlockPropertiesWidget()
|
||||
*/
|
||||
void TitleBlockPropertiesWidget::setProperties(
|
||||
const TitleBlockProperties &properties) {
|
||||
ui -> m_title_le -> setText (properties.title);
|
||||
ui -> m_author_le -> setText (properties.author);
|
||||
ui -> m_file_le -> setText (properties.filename);
|
||||
ui -> m_plant -> setText (properties.plant);
|
||||
ui -> m_loc -> setText (properties.locmach);
|
||||
ui -> m_indice -> setText (properties.indexrev);
|
||||
ui -> m_folio_le -> setText (properties.folio);
|
||||
ui -> m_title_le -> setText (properties.title);
|
||||
ui -> m_author_le -> setText (properties.author);
|
||||
ui -> m_file_le -> setText (properties.filename);
|
||||
ui -> m_plant -> setText (properties.plant);
|
||||
ui -> m_loc -> setText (properties.locmach);
|
||||
ui -> m_indice -> setText (properties.indexrev);
|
||||
ui -> m_folio_le -> setText (properties.folio);
|
||||
ui -> m_display_at_cb -> setCurrentIndex(properties.display_at == Qt::BottomEdge ? 0 : 1);
|
||||
ui->auto_page_cb->setCurrentText(properties.auto_page_num);
|
||||
|
||||
//About date
|
||||
//About date
|
||||
ui -> m_date_now_pb -> setDisabled(true);
|
||||
ui -> m_date_edit -> setDisabled(true);
|
||||
ui -> m_date_edit -> setDate(QDate::currentDate());
|
||||
@@ -172,13 +172,13 @@ void TitleBlockPropertiesWidget::setProperties(
|
||||
TitleBlockProperties TitleBlockPropertiesWidget::properties() const
|
||||
{
|
||||
TitleBlockProperties prop;
|
||||
prop.title = ui -> m_title_le -> text();
|
||||
prop.author = ui -> m_author_le -> text();
|
||||
prop.filename = ui -> m_file_le -> text();
|
||||
prop.plant = ui -> m_plant -> text();
|
||||
prop.locmach = ui -> m_loc -> text();
|
||||
prop.indexrev = ui -> m_indice -> text();
|
||||
prop.folio = ui -> m_folio_le -> text();
|
||||
prop.title = ui -> m_title_le -> text();
|
||||
prop.author = ui -> m_author_le -> text();
|
||||
prop.filename = ui -> m_file_le -> text();
|
||||
prop.plant = ui -> m_plant -> text();
|
||||
prop.locmach = ui -> m_loc -> text();
|
||||
prop.indexrev = ui -> m_indice -> text();
|
||||
prop.folio = ui -> m_folio_le -> text();
|
||||
prop.display_at = ui -> m_display_at_cb -> currentIndex() == 0 ? Qt::BottomEdge : Qt::RightEdge;
|
||||
|
||||
if (ui->m_no_date_rb->isChecked()) {
|
||||
@@ -218,7 +218,7 @@ TitleBlockProperties TitleBlockPropertiesWidget::propertiesAutoNum(
|
||||
prop.title = ui -> m_title_le -> text();
|
||||
prop.author = ui -> m_author_le -> text();
|
||||
prop.filename = ui -> m_file_le -> text();
|
||||
prop.plant = ui -> m_plant -> text();
|
||||
prop.plant = ui -> m_plant -> text();
|
||||
prop.locmach = ui -> m_loc -> text();
|
||||
prop.indexrev = ui -> m_indice -> text();
|
||||
prop.folio = "%autonum";
|
||||
|
||||
Reference in New Issue
Block a user