Fix %{saveddate} titleblock variable and

add new %{saveddate-eu} variable dd-MM-yyyy date format
This commit is contained in:
Laurent Trinques
2020-10-19 14:09:26 +02:00
parent 69f775aa0f
commit 9c267d673d
3 changed files with 12 additions and 5 deletions

View File

@@ -33,6 +33,7 @@
#include "assignvariables.h"
#include <QTimer>
#include <QDate>
#include <QStandardPaths>
#include <utility>
#include <QtConcurrent>
@@ -291,6 +292,7 @@ void QETProject::setFilePath(const QString &filepath)
//title block variables should be updated after file save as dialog is confirmed, before file is saved.
m_project_properties.addValue("saveddate", QDate::currentDate().toString("yyyy-MM-dd"));
m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath());
@@ -940,9 +942,10 @@ QETResult QETProject::write()
//title block variables should be updated after file save dialog is confirmed, before file is saved.
m_project_properties.addValue(
"saveddate",
QDate::currentDate().toString(
QLocale::system().toString(
QLocale::ShortFormat)));
QDate::currentDate().toString("yyyy-MM-dd"));
m_project_properties.addValue(
"saveddate-eu",
QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath());