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

Improve format of save date

Browse Source 
3 formats : local, eu (dd mm yyyy) and us (yyyy mm dd)
This commit is contained in:
Claveau Joshua
2020-10-31 14:22:06 +01:00
parent 24c930d727
commit 72271cfc69
3 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
sources/qetinformation.cpp
View File

@@ -46,6 +46,7 @@ QStringList QETInformation::titleblockInfoKeys()
info_list << "projectfilename"; info_list << "projectfilename";
info_list << "saveddate"; info_list << "saveddate";
info_list << "saveddate-eu"; info_list << "saveddate-eu";
info_list << "saveddate-us";
info_list << "savedtime"; info_list << "savedtime";
info_list << "savedfilename"; info_list << "savedfilename";
info_list << "savedfilepath"; info_list << "savedfilepath";
@@ -77,8 +78,9 @@ 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 format yyyy-MM-dd"); else if (info == "saveddate") return QObject::tr("Date d'enregistrement du fichier format local");
else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy"); else if (info == "saveddate-eu") return QObject::tr("Date d'enregistrement du fichier format dd-MM-yyyy");
else if (info == "saveddate-us") return QObject::tr("Date d'enregistrement du fichier format yyyy-MM-dd");
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é");
@@ -111,6 +113,7 @@ QString QETInformation::titleblockInfoKeysToVar(const QString &info)
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 == "saveddate-eu") return QString("%{saveddate-eu}");
else if (info == "saveddate-us") return QString("%{saveddate-us}");
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}");

27
sources/qetproject.cpp
View File

@@ -33,7 +33,6 @@
#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,9 +290,10 @@ 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", QLocale::system().toString(QDate::currentDate(), QLocale::ShortFormat));
m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy")); 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("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd"));
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());
@@ -925,12 +925,12 @@ bool QETProject::close()
*/ */
QETResult QETProject::write() QETResult QETProject::write()
{ {
// this operation requires a filepath // this operation requires a filepath
if (m_file_path.isEmpty()) if (m_file_path.isEmpty())
return(QString("unable to save project to file: no filepath was specified")); return(QString("unable to save project to file: no filepath was specified"));
// if the project was opened read-only // if the project was opened read-only
// and the file is still non-writable, do not save the project // and the file is still non-writable, do not save the project
if (isReadOnly() && !QFileInfo(m_file_path).isWritable()) if (isReadOnly() && !QFileInfo(m_file_path).isWritable())
return(QString("the file %1 was opened read-only and thus will not be written").arg(m_file_path)); return(QString("the file %1 was opened read-only and thus will not be written").arg(m_file_path));
@@ -939,14 +939,11 @@ QETResult QETProject::write()
if (!QET::writeXmlFile(xml_project, m_file_path, &error_message)) if (!QET::writeXmlFile(xml_project, m_file_path, &error_message))
return(error_message); return(error_message);
//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", QLocale::system().toString(QDate::currentDate(), QLocale::ShortFormat));
"saveddate", m_project_properties.addValue("saveddate-us", QDate::currentDate().toString("yyyy-MM-dd"));
QDate::currentDate().toString("yyyy-MM-dd")); m_project_properties.addValue("saveddate-eu", QDate::currentDate().toString("dd-MM-yyyy"));
m_project_properties.addValue( m_project_properties.addValue("savedtime", QDateTime::currentDateTime().toString("HH:mm"));
"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("savedfilename", QFileInfo(filePath()).baseName());
m_project_properties.addValue("savedfilepath", filePath()); m_project_properties.addValue("savedfilepath", filePath());

3
sources/titleblock/templatecellwidget.cpp
View File

@@ -460,8 +460,9 @@ 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 format yyyy-MM-dd</li>" "<li>%{saveddate} : date d'enregistrement du fichier format local</li>"
"<li>%{saveddate-eu} : date d'enregistrement du fichier format dd-MM-yyyy</li>" "<li>%{saveddate-eu} : date d'enregistrement du fichier format dd-MM-yyyy</li>"
"<li>%{saveddate-us} : date d'enregistrement du fichier format yyyy-MM-dd</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>"