aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix copy past error.

Browse Source
This commit is contained in:
Roman Telezhynskyi 2024-06-10 09:16:22 +03:00
parent 700b8d1901
commit e74d95a456
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/vlayout/vtextmanager.cpp
View File

@ -362,10 +362,18 @@ void PrepareDimensionPlaceholders(const VPieceLabelInfo &info, QMap<QString, QSt
AddPlaceholder(pl_heightLabel, AddPlaceholder(pl_heightLabel,
not info.dimensionHeightLabel.isEmpty() ? info.dimensionHeightLabel : info.dimensionHeight); not info.dimensionHeightLabel.isEmpty() ? info.dimensionHeightLabel : info.dimensionHeight);
AddPlaceholder(pl_dimensionXLabel,
not info.dimensionHeightLabel.isEmpty() ? info.dimensionHeightLabel : info.dimensionHeight);
AddPlaceholder(pl_sizeLabel, not info.dimensionSizeLabel.isEmpty() ? info.dimensionSizeLabel : info.dimensionSize); AddPlaceholder(pl_sizeLabel, not info.dimensionSizeLabel.isEmpty() ? info.dimensionSizeLabel : info.dimensionSize);
AddPlaceholder(pl_dimensionYLabel,
not info.dimensionSizeLabel.isEmpty() ? info.dimensionSizeLabel : info.dimensionSize);
AddPlaceholder(pl_hipLabel, not info.dimensionHipLabel.isEmpty() ? info.dimensionHipLabel : info.dimensionHip); AddPlaceholder(pl_hipLabel, not info.dimensionHipLabel.isEmpty() ? info.dimensionHipLabel : info.dimensionHip);
AddPlaceholder(pl_dimensionZLabel,
not info.dimensionHipLabel.isEmpty() ? info.dimensionHipLabel : info.dimensionHip);
AddPlaceholder(pl_waistLabel, AddPlaceholder(pl_waistLabel,
not info.dimensionWaistLabel.isEmpty() ? info.dimensionWaistLabel : info.dimensionWaist); not info.dimensionWaistLabel.isEmpty() ? info.dimensionWaistLabel : info.dimensionWaist);
AddPlaceholder(pl_dimensionWLabel,
not info.dimensionWaistLabel.isEmpty() ? info.dimensionWaistLabel : info.dimensionWaist);
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------

12
src/libs/vtools/dialogs/support/dialogeditlabel.cpp
View File

@ -607,26 +607,26 @@ void DialogEditLabel::InitPlaceholders()
QString label = VAbstractValApplication::VApp()->GetDimensionHeightLabel(); QString label = VAbstractValApplication::VApp()->GetDimensionHeightLabel();
m_placeholders.insert(pl_heightLabel, m_placeholders.insert(pl_heightLabel,
qMakePair(tr("Height label", "dimension"), not label.isEmpty() ? label : heightValue)); qMakePair(tr("Height label", "dimension"), not label.isEmpty() ? label : heightValue));
m_placeholders.insert( m_placeholders.insert(pl_dimensionXLabel, qMakePair(tr("Dimension X label", "dimension"),
pl_dimensionX, qMakePair(tr("Dimension X label", "dimension"), not label.isEmpty() ? label : heightValue)); not label.isEmpty() ? label : heightValue));
label = VAbstractValApplication::VApp()->GetDimensionSizeLabel(); label = VAbstractValApplication::VApp()->GetDimensionSizeLabel();
m_placeholders.insert(pl_sizeLabel, m_placeholders.insert(pl_sizeLabel,
qMakePair(tr("Size label", "dimension"), not label.isEmpty() ? label : sizeValue)); qMakePair(tr("Size label", "dimension"), not label.isEmpty() ? label : sizeValue));
m_placeholders.insert(pl_dimensionY, m_placeholders.insert(pl_dimensionYLabel,
qMakePair(tr("Dimension Y label", "dimension"), not label.isEmpty() ? label : sizeValue)); qMakePair(tr("Dimension Y label", "dimension"), not label.isEmpty() ? label : sizeValue));
label = VAbstractValApplication::VApp()->GetDimensionHipLabel(); label = VAbstractValApplication::VApp()->GetDimensionHipLabel();
m_placeholders.insert(pl_hipLabel, m_placeholders.insert(pl_hipLabel,
qMakePair(tr("Hip label", "dimension"), not label.isEmpty() ? label : hipValue)); qMakePair(tr("Hip label", "dimension"), not label.isEmpty() ? label : hipValue));
m_placeholders.insert(pl_dimensionZ, m_placeholders.insert(pl_dimensionZLabel,
qMakePair(tr("Dimension Z label", "dimension"), not label.isEmpty() ? label : hipValue)); qMakePair(tr("Dimension Z label", "dimension"), not label.isEmpty() ? label : hipValue));
label = VAbstractValApplication::VApp()->GetDimensionWaistLabel(); label = VAbstractValApplication::VApp()->GetDimensionWaistLabel();
m_placeholders.insert(pl_waistLabel, m_placeholders.insert(pl_waistLabel,
qMakePair(tr("Waist label", "dimension"), not label.isEmpty() ? label : waistValue)); qMakePair(tr("Waist label", "dimension"), not label.isEmpty() ? label : waistValue));
m_placeholders.insert( m_placeholders.insert(pl_dimensionWLabel, qMakePair(tr("Dimension W label", "dimension"),
pl_dimensionW, qMakePair(tr("Dimension W label", "dimension"), not label.isEmpty() ? label : waistValue)); not label.isEmpty() ? label : waistValue));
} }
m_placeholders.insert( m_placeholders.insert(