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

Fix bug. Tags should contain only file base name.

Browse Source 
--HG--
branch : feature
This commit is contained in:
Roman Telezhynskyi 2017-08-17 16:04:52 +03:00
parent 4102c25a04
commit 6d967cddf8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,8 +73,8 @@ QMap<QString, QString> PreparePlaceholders(const VAbstractPattern *doc)
placeholders.insert(pl_author, doc->GetCompanyName()); placeholders.insert(pl_author, doc->GetCompanyName());
placeholders.insert(pl_customer, doc->GetCustomerName()); placeholders.insert(pl_customer, doc->GetCustomerName());
placeholders.insert(pl_pExt, QString("val")); placeholders.insert(pl_pExt, QString("val"));
placeholders.insert(pl_pFileName, QFileInfo(qApp->GetPPath()).fileName()); placeholders.insert(pl_pFileName, QFileInfo(qApp->GetPPath()).baseName());
placeholders.insert(pl_mFileName, QFileInfo(doc->MPath()).fileName()); placeholders.insert(pl_mFileName, QFileInfo(doc->MPath()).baseName());
QString curSize; QString curSize;
QString curHeight; QString curHeight;

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

@ -473,10 +473,10 @@ void DialogEditLabel::InitPlaceholders()
m_placeholders.insert(pl_customer, qMakePair(tr("Customer name"), m_doc->GetCustomerName())); m_placeholders.insert(pl_customer, qMakePair(tr("Customer name"), m_doc->GetCustomerName()));
m_placeholders.insert(pl_pExt, qMakePair(tr("Pattern extension"), QString("val"))); m_placeholders.insert(pl_pExt, qMakePair(tr("Pattern extension"), QString("val")));
const QString patternFilePath = QFileInfo(qApp->GetPPath()).fileName(); const QString patternFilePath = QFileInfo(qApp->GetPPath()).baseName();
m_placeholders.insert(pl_pFileName, qMakePair(tr("Pattern file name"), patternFilePath)); m_placeholders.insert(pl_pFileName, qMakePair(tr("Pattern file name"), patternFilePath));
const QString measurementsFilePath = QFileInfo(m_doc->MPath()).fileName(); const QString measurementsFilePath = QFileInfo(m_doc->MPath()).baseName();
m_placeholders.insert(pl_mFileName, qMakePair(tr("Measurments file name"), measurementsFilePath)); m_placeholders.insert(pl_mFileName, qMakePair(tr("Measurments file name"), measurementsFilePath));
QString curSize; QString curSize;