kotschak/qelectrotech-source-mirror
0
0
Fork 0
mirror of https://github.com/qelectrotech/qelectrotech-source-mirror.git synced 2025-12-20 08:10:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix %{saveddate} titleblock variable and

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/qetinformation.cpp
View File

@@ -45,6 +45,7 @@ QStringList QETInformation::titleblockInfoKeys()
info_list << "projectpath"; info_list << "projectpath";
info_list << "projectfilename"; info_list << "projectfilename";
info_list << "saveddate"; info_list << "saveddate";
info_list << "saveddate-eu";
info_list << "savedtime"; info_list << "savedtime";
info_list << "savedfilename"; info_list << "savedfilename";
info_list << "savedfilepath"; info_list << "savedfilepath";
@@ -76,7 +77,8 @@ QString QETInformation::titleblockTranslatedInfoKey(const QString &info)
else if (info == "projecttitle") return QObject::tr("Titre du projet"); else if (info == "projecttitle") return QObject::tr("Titre du projet");
else if (info == "projectpath") return QObject::tr("Chemin du fichier du projet"); else if (info == "projectpath") return QObject::tr("Chemin du fichier du projet");
else if (info == "projectfilename") return QObject::tr("Nom du fichier"); else if (info == "projectfilename") return QObject::tr("Nom du fichier");
else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier"); else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd");
else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy");
else if (info == "savedtime") return QObject::tr("Heure d'enregistrement du fichier"); else if (info == "savedtime") return QObject::tr("Heure d'enregistrement du fichier");
else if (info == "savedfilename") return QObject::tr("Nom du fichier enregistré"); else if (info == "savedfilename") return QObject::tr("Nom du fichier enregistré");
else if (info == "savedfilepath") return QObject::tr("Chemin du fichier enregistré"); else if (info == "savedfilepath") return QObject::tr("Chemin du fichier enregistré");
@@ -108,6 +110,7 @@ QString QETInformation::titleblockInfoKeysToVar(const QString &info)
else if (info == "projectpath") return QString("%{projectpath}"); else if (info == "projectpath") return QString("%{projectpath}");
else if (info == "projectfilename") return QString("%{projectfilename}"); else if (info == "projectfilename") return QString("%{projectfilename}");
else if (info == "saveddate") return QString("%{saveddate}"); else if (info == "saveddate") return QString("%{saveddate}");
else if (info == "saveddate-eu") return QString("%{saveddate-eu}");
else if (info == "savedtime") return QString("%{savedtime}"); else if (info == "savedtime") return QString("%{savedtime}");
else if (info == "savedfilename") return QString("%{savedfilename}"); else if (info == "savedfilename") return QString("%{savedfilename}");
else if (info == "savedfilepath") return QString("%{savedfilepath}"); else if (info == "savedfilepath") return QString("%{savedfilepath}");

9
sources/qetproject.cpp
View File

@@ -33,6 +33,7 @@
#include "assignvariables.h" #include "assignvariables.h"
#include <QTimer> #include <QTimer>
#include <QDate>
#include <QStandardPaths> #include <QStandardPaths>
#include <utility> #include <utility>
#include <QtConcurrent> #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. //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", 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("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName()); m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath()); 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. //title block variables should be updated after file save dialog is confirmed, before file is saved.
m_project_properties.addValue( m_project_properties.addValue(
"saveddate", "saveddate",
QDate::currentDate().toString( QDate::currentDate().toString("yyyy-MM-dd"));
QLocale::system().toString( m_project_properties.addValue(
QLocale::ShortFormat))); "saveddate-eu",
QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm")); m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName()); m_project_properties.addValue("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath()); m_project_properties.addValue("savedfilepath", filePath());

3
sources/titleblock/templatecellwidget.cpp
View File

@@ -460,7 +460,8 @@ QString TitleBlockTemplateCellWidget::defaultVariablesString() const
"<li>%{projecttitle} : titre du projet</li>" "<li>%{projecttitle} : titre du projet</li>"
"<li>%{projectpath} : chemin du projet</li>" "<li>%{projectpath} : chemin du projet</li>"
"<li>%{projectfilename} : nom du fichier</li>" "<li>%{projectfilename} : nom du fichier</li>"
"<li>%{saveddate} : date d'enregistrement du fichier</li>" "<li>%{saveddate} : date d'enregistrement du fichier format yyyy-MM-dd</li>"
"<li>%{saveddate-eu} : date d'enregistrement du fichier format dd-MM-yyyy</li>"
"<li>%{savedtime} : heure d'enregistrement du fichier</li>" "<li>%{savedtime} : heure d'enregistrement du fichier</li>"
"<li>%{savedfilename} : nom du fichier enregistré</li>" "<li>%{savedfilename} : nom du fichier enregistré</li>"
"<li>%{savedfilepath} : chemin du fichier enregistré</li>" "<li>%{savedfilepath} : chemin du fichier enregistré</li>"