Fixed alignments
--HG-- branch : feature
This commit is contained in:
parent
d6341b50e4
commit
5ba40aad8c
|
@ -489,7 +489,7 @@ void MainWindowsNoGUI::PrepareDetailsForLayout(const QHash<quint32, VDetail> *de
|
||||||
date = QDate::currentDate();
|
date = QDate::currentDate();
|
||||||
}
|
}
|
||||||
det.SetPatternInfo(pDoc->GetPatternName(), pDoc->GetPatternNumber(), pDoc->GetPatternSize(),
|
det.SetPatternInfo(pDoc->GetPatternName(), pDoc->GetPatternNumber(), pDoc->GetPatternSize(),
|
||||||
pDoc->GetCompanyName(), pDoc->GetCustomerName(), date, geom, qApp->font());
|
pDoc->GetCompanyName(), pDoc->GetCustomerName(), date, geom, qApp->font());
|
||||||
qApp->getCurrentDocument();
|
qApp->getCurrentDocument();
|
||||||
}
|
}
|
||||||
det.setWidth(qApp->toPixel(d.getWidth()));
|
det.setWidth(qApp->toPixel(d.getWidth()));
|
||||||
|
|
|
@ -134,7 +134,7 @@ void VPattern::Parse(const Document &parse)
|
||||||
QStringList tags = QStringList() << TagDraw << TagIncrements << TagAuthor << TagDescription << TagNotes
|
QStringList tags = QStringList() << TagDraw << TagIncrements << TagAuthor << TagDescription << TagNotes
|
||||||
<< TagMeasurements << TagVersion << TagGradation << TagImage << TagUnit
|
<< TagMeasurements << TagVersion << TagGradation << TagImage << TagUnit
|
||||||
<< TagPatternName << TagPatternNum << TagCompanyName << TagCustomerName
|
<< TagPatternName << TagPatternNum << TagCompanyName << TagCustomerName
|
||||||
<< TagSize << TagShowDate;
|
<< TagSize << TagShowDate;
|
||||||
PrepareForParse(parse);
|
PrepareForParse(parse);
|
||||||
QDomNode domNode = documentElement().firstChild();
|
QDomNode domNode = documentElement().firstChild();
|
||||||
while (domNode.isNull() == false)
|
while (domNode.isNull() == false)
|
||||||
|
@ -206,10 +206,10 @@ void VPattern::Parse(const Document &parse)
|
||||||
case 13: // TagCustomerName
|
case 13: // TagCustomerName
|
||||||
qCDebug(vXML, "Customer name.");
|
qCDebug(vXML, "Customer name.");
|
||||||
break;
|
break;
|
||||||
case 14: // TagSize
|
case 14: // TagSize
|
||||||
qCDebug(vXML, "Size");
|
qCDebug(vXML, "Size");
|
||||||
break;
|
break;
|
||||||
case 15:
|
case 15:
|
||||||
qCDebug(vXML, "Show creation date");
|
qCDebug(vXML, "Show creation date");
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -1199,7 +1199,7 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
|
||||||
{
|
{
|
||||||
const QStringList tags = QStringList() << TagUnit << TagImage << TagAuthor << TagDescription << TagNotes
|
const QStringList tags = QStringList() << TagUnit << TagImage << TagAuthor << TagDescription << TagNotes
|
||||||
<< TagGradation << TagPatternName << TagPatternNum << TagCompanyName
|
<< TagGradation << TagPatternName << TagPatternNum << TagCompanyName
|
||||||
<< TagCustomerName << TagSize << TagShowDate;
|
<< TagCustomerName << TagSize << TagShowDate;
|
||||||
switch (tags.indexOf(tag))
|
switch (tags.indexOf(tag))
|
||||||
{
|
{
|
||||||
case 0: //TagUnit
|
case 0: //TagUnit
|
||||||
|
@ -1260,12 +1260,12 @@ QDomElement VAbstractPattern::CheckTagExists(const QString &tag)
|
||||||
element = createElement(TagCustomerName);
|
element = createElement(TagCustomerName);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 10: // TagSize
|
case 10: // TagSize
|
||||||
{
|
{
|
||||||
element = createElement(TagSize);
|
element = createElement(TagSize);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case 11: // TagShowDate
|
case 11: // TagShowDate
|
||||||
{
|
{
|
||||||
element = createElement(TagShowDate);
|
element = createElement(TagShowDate);
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -176,7 +176,7 @@ public:
|
||||||
static const QString TagPatternNum;
|
static const QString TagPatternNum;
|
||||||
static const QString TagCompanyName;
|
static const QString TagCompanyName;
|
||||||
static const QString TagCustomerName;
|
static const QString TagCustomerName;
|
||||||
static const QString TagSize;
|
static const QString TagSize;
|
||||||
static const QString TagShowDate;
|
static const QString TagShowDate;
|
||||||
|
|
||||||
static const QString AttrName;
|
static const QString AttrName;
|
||||||
|
|
|
@ -833,7 +833,7 @@ void VToolDetail::UpdatePatternInfo()
|
||||||
tl.m_eFontWeight = QFont::Normal;
|
tl.m_eFontWeight = QFont::Normal;
|
||||||
tl.m_eStyle = QFont::StyleNormal;
|
tl.m_eStyle = QFont::StyleNormal;
|
||||||
tl.m_iFontSize = 0;
|
tl.m_iFontSize = 0;
|
||||||
QStringList qslDate = QDate::currentDate().toString(Qt::SystemLocaleLongDate).split(", ");
|
QStringList qslDate = QDate::currentDate().toString(Qt::SystemLocaleLongDate).split(", ");
|
||||||
tl.m_qsText = qslDate.last();
|
tl.m_qsText = qslDate.last();
|
||||||
patternInfo->AddLine(tl);
|
patternInfo->AddLine(tl);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user